Skip to content

Commit ecbf431

Browse files
AchoArnoldAchoArnold
committed
Update message to not store events in the databse
1 parent 74d84d4 commit ecbf431

7 files changed

Lines changed: 5 additions & 86 deletions

File tree

‎api/cmd/replay/main.go‎

Lines changed: 1 addition & 40 deletions
Original file line numberDiff line numberDiff line change
@@ -1,17 +1,10 @@
11
package main
22

33
import (
4-
"context"
5-
"fmt"
64
"log"
75

8-
"github.com/NdoleStudio/httpsms/pkg/events"
9-
"github.com/NdoleStudio/httpsms/pkg/listeners"
10-
116
"github.com/NdoleStudio/httpsms/pkg/di"
12-
"github.com/cheggaaa/pb/v3"
137
"github.com/joho/godotenv"
14-
"github.com/palantir/stacktrace"
158
)
169

1710
func main() {
@@ -20,37 +13,5 @@ func main() {
2013
log.Fatal("Error loading .env file")
2114
}
2215

23-
container := di.NewContainer("http-sms", "")
24-
eventRepo := container.EventRepository()
25-
logger := container.Logger()
26-
27-
listener, _ := listeners.NewBillingListener(
28-
container.Logger(),
29-
container.Tracer(),
30-
container.BillingService(),
31-
)
32-
33-
cloudEvents, err := eventRepo.FetchAll(context.Background())
34-
if err != nil {
35-
logger.Fatal(stacktrace.Propagate(err, "cannot fetch all events"))
36-
}
37-
logger.Info(fmt.Sprintf("fetched %d cloudevents", len(*cloudEvents)))
38-
39-
// create and start new bar
40-
bar := pb.StartNew(len(*cloudEvents))
41-
for _, event := range *cloudEvents {
42-
if event.Type() == events.EventTypeMessageAPISent {
43-
if err := listener.OnMessageAPISent(context.Background(), event); err != nil {
44-
logger.Fatal(stacktrace.Propagate(err, "cannot register api sent event"))
45-
}
46-
}
47-
if event.Type() == events.EventTypeMessagePhoneReceived {
48-
if err := listener.OnMessagePhoneReceived(context.Background(), event); err != nil {
49-
logger.Fatal(stacktrace.Propagate(err, "cannot register api received event"))
50-
}
51-
}
52-
bar.Increment()
53-
}
54-
55-
bar.Finish()
16+
_ = di.NewContainer("http-sms", "")
5617
}

