kernelcode0
diff --git a/‎api/pkg/entities/phone.go‎
Lines changed: 4 additions & 4 deletions b/‎api/pkg/entities/phone.go‎
Lines changed: 4 additions & 4 deletions
diff --git a/‎api/pkg/services/message_service.go‎
Lines changed: 1 addition & 1 deletion b/‎api/pkg/services/message_service.go‎
Lines changed: 1 addition & 1 deletion
diff --git a/‎api/pkg/services/phone_service.go‎
Lines changed: 2 additions & 2 deletions b/‎api/pkg/services/phone_service.go‎
Lines changed: 2 additions & 2 deletions
@@ -26,21 +26,21 @@ type Phone struct {
 
 // MessageExpirationDuration returns the message expiration as time.Duration
 func (phone *Phone) MessageExpirationDuration() time.Duration {
-	return time.Duration(phone.MessageExpirationSeconds) * time.Second
+	return time.Duration(int(phone.MessageExpirationSecondsSanitized())) * time.Second
 }
 
 // MessageExpirationSecondsSanitized returns the message expiration seconds with default of 1 hour
 func (phone *Phone) MessageExpirationSecondsSanitized() uint {
 	if phone.MessageExpirationSeconds == 0 {
-		return 60 * 60 // 1 hour
+		return 10 * 60 // 10 minutes
 	}
 	return phone.MessageExpirationSeconds
 }
 
-// MaxSendAttemptsSanitized returns the max send attempts replacing 0 with 1
+// MaxSendAttemptsSanitized returns the max send attempts replacing 0 with 2
 func (phone *Phone) MaxSendAttemptsSanitized() uint {
 	if phone.MaxSendAttempts == 0 {
-		return 1
+		return 2
 	}
 	return phone.MaxSendAttempts
 }
@@ -408,7 +408,7 @@ func (service *MessageService) HandleMessageSending(ctx context.Context, params
 		return service.tracer.WrapErrorSpan(span, stacktrace.Propagate(err, msg))
 	}
 
-	ctxLogger.Info(fmt.Sprintf("message with id [%s] in after adding send attempt", message.ID))
+	ctxLogger.Info(fmt.Sprintf("message with id [%s] updated after adding send attempt", message.ID))
 	return nil
 }
 
 
@@ -174,7 +174,7 @@ func (service *PhoneService) createPhone(ctx context.Context, params PhoneUpsert
 		// Android has a limit of 30 SMS messages per minute without user permission, to be safe let's use 10 messages per minute
 		// https://android.googlesource.com/platform/frameworks/opt/telephony/+/master/src/java/com/android/internal/telephony/SmsUsageMonitor.java#80
 		MessagesPerMinute:        10,
-		MessageExpirationSeconds: 15 * 60, // 15 minutes
+		MessageExpirationSeconds: 10 * 60, // 10 minutes
 		MaxSendAttempts:          2,
 		SIM:                      params.SIM,
 		PhoneNumber:              phonenumbers.Format(&params.PhoneNumber, phonenumbers.E164),
@@ -202,7 +202,7 @@ func (service *PhoneService) update(phone *entities.Phone, params PhoneUpsertPar
 	if phone.FcmToken != nil {
 		phone.FcmToken = params.FcmToken
 	}
-	if params.MessagesPerMinute != nil {
+	if params.MessagesPerMinute != nil && *params.MessagesPerMinute > 0 {
 		phone.MessagesPerMinute = *params.MessagesPerMinute
 	}
Original file line number	Diff line number	Diff line change
`@@ -26,21 +26,21 @@ type Phone struct {`
`26`	`26`
`27`	`27`	`// MessageExpirationDuration returns the message expiration as time.Duration`
`28`	`28`	`func (phone *Phone) MessageExpirationDuration() time.Duration {`
`29`		`- return time.Duration(phone.MessageExpirationSeconds) * time.Second`
	`29`	`+ return time.Duration(int(phone.MessageExpirationSecondsSanitized())) * time.Second`
`30`	`30`	`}`
`31`	`31`
`32`	`32`	`// MessageExpirationSecondsSanitized returns the message expiration seconds with default of 1 hour`
`33`	`33`	`func (phone *Phone) MessageExpirationSecondsSanitized() uint {`
`34`	`34`	`if phone.MessageExpirationSeconds == 0 {`
`35`		`- return 60 * 60 // 1 hour`
	`35`	`+ return 10 * 60 // 10 minutes`
`36`	`36`	`}`
`37`	`37`	`return phone.MessageExpirationSeconds`
`38`	`38`	`}`
`39`	`39`
`40`		`-// MaxSendAttemptsSanitized returns the max send attempts replacing 0 with 1`
	`40`	`+// MaxSendAttemptsSanitized returns the max send attempts replacing 0 with 2`
`41`	`41`	`func (phone *Phone) MaxSendAttemptsSanitized() uint {`
`42`	`42`	`if phone.MaxSendAttempts == 0 {`
`43`		`- return 1`
	`43`	`+ return 2`
`44`	`44`	`}`
`45`	`45`	`return phone.MaxSendAttempts`
`46`	`46`	`}`
Original file line number	Diff line number	Diff line change
`@@ -408,7 +408,7 @@ func (service *MessageService) HandleMessageSending(ctx context.Context, params`
`408`	`408`	`return service.tracer.WrapErrorSpan(span, stacktrace.Propagate(err, msg))`
`409`	`409`	`}`
`410`	`410`
`411`		`- ctxLogger.Info(fmt.Sprintf("message with id [%s] in after adding send attempt", message.ID))`
	`411`	`+ ctxLogger.Info(fmt.Sprintf("message with id [%s] updated after adding send attempt", message.ID))`
`412`	`412`	`return nil`
`413`	`413`	`}`
`414`	`414`