Skip to content

Commit bb907f7

Browse files
AchoArnoldAchoArnold
committed
Remove listener
1 parent ecbf431 commit bb907f7

3 files changed

Lines changed: 8 additions & 87 deletions

File tree

‎api/pkg/listeners/listener.go‎

Lines changed: 0 additions & 16 deletions
This file was deleted.

‎api/pkg/listeners/message_listener.go‎

Lines changed: 8 additions & 65 deletions
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,6 @@ import (
1414

1515
// MessageListener handles cloud events which need to update entities.Message
1616
type MessageListener struct {
17-
listener
1817
logger telemetry.Logger
1918
tracer telemetry.Tracer
2019
service *services.MessageService
@@ -50,21 +49,8 @@ func (listener *MessageListener) OnMessagePhoneSending(ctx context.Context, even
5049
ctx, span := listener.tracer.Start(ctx)
5150
defer span.End()
5251

53-
handled, err := listener.repository.Has(ctx, event.ID(), listener.signature(event))
54-
if err != nil {
55-
msg := fmt.Sprintf("cannot verify if event [%s] has been handled by [%T]", event.ID(), listener.signature(event))
56-
return listener.tracer.WrapErrorSpan(span, stacktrace.Propagate(err, msg))
57-
}
58-
59-
ctxLogger := listener.tracer.CtxLogger(listener.logger, span)
60-
61-
if handled {
62-
ctxLogger.Info(fmt.Sprintf("event [%s] has already been handled by [%s]", event.ID(), listener.signature(event)))
63-
return nil
64-
}
65-
6652
var payload events.MessagePhoneSendingPayload
67-
if err = event.DataAs(&payload); err != nil {
53+
if err := event.DataAs(&payload); err != nil {
6854
msg := fmt.Sprintf("cannot decode [%s] into [%T]", event.Data(), payload)
6955
return listener.tracer.WrapErrorSpan(span, stacktrace.Propagate(err, msg))
7056
}
@@ -76,7 +62,7 @@ func (listener *MessageListener) OnMessagePhoneSending(ctx context.Context, even
7662
Source: event.Source(),
7763
}
7864

79-
if err = listener.service.HandleMessageSending(ctx, handleParams); err != nil {
65+
if err := listener.service.HandleMessageSending(ctx, handleParams); err != nil {
8066
msg := fmt.Sprintf("cannot handle sending for message with ID [%s] for event with ID [%s]", handleParams.ID, event.ID())
8167
return listener.tracer.WrapErrorSpan(span, stacktrace.Propagate(err, msg))
8268
}
@@ -89,21 +75,8 @@ func (listener *MessageListener) OnMessagePhoneSent(ctx context.Context, event c
8975
ctx, span := listener.tracer.Start(ctx)
9076
defer span.End()
9177

92-
handled, err := listener.repository.Has(ctx, event.ID(), listener.signature(event))
93-
if err != nil {
94-
msg := fmt.Sprintf("cannot verify if event [%s] has been handled by [%T]", event.ID(), listener.signature(event))
95-
return listener.tracer.WrapErrorSpan(span, stacktrace.Propagate(err, msg))
96-
}
97-
98-
ctxLogger := listener.tracer.CtxLogger(listener.logger, span)
99-
100-
if handled {
101-
ctxLogger.Info(fmt.Sprintf("event [%s] has already been handled by [%s]", event.ID(), listener.signature(event)))
102-
return nil
103-
}
104-
10578
var payload events.MessagePhoneSentPayload
106-
if err = event.DataAs(&payload); err != nil {
79+
if err := event.DataAs(&payload); err != nil {
10780
msg := fmt.Sprintf("cannot decode [%s] into [%T]", event.Data(), payload)
10881
return listener.tracer.WrapErrorSpan(span, stacktrace.Propagate(err, msg))
10982
}
@@ -115,7 +88,7 @@ func (listener *MessageListener) OnMessagePhoneSent(ctx context.Context, event c
11588
Timestamp: payload.Timestamp,
11689
}
11790

118-
if err = listener.service.HandleMessageSent(ctx, handleParams); err != nil {
91+
if err := listener.service.HandleMessageSent(ctx, handleParams); err != nil {
11992
msg := fmt.Sprintf("cannot handle [%s] for message with ID [%s] for event with ID [%s]", event.Type(), handleParams.ID, event.ID())
12093
return listener.tracer.WrapErrorSpan(span, stacktrace.Propagate(err, msg))
12194
}
@@ -127,21 +100,8 @@ func (listener *MessageListener) OnMessagePhoneDelivered(ctx context.Context, ev
127100
ctx, span := listener.tracer.Start(ctx)
128101
defer span.End()
129102

130-
handled, err := listener.repository.Has(ctx, event.ID(), listener.signature(event))
131-
if err != nil {
132-
msg := fmt.Sprintf("cannot verify if event [%s] has been handled by [%T]", event.ID(), listener.signature(event))
133-
return listener.tracer.WrapErrorSpan(span, stacktrace.Propagate(err, msg))
134-
}
135-
136-
ctxLogger := listener.tracer.CtxLogger(listener.logger, span)
137-
138-
if handled {
139-
ctxLogger.Info(fmt.Sprintf("event [%s] has already been handled by [%s]", event.ID(), listener.signature(event)))
140-
return nil
141-
}
142-
143103
var payload events.MessagePhoneDeliveredPayload
144-
if err = event.DataAs(&payload); err != nil {
104+
if err := event.DataAs(&payload); err != nil {
145105
msg := fmt.Sprintf("cannot decode [%s] into [%T]", event.Data(), payload)
146106
return listener.tracer.WrapErrorSpan(span, stacktrace.Propagate(err, msg))
147107
}
@@ -152,7 +112,7 @@ func (listener *MessageListener) OnMessagePhoneDelivered(ctx context.Context, ev
152112
Timestamp: payload.Timestamp,
153113
}
154114

155-
if err = listener.service.HandleMessageDelivered(ctx, handleParams); err != nil {
115+
if err := listener.service.HandleMessageDelivered(ctx, handleParams); err != nil {
156116
msg := fmt.Sprintf("cannot handle [%s] for message with ID [%s] for event with ID [%s]", event.Type(), handleParams.ID, event.ID())
157117
return listener.tracer.WrapErrorSpan(span, stacktrace.Propagate(err, msg))
158118
}
@@ -165,21 +125,8 @@ func (listener *MessageListener) OnMessagePhoneFailed(ctx context.Context, event
165125
ctx, span := listener.tracer.Start(ctx)
166126
defer span.End()
167127

168-
handled, err := listener.repository.Has(ctx, event.ID(), listener.signature(event))
169-
if err != nil {
170-
msg := fmt.Sprintf("cannot verify if event [%s] has been handled by [%T]", event.ID(), listener.signature(event))
171-
return listener.tracer.WrapErrorSpan(span, stacktrace.Propagate(err, msg))
172-
}
173-
174-
ctxLogger := listener.tracer.CtxLogger(listener.logger, span)
175-
176-
if handled {
177-
ctxLogger.Info(fmt.Sprintf("event [%s] has already been handled by [%s]", event.ID(), listener.signature(event)))
178-
return nil
179-
}
180-
181128
var payload events.MessageSendFailedPayload
182-
if err = event.DataAs(&payload); err != nil {
129+
if err := event.DataAs(&payload); err != nil {
183130
msg := fmt.Sprintf("cannot decode [%s] into [%T]", event.Data(), payload)
184131
return listener.tracer.WrapErrorSpan(span, stacktrace.Propagate(err, msg))
185132
}
@@ -191,7 +138,7 @@ func (listener *MessageListener) OnMessagePhoneFailed(ctx context.Context, event
191138
Timestamp: payload.Timestamp,
192139
}
193140

194-
if err = listener.service.HandleMessageFailed(ctx, handleParams); err != nil {
141+
if err := listener.service.HandleMessageFailed(ctx, handleParams); err != nil {
195142
msg := fmt.Sprintf("cannot handle [%s] for message with ID [%s] for event with ID [%s]", event.Type(), handleParams.ID, event.ID())
196143
return listener.tracer.WrapErrorSpan(span, stacktrace.Propagate(err, msg))
197144
}
@@ -342,7 +289,3 @@ func (listener *MessageListener) onMessageNotificationScheduled(ctx context.Cont
342289

343290
return nil
344291
}
345-
346-
func (listener *MessageListener) signature(event cloudevents.Event) string {
347-
return listener.handlerSignature(listener, event)
348-
}

‎api/pkg/listeners/message_thread_listener.go‎

Lines changed: 0 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,6 @@ import (
55
"fmt"
66

77
"github.com/NdoleStudio/httpsms/pkg/events"
8-
"github.com/NdoleStudio/httpsms/pkg/repositories"
98
"github.com/NdoleStudio/httpsms/pkg/services"
109
"github.com/NdoleStudio/httpsms/pkg/telemetry"
1110
cloudevents "github.com/cloudevents/sdk-go/v2"
@@ -14,7 +13,6 @@ import (
1413

1514
// MessageThreadListener handles cloud events which need to update entities.MessageThread
1615
type MessageThreadListener struct {
17-
listener
1816
logger telemetry.Logger
1917
tracer telemetry.Tracer
2018
service *services.MessageThreadService
@@ -25,15 +23,11 @@ func NewMessageThreadListener(
2523
logger telemetry.Logger,
2624
tracer telemetry.Tracer,
2725
service *services.MessageThreadService,
28-
repository repositories.EventListenerLogRepository,
2926
) (l *MessageThreadListener, routes map[string]events.EventListener) {
3027
l = &MessageThreadListener{
3128
logger: logger.WithService(fmt.Sprintf("%T", l)),
3229
tracer: tracer,
3330
service: service,
34-
listener: listener{
35-
repository: repository,
36-
},
3731
}
3832

3933
return l, map[string]events.EventListener{

0 commit comments

Comments
 (0)