‎api/go.mod‎

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,6 @@ require (
1010
github.com/NdoleStudio/go-otelroundtripper v0.0.8
1111
github.com/NdoleStudio/lemonsqueezy-go v1.0.0
1212
github.com/carlmjohnson/requests v0.23.4
13-
github.com/cheggaaa/pb/v3 v3.1.4
1413
github.com/cloudevents/sdk-go/v2 v2.14.0
1514
github.com/cockroachdb/cockroach-go/v2 v2.3.5
1615
github.com/davecgh/go-spew v1.1.1
@@ -66,13 +65,11 @@ require (
6665
github.com/Masterminds/semver v1.5.0 // indirect
6766
github.com/Masterminds/sprig v2.22.0+incompatible // indirect
6867
github.com/PuerkitoBio/goquery v1.8.1 // indirect
69-
github.com/VividCortex/ewma v1.2.0 // indirect
7068
github.com/andybalholm/brotli v1.0.5 // indirect
7169
github.com/andybalholm/cascadia v1.3.2 // indirect
7270
github.com/cenkalti/backoff/v4 v4.2.1 // indirect
7371
github.com/cespare/xxhash/v2 v2.2.0 // indirect
7472
github.com/dgryski/go-rendezvous v0.0.0-20200823014737-9f7001d12a5f // indirect
75-
github.com/fatih/color v1.15.0 // indirect
7673
github.com/go-logr/logr v1.2.4 // indirect
7774
github.com/go-logr/stdr v1.2.2 // indirect
7875
github.com/go-openapi/jsonpointer v0.20.0 // indirect

‎api/go.sum‎

Lines changed: 0 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -52,8 +52,6 @@ github.com/PuerkitoBio/goquery v1.8.1 h1:uQxhNlArOIdbrH1tr0UXwdVFgDcZDrZVdcpygAc
5252
github.com/PuerkitoBio/goquery v1.8.1/go.mod h1:Q8ICL1kNUJ2sXGoAhPGUdYDJvgQgHzJsnnd3H7Ho5jQ=
5353
github.com/PuerkitoBio/purell v1.1.1/go.mod h1:c11w/QuzBsJSee3cPx9rAFu61PvFxuPbtSwDGJws/X0=
5454
github.com/PuerkitoBio/urlesc v0.0.0-20170810143723-de5bf2ad4578/go.mod h1:uGdkoq3SwY9Y+13GIhn11/XLaGBb4BfwItxLd5jeuXE=
55-
github.com/VividCortex/ewma v1.2.0 h1:f58SaIzcDXrSy3kWaHNvuJgJ3Nmz59Zji6XoJR/q1ow=
56-
github.com/VividCortex/ewma v1.2.0/go.mod h1:nz4BbCtbLyFDeC9SUHbtcT5644juEuWfUAUnGx7j5l4=
5755
github.com/andybalholm/brotli v1.0.5 h1:8uQZIdzKmjc/iuPu7O2ioW48L81FgatrcpfFmiq/cCs=
5856
github.com/andybalholm/brotli v1.0.5/go.mod h1:fO7iG3H7G2nSZ7m0zPUDn85XEX2GTukHGRSepvi9Eig=
5957
github.com/andybalholm/cascadia v1.0.0/go.mod h1:GsXiBklL0woXo1j/WYWtSYYC4ouU9PqHO0sqidkEA4Y=
@@ -76,8 +74,6 @@ github.com/census-instrumentation/opencensus-proto v0.2.1/go.mod h1:f6KPmirojxKA
7674
github.com/cespare/xxhash/v2 v2.1.1/go.mod h1:VGX0DQ3Q6kWi7AoAeZDth3/j3BFtOZR5XLFGgcrjCOs=
7775
github.com/cespare/xxhash/v2 v2.2.0 h1:DC2CZ1Ep5Y4k3ZQ899DldepgrayRUGE6BBZ/cd9Cj44=
7876
github.com/cespare/xxhash/v2 v2.2.0/go.mod h1:VGX0DQ3Q6kWi7AoAeZDth3/j3BFtOZR5XLFGgcrjCOs=
79-
github.com/cheggaaa/pb/v3 v3.1.4 h1:DN8j4TVVdKu3WxVwcRKu0sG00IIU6FewoABZzXbRQeo=
80-
github.com/cheggaaa/pb/v3 v3.1.4/go.mod h1:6wVjILNBaXMs8c21qRiaUM8BR82erfgau1DQ4iUXmSA=
8177
github.com/client9/misspell v0.3.4/go.mod h1:qj6jICC3Q7zFZvVWo7KLAzC3yx5G7kyvSDkc90ppPyw=
8278
github.com/cloudevents/sdk-go/v2 v2.14.0 h1:Nrob4FwVgi5L4tV9lhjzZcjYqFVyJzsA56CwPaPfv6s=
8379
github.com/cloudevents/sdk-go/v2 v2.14.0/go.mod h1:xDmKfzNjM8gBvjaF8ijFjM1VYOVUEeUfapHMUX1T5To=
@@ -104,8 +100,6 @@ github.com/envoyproxy/go-control-plane v0.9.4/go.mod h1:6rpuAdCZL397s3pYoYcLgu1m
104100
github.com/envoyproxy/go-control-plane v0.9.9-0.20201210154907-fd9021fe5dad/go.mod h1:cXg6YxExXjJnVBQHBLXeUAgxn2UodCpnH306RInaBQk=
105101
github.com/envoyproxy/go-control-plane v0.9.10-0.20210907150352-cf90f659a021/go.mod h1:AFq3mo9L8Lqqiid3OhADV3RfLJnjiw63cSpi+fDTRC0=
106102
github.com/envoyproxy/protoc-gen-validate v0.1.0/go.mod h1:iSmxcyjqTsJpI2R4NaDN7+kN2VEUnK/pcBlmesArF7c=
107-
github.com/fatih/color v1.15.0 h1:kOqh6YHBtK8aywxGerMG2Eq3H6Qgoqeo13Bk2Mv/nBs=
108-
github.com/fatih/color v1.15.0/go.mod h1:0h5ZqXfHYED7Bhv2ZJamyIOUej9KtShiJESRwBDUSsw=
109103
github.com/ghodss/yaml v1.0.0/go.mod h1:4dBDuWmgqj2HViK6kFavaiC9ZROes6MMH2rRYeMEF04=
110104
github.com/go-gomail/gomail v0.0.0-20160411212932-81ebce5c23df/go.mod h1:GJr+FCSXshIwgHBtLglIg9M2l2kQSi6QjVAngtzI08Y=
111105
github.com/go-logr/logr v1.2.2/go.mod h1:jdQByPbusPIv2/zmleS9BjJVeZ6kBagPoEUsqbVz/1A=

‎api/pkg/di/container.go‎

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -529,7 +529,6 @@ func (container *Container) EventDispatcher() (dispatcher *services.EventDispatc
529529
dispatcher = services.NewEventDispatcher(
530530
container.Logger(),
531531
container.Tracer(),
532-
container.EventRepository(),
533532
container.EventsQueue(),
534533
container.EventsQueueConfiguration(),
535534
)
@@ -852,7 +851,6 @@ func (container *Container) RegisterMessageListeners() {
852851
container.Logger(),
853852
container.Tracer(),
854853
container.MessageService(),
855-
container.EventListenerLogRepository(),
856854
)
857855

858856
for event, handler := range routes {

‎api/pkg/listeners/listener.go‎

Lines changed: 0 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -1,14 +1,10 @@
11
package listeners
22

33
import (
4-
"context"
54
"fmt"
6-
"time"
75

8-
"github.com/NdoleStudio/httpsms/pkg/entities"
96
"github.com/NdoleStudio/httpsms/pkg/repositories"
107
cloudevents "github.com/cloudevents/sdk-go/v2"
11-
"github.com/google/uuid"
128
)
139

1410
type listener struct {
@@ -18,15 +14,3 @@ type listener struct {
1814
func (listener listener) handlerSignature(handler any, event cloudevents.Event) string {
1915
return fmt.Sprintf("%s.%T", event.Type(), handler)
2016
}
21-
22-
func (listener listener) storeEventListenerLog(ctx context.Context, handler string, event cloudevents.Event) error {
23-
return listener.repository.Store(ctx, &entities.EventListenerLog{
24-
ID: uuid.New(),
25-
EventID: event.ID(),
26-
EventType: event.Type(),
27-
Handler: handler,
28-
Duration: time.Now().Sub(event.Time()),
29-
HandledAt: time.Now().UTC(),
30-
CreatedAt: time.Now().UTC(),
31-
})
32-
}

‎api/pkg/listeners/message_listener.go‎

Lines changed: 4 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,6 @@ import (
66

77
"github.com/NdoleStudio/httpsms/pkg/entities"
88
"github.com/NdoleStudio/httpsms/pkg/events"
9-
"github.com/NdoleStudio/httpsms/pkg/repositories"
109
"github.com/NdoleStudio/httpsms/pkg/services"
1110
"github.com/NdoleStudio/httpsms/pkg/telemetry"
1211
cloudevents "github.com/cloudevents/sdk-go/v2"
@@ -26,15 +25,11 @@ func NewMessageListener(
2625
logger telemetry.Logger,
2726
tracer telemetry.Tracer,
2827
service *services.MessageService,
29-
repository repositories.EventListenerLogRepository,
3028
) (l *MessageListener, routes map[string]events.EventListener) {
3129
l = &MessageListener{
3230
logger: logger.WithService(fmt.Sprintf("%T", l)),
3331
tracer: tracer,
3432
service: service,
35-
listener: listener{
36-
repository: repository,
37-
},
3833
}
3934

4035
return l, map[string]events.EventListener{
@@ -86,7 +81,7 @@ func (listener *MessageListener) OnMessagePhoneSending(ctx context.Context, even
8681
return listener.tracer.WrapErrorSpan(span, stacktrace.Propagate(err, msg))
8782
}
8883

89-
return listener.storeEventListenerLog(ctx, listener.signature(event), event)
84+
return nil
9085
}
9186

9287
// OnMessagePhoneSent handles the events.EventTypeMessagePhoneSent event
@@ -124,8 +119,7 @@ func (listener *MessageListener) OnMessagePhoneSent(ctx context.Context, event c
124119
msg := fmt.Sprintf("cannot handle [%s] for message with ID [%s] for event with ID [%s]", event.Type(), handleParams.ID, event.ID())
125120
return listener.tracer.WrapErrorSpan(span, stacktrace.Propagate(err, msg))
126121
}
127-
128-
return listener.storeEventListenerLog(ctx, listener.signature(event), event)
122+
return nil
129123
}
130124

131125
// OnMessagePhoneDelivered handles the events.EventTypeMessagePhoneDelivered event
@@ -163,7 +157,7 @@ func (listener *MessageListener) OnMessagePhoneDelivered(ctx context.Context, ev
163157
return listener.tracer.WrapErrorSpan(span, stacktrace.Propagate(err, msg))
164158
}
165159

166-
return listener.storeEventListenerLog(ctx, listener.signature(event), event)
160+
return nil
167161
}
168162

169163
// OnMessagePhoneFailed handles the events.EventTypeMessageSendFailed event
@@ -202,7 +196,7 @@ func (listener *MessageListener) OnMessagePhoneFailed(ctx context.Context, event
202196
return listener.tracer.WrapErrorSpan(span, stacktrace.Propagate(err, msg))
203197
}
204198

205-
return listener.storeEventListenerLog(ctx, listener.signature(event), event)
199+
return nil
206200
}
207201

208202
// onMessageNotificationFailed handles the events.EventTypeMessageNotificationFailed event

‎api/pkg/services/event_dispatcher_service.go‎

Lines changed: 0 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,6 @@ import (
99
"time"
1010

1111
"github.com/NdoleStudio/httpsms/pkg/events"
12-
"github.com/NdoleStudio/httpsms/pkg/repositories"
1312
"github.com/NdoleStudio/httpsms/pkg/telemetry"
1413
cloudevents "github.com/cloudevents/sdk-go/v2"
1514
"github.com/palantir/stacktrace"
@@ -19,7 +18,6 @@ import (
1918
type EventDispatcher struct {
2019
logger telemetry.Logger
2120
tracer telemetry.Tracer
22-
repository repositories.EventRepository
2321
listeners map[string][]events.EventListener
2422
queue PushQueue
2523
queueConfig PushQueueConfig
@@ -29,15 +27,13 @@ type EventDispatcher struct {
2927
func NewEventDispatcher(
3028
logger telemetry.Logger,
3129
tracer telemetry.Tracer,
32-
repository repositories.EventRepository,
3330
queue PushQueue,
3431
queueConfig PushQueueConfig,
3532
) (dispatcher *EventDispatcher) {
3633
return &EventDispatcher{
3734
logger: logger,
3835
tracer: tracer,
3936
listeners: make(map[string][]events.EventListener),
40-
repository: repository,
4137
queue: queue,
4238
queueConfig: queueConfig,
4339
}
@@ -53,11 +49,6 @@ func (dispatcher *EventDispatcher) DispatchSync(ctx context.Context, event cloud
5349
return dispatcher.tracer.WrapErrorSpan(span, stacktrace.Propagate(err, msg))
5450
}
5551

56-
if err := dispatcher.repository.Create(ctx, event); err != nil {
57-
msg := fmt.Sprintf("cannot save event with ID [%s] and type [%s]", event.ID(), event.Type())
58-
return dispatcher.tracer.WrapErrorSpan(span, stacktrace.Propagate(err, msg))
59-
}
60-
6152
dispatcher.Publish(ctx, event)
6253
return nil
6354
}

0 commit comments

Comments
 (0)