Skip to content

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

fix: handle review feedback

giresse190085695baa6f
diff --git a/api/pkg/listeners/send_schedule_listener.go b/api/pkg/listeners/send_schedule_listener.go
index 08a66f97..ac65eddd 100644
--- a/api/pkg/listeners/send_schedule_listener.go
+++ b/api/pkg/listeners/send_schedule_listener.go
@@ -25,7 +25,7 @@ func NewSendScheduleListener(
service *services.SendScheduleService,
) (l *SendScheduleListener, routes map[string]events.EventListener) {
l = &SendScheduleListener{
- logger: logger.WithService(fmt.Sprintf("%T", l)),
+ logger: logger.WithService(fmt.Sprintf("%T", &SendScheduleListener{})),
tracer: tracer,
service: service,
}
diff --git a/api/pkg/services/send_schedule_service.go b/api/pkg/services/send_schedule_service.go
index d942d285..5bbddb7d 100644
--- a/api/pkg/services/send_schedule_service.go
+++ b/api/pkg/services/send_schedule_service.go
@@ -135,94 +135,6 @@ func (service *SendScheduleService) Delete(
return service.repository.Delete(ctx, userID, scheduleID)
}
-// ResolveScheduledSendTime returns the next allowed send time based on the schedule windows and timezone.
-func (service *SendScheduleService) ResolveScheduledSendTime(
- ctx context.Context,
- schedule *entities.MessageSendSchedule,
- current time.Time,
-) (time.Time, error) {
- ctx, span := service.tracer.Start(ctx)
- defer span.End()
-
- if schedule == nil || !schedule.IsActive || len(schedule.Windows) == 0 {
- return current.UTC(), nil
- }
-
- location, err := time.LoadLocation(schedule.Timezone)
- if err != nil {
- return current.UTC(), service.tracer.WrapErrorSpan(
- span,
- stacktrace.Propagate(
- err,
- fmt.Sprintf("cannot load location [%s]", schedule.Timezone),
- ),
- )
- }
-
- base := current.In(location)
- best := time.Time{}
-
- for dayOffset := 0; dayOffset <= 7; dayOffset++ {
- day := base.AddDate(0, 0, dayOffset)
- weekday := int(day.Weekday())
-
- for _, window := range schedule.Windows {
- if window.DayOfWeek != weekday {
- continue
- }
-
- start := time.Date(
- day.Year(),
- day.Month(),
- day.Day(),
- 0,
- 0,
- 0,
- 0,
- location,
- ).Add(time.Duration(window.StartMinute) * time.Minute)
-
- end := time.Date(
- day.Year(),
- day.Month(),
- day.Day(),
- 0,
- 0,
- 0,
- 0,
- location,
- ).Add(time.Duration(window.EndMinute) * time.Minute)
-
- var candidateTime time.Time
-
- switch {
- case dayOffset == 0 && base.Before(start):
- candidateTime = start
- case dayOffset == 0 && (base.Equal(start) || (base.After(start) && base.Before(end))):
- candidateTime = base
- case dayOffset > 0:
- candidateTime = start
- default:
- continue
- }
-
- if best.IsZero() || candidateTime.Before(best) {
- best = candidateTime
- }
- }
-
- if !best.IsZero() {
- break
- }
- }
-
- if best.IsZero() {
- return current.UTC(), nil
- }
-
- return best.UTC(), nil
-}
-
// sanitizeWindows normalizes and sorts schedule windows by day and start minute.
func sanitizeWindows(
windows []entities.MessageSendScheduleWindow,