Skip to content

Send and receive SMS messages using your Android phone programmatically via a simple HTTP API

Fix event

Acho Arnold28500a947d65
diff --git a/api/pkg/di/container.go b/api/pkg/di/container.go
index 1dc808b5..b27cc37c 100644
--- a/api/pkg/di/container.go
+++ b/api/pkg/di/container.go
@@ -133,6 +133,7 @@ func NewContainer(projectID string, version string) (container *Container) {
container.RegisterUserListeners()
container.RegisterPhoneRoutes()
+ container.RegisterPhoneListeners()
container.RegisterEventRoutes()
@@ -769,6 +770,7 @@ func (container *Container) MessageSendScheduleService() *services.MessageSendSc
container.Logger(),
container.Tracer(),
container.MessageSendScheduleRepository(),
+ container.EventDispatcher(),
)
}
@@ -1455,6 +1457,20 @@ func (container *Container) RegisterPhoneAPIKeyListeners() {
}
}
+// RegisterPhoneListeners registers event listeners for listeners.PhoneListener
+func (container *Container) RegisterPhoneListeners() {
+ container.logger.Debug(fmt.Sprintf("registering listeners for %T", listeners.PhoneListener{}))
+ _, routes := listeners.NewPhoneListener(
+ container.Logger(),
+ container.Tracer(),
+ container.PhoneService(),
+ )
+
+ for event, handler := range routes {
+ container.EventDispatcher().Subscribe(event, handler)
+ }
+}
+
// RegisterWebsocketListeners registers event listeners for listeners.WebsocketListener
func (container *Container) RegisterWebsocketListeners() {
container.logger.Debug(fmt.Sprintf("registering listeners for %T", listeners.WebsocketListener{}))
diff --git a/api/pkg/events/message_send_schedule_deleted_event.go b/api/pkg/events/message_send_schedule_deleted_event.go
new file mode 100644
index 00000000..3a32361c
--- /dev/null
+++ b/api/pkg/events/message_send_schedule_deleted_event.go
@@ -0,0 +1,18 @@
+package events
+
+import (
+ "time"
+
+ "github.com/NdoleStudio/httpsms/pkg/entities"
+ "github.com/google/uuid"
+)
+
+// EventTypeMessageSendScheduleDeleted is emitted when a message send schedule is deleted
+const EventTypeMessageSendScheduleDeleted = "message-send-schedule.deleted"
+
+// MessageSendScheduleDeletedPayload is the payload of the EventTypeMessageSendScheduleDeleted event
+type MessageSendScheduleDeletedPayload struct {
+ ScheduleID uuid.UUID `json:"schedule_id"`
+ UserID entities.UserID `json:"user_id"`
+ Timestamp time.Time `json:"timestamp"`
+}
diff --git a/api/pkg/listeners/phone_listener.go b/api/pkg/listeners/phone_listener.go
new file mode 100644
index 00000000..541936d9
--- /dev/null
+++ b/api/pkg/listeners/phone_listener.go
@@ -0,0 +1,76 @@
+package listeners
+
+import (
+ "context"
+ "fmt"
+
+ cloudevents "github.com/cloudevents/sdk-go/v2"
+ "github.com/palantir/stacktrace"
+
+ "github.com/NdoleStudio/httpsms/pkg/events"
+ "github.com/NdoleStudio/httpsms/pkg/services"
+ "github.com/NdoleStudio/httpsms/pkg/telemetry"
+)
+
+// PhoneListener handles cloud events that alter the state of entities.Phone
+type PhoneListener struct {
+ logger telemetry.Logger
+ tracer telemetry.Tracer
+ service *services.PhoneService
+}
+
+// NewPhoneListener creates a new instance of PhoneListener
+func NewPhoneListener(
+ logger telemetry.Logger,
+ tracer telemetry.Tracer,
+ service *services.PhoneService,
+) (l *PhoneListener, routes map[string]events.EventListener) {
+ l = &PhoneListener{
+ logger: logger.WithService(fmt.Sprintf("%T", l)),
+ tracer: tracer,
+ service: service,
+ }
+
+ return l, map[string]events.EventListener{
+ events.EventTypeMessageSendScheduleDeleted: l.onMessageSendScheduleDeleted,
+ events.UserAccountDeleted: l.onUserAccountDeleted,
+ }
+}
+
+// onMessageSendScheduleDeleted handles the events.EventTypeMessageSendScheduleDeleted event
+func (listener *PhoneListener) onMessageSendScheduleDeleted(ctx context.Context, event cloudevents.Event) error {
+ ctx, span := listener.tracer.Start(ctx)
+ defer span.End()
+
+ var payload events.MessageSendScheduleDeletedPayload
+ if err := event.DataAs(&payload); err != nil {
+ msg := fmt.Sprintf("cannot decode [%s] into [%T]", event.Data(), payload)
+ return listener.tracer.WrapErrorSpan(span, stacktrace.Propagate(err, msg))
+ }
+
+ if err := listener.service.NullifyScheduleID(ctx, payload.UserID, payload.ScheduleID); err != nil {
+ msg := fmt.Sprintf("cannot nullify schedule ID [%s] for user [%s] on [%s] event with ID [%s]", payload.ScheduleID, payload.UserID, event.Type(), event.ID())
+ return listener.tracer.WrapErrorSpan(span, stacktrace.Propagate(err, msg))
+ }
+
+ return nil
+}
+
+// onUserAccountDeleted handles the events.UserAccountDeleted event
+func (listener *PhoneListener) onUserAccountDeleted(ctx context.Context, event cloudevents.Event) error {
+ ctx, span := listener.tracer.Start(ctx)
+ defer span.End()
+
+ var payload events.UserAccountDeletedPayload
+ if err := event.DataAs(&payload); err != nil {
+ msg := fmt.Sprintf("cannot decode [%s] into [%T]", event.Data(), payload)
+ return listener.tracer.WrapErrorSpan(span, stacktrace.Propagate(err, msg))
+ }
+
+ if err := listener.service.DeleteAllForUser(ctx, payload.UserID); err != nil {
+ msg := fmt.Sprintf("cannot delete all [entities.Phone] for user [%s] on [%s] event with ID [%s]", payload.UserID, event.Type(), event.ID())
+ return listener.tracer.WrapErrorSpan(span, stacktrace.Propagate(err, msg))
+ }
+
+ return nil
+}
diff --git a/api/pkg/repositories/gorm_phone_repository.go b/api/pkg/repositories/gorm_phone_repository.go
index 55b6fb3f..a1f79ba8 100644
--- a/api/pkg/repositories/gorm_phone_repository.go
+++ b/api/pkg/repositories/gorm_phone_repository.go
@@ -50,6 +50,25 @@ func (repository *gormPhoneRepository) DeleteAllForUser(ctx context.Context, use
return nil
}
+// NullifyScheduleID sets MessageSendScheduleID to NULL for all phones referencing the given schedule
+func (repository *gormPhoneRepository) NullifyScheduleID(ctx context.Context, userID entities.UserID, scheduleID uuid.UUID) error {
+ ctx, span := repository.tracer.Start(ctx)
+ defer span.End()
+
+ err := repository.db.WithContext(ctx).
+ Model(&entities.Phone{}).
+ Where("user_id = ?", userID).
+ Where("message_send_schedule_id = ?", scheduleID).
+ Update("message_send_schedule_id", nil).Error
+ if err != nil {
+ msg := fmt.Sprintf("cannot nullify message_send_schedule_id [%s] for user [%s]", scheduleID, userID)
+ return repository.tracer.WrapErrorSpan(span, stacktrace.Propagate(err, msg))
+ }
+
+ repository.cache.Clear()
+ return nil
+}
+
// LoadByID loads a phone by ID
func (repository *gormPhoneRepository) LoadByID(ctx context.Context, userID entities.UserID, phoneID uuid.UUID) (*entities.Phone, error) {
ctx, span := repository.tracer.Start(ctx)
diff --git a/api/pkg/repositories/phone_repository.go b/api/pkg/repositories/phone_repository.go
index c9e82b98..2c184963 100644
--- a/api/pkg/repositories/phone_repository.go
+++ b/api/pkg/repositories/phone_repository.go
@@ -25,6 +25,9 @@ type PhoneRepository interface {
// Delete an entities.Phone
Delete(ctx context.Context, userID entities.UserID, phoneID uuid.UUID) error
+ // NullifyScheduleID sets MessageSendScheduleID to NULL for all phones referencing the given schedule
+ NullifyScheduleID(ctx context.Context, userID entities.UserID, scheduleID uuid.UUID) error
+
// DeleteAllForUser deletes all entities.Phone for a user
DeleteAllForUser(ctx context.Context, userID entities.UserID) error
}
diff --git a/api/pkg/services/event_dispatcher_service.go b/api/pkg/services/event_dispatcher_service.go
index dfb6dae6..f9ec6b33 100644
--- a/api/pkg/services/event_dispatcher_service.go
+++ b/api/pkg/services/event_dispatcher_service.go
@@ -148,7 +148,7 @@ func (dispatcher *EventDispatcher) Publish(ctx context.Context, event cloudevent
dispatcher.meter.Record(
ctx,
- float64(time.Since(start).Microseconds())/1000,
+ float64(time.Since(start).Milliseconds()),
metric.WithAttributes(
semconv.CloudeventsEventType(event.Type()),
semconv.CloudeventsEventSpecVersion(event.SpecVersion()),
diff --git a/api/pkg/services/message_send_schedule_service.go b/api/pkg/services/message_send_schedule_service.go
index 1d8cb337..1a4d85ed 100644
--- a/api/pkg/services/message_send_schedule_service.go
+++ b/api/pkg/services/message_send_schedule_service.go
@@ -7,6 +7,7 @@ import (
"time"
"github.com/NdoleStudio/httpsms/pkg/entities"
+ "github.com/NdoleStudio/httpsms/pkg/events"
"github.com/NdoleStudio/httpsms/pkg/repositories"
"github.com/NdoleStudio/httpsms/pkg/telemetry"
"github.com/google/uuid"
@@ -19,6 +20,7 @@ type MessageSendScheduleService struct {
logger telemetry.Logger
tracer telemetry.Tracer
repository repositories.MessageSendScheduleRepository
+ dispatcher *EventDispatcher
}
// NewMessageSendScheduleService creates a new MessageSendScheduleService.
@@ -26,11 +28,13 @@ func NewMessageSendScheduleService(
logger telemetry.Logger,
tracer telemetry.Tracer,
repository repositories.MessageSendScheduleRepository,
+ dispatcher *EventDispatcher,
) *MessageSendScheduleService {
return &MessageSendScheduleService{
logger: logger.WithService(fmt.Sprintf("%T", &MessageSendScheduleService{})),
tracer: tracer,
repository: repository,
+ dispatcher: dispatcher,
}
}
@@ -137,7 +141,30 @@ func (service *MessageSendScheduleService) Delete(
userID entities.UserID,
scheduleID uuid.UUID,
) error {
- return service.repository.Delete(ctx, userID, scheduleID)
+ ctx, span := service.tracer.Start(ctx)
+ defer span.End()
+
+ if err := service.repository.Delete(ctx, userID, scheduleID); err != nil {
+ msg := fmt.Sprintf("cannot delete message send schedule with ID [%s] for user [%s]", scheduleID, userID)
+ return service.tracer.WrapErrorSpan(span, stacktrace.Propagate(err, msg))
+ }
+
+ event, err := service.createEvent(events.EventTypeMessageSendScheduleDeleted, fmt.Sprintf("%T", service), events.MessageSendScheduleDeletedPayload{
+ ScheduleID: scheduleID,
+ UserID: userID,
+ Timestamp: time.Now().UTC(),
+ })
+ if err != nil {
+ msg := fmt.Sprintf("cannot create [%s] event for schedule [%s]", events.EventTypeMessageSendScheduleDeleted, scheduleID)
+ return service.tracer.WrapErrorSpan(span, stacktrace.Propagate(err, msg))
+ }
+
+ if err = service.dispatcher.Dispatch(ctx, event); err != nil {
+ msg := fmt.Sprintf("cannot dispatch [%s] event for schedule [%s]", event.Type(), scheduleID)
+ return service.tracer.WrapErrorSpan(span, stacktrace.Propagate(err, msg))
+ }
+
+ return nil
}
// sanitizeWindows normalizes and sorts schedule windows by day and start minute.
diff --git a/api/pkg/services/phone_service.go b/api/pkg/services/phone_service.go
index 1ddbf2a4..ae863d32 100644
--- a/api/pkg/services/phone_service.go
+++ b/api/pkg/services/phone_service.go
@@ -56,6 +56,20 @@ func (service *PhoneService) DeleteAllForUser(ctx context.Context, userID entiti
return nil
}
+// NullifyScheduleID sets MessageSendScheduleID to NULL for all phones referencing the given schedule.
+func (service *PhoneService) NullifyScheduleID(ctx context.Context, userID entities.UserID, scheduleID uuid.UUID) error {
+ ctx, span := service.tracer.Start(ctx)
+ defer span.End()
+
+ if err := service.repository.NullifyScheduleID(ctx, userID, scheduleID); err != nil {
+ msg := fmt.Sprintf("cannot nullify schedule ID [%s] for user [%s]", scheduleID, userID)
+ return service.tracer.WrapErrorSpan(span, stacktrace.Propagate(err, msg))
+ }
+
+ service.tracer.CtxLogger(service.logger, span).Info(fmt.Sprintf("nullified schedule ID [%s] on phones for user [%s]", scheduleID, userID))
+ return nil
+}
+
// Index fetches the heartbeats for a phone number
func (service *PhoneService) Index(ctx context.Context, authUser entities.AuthContext, params repositories.IndexParams) (*[]entities.Phone, error) {
ctx, span := service.tracer.Start(ctx)