[mobile] initial implementation of processing order param

Author: capcom6

internal/sms-gateway/handlers/messages/3rdparty.go

@@ -60,7 +60,7 @@ type ThirdPartyController struct {
 //
 // Enqueue message
 func (h *ThirdPartyController) post(user models.User, c *fiber.Ctx) error {
-	var params postQueryParams
+	var params thirdPartyPostQueryParams
 	if err := h.QueryParserValidator(c, &params); err != nil {
 		return fiber.NewError(fiber.StatusBadRequest, err.Error())
 	}
@@ -190,7 +190,7 @@ func (h *ThirdPartyController) post(user models.User, c *fiber.Ctx) error {
 //
 // Get message history
 func (h *ThirdPartyController) list(user models.User, c *fiber.Ctx) error {
-	params := getQueryParams{}
+	params := thirdPartyGetQueryParams{}
 	if err := h.QueryParserValidator(c, &params); err != nil {
 		return fiber.NewError(fiber.StatusBadRequest, err.Error())
 	}

internal/sms-gateway/handlers/messages/params.go

@@ -7,12 +7,12 @@ import (
 	"github.com/android-sms-gateway/server/internal/sms-gateway/modules/messages"
 )
 
-type postQueryParams struct {
+type thirdPartyPostQueryParams struct {
 	SkipPhoneValidation bool `query:"skipPhoneValidation"`
 	DeviceActiveWithin  uint `query:"deviceActiveWithin"`
 }
 
-type getQueryParams struct {
+type thirdPartyGetQueryParams struct {
 	StartDate string `query:"from" validate:"omitempty,datetime=2006-01-02T15:04:05Z07:00"`
 	EndDate   string `query:"to" validate:"omitempty,datetime=2006-01-02T15:04:05Z07:00"`
 	State     string `query:"state" validate:"omitempty,oneof=Pending Processed Sent Delivered Failed"`
@@ -21,15 +21,15 @@ type getQueryParams struct {
 	Offset    int    `query:"offset" validate:"omitempty,min=0"`
 }
 
-func (p *getQueryParams) Validate() error {
+func (p *thirdPartyGetQueryParams) Validate() error {
 	if p.StartDate != "" && p.EndDate != "" && p.StartDate > p.EndDate {
 		return fmt.Errorf("`from` date must be before `to` date")
 	}
 
 	return nil
 }
 
-func (p *getQueryParams) ToFilter() messages.MessagesSelectFilter {
+func (p *thirdPartyGetQueryParams) ToFilter() messages.MessagesSelectFilter {
 	filter := messages.MessagesSelectFilter{}
 
 	if p.StartDate != "" {
@@ -55,7 +55,7 @@ func (p *getQueryParams) ToFilter() messages.MessagesSelectFilter {
 	return filter
 }
 
-func (p *getQueryParams) ToOptions() messages.MessagesSelectOptions {
+func (p *thirdPartyGetQueryParams) ToOptions() messages.MessagesSelectOptions {
 	options := messages.MessagesSelectOptions{
 		WithRecipients: true,
 		WithStates:     true,

internal/sms-gateway/handlers/mobile.go

@@ -157,13 +157,31 @@ func (h *mobileHandler) patchDevice(device models.Device, c *fiber.Ctx) error {
 //	@Tags			Device, Messages
 //	@Accept			json
 //	@Produce		json
+//	@Param			order	query		string	false	"Message processing order: lifo (default) or fifo"	Enums(lifo,fifo)
 //	@Success		200	{object}	smsgateway.MobileGetMessagesResponse	"List of pending messages"
+//	@Failure		400	{object}	smsgateway.ErrorResponse				"Bad request"
 //	@Failure		500	{object}	smsgateway.ErrorResponse				"Internal server error"
 //	@Router			/mobile/v1/message [get]
 //
 // Get messages for sending
 func (h *mobileHandler) getMessage(device models.Device, c *fiber.Ctx) error {
-	msgs, err := h.messagesSvc.SelectPending(device.ID)
+	// Get and validate order parameter
+	orderParam := c.Query("order")
+	order := "lifo" // Default to LIFO
+
+	if orderParam != "" {
+		orderParam = strings.ToLower(orderParam)
+		switch orderParam {
+		case "lifo":
+			order = "lifo"
+		case "fifo":
+			order = "fifo"
+		default:
+			return fiber.NewError(fiber.StatusBadRequest, "Invalid order parameter. Must be 'lifo' or 'fifo'")
+		}
+	}
+
+	msgs, err := h.messagesSvc.SelectPending(device.ID, messages.MessagesOrder(order))
 	if err != nil {
 		return fmt.Errorf("can't get messages: %w", err)
 	}

internal/sms-gateway/modules/messages/repository.go

@@ -70,7 +70,11 @@ func (r *repository) Select(filter MessagesSelectFilter, options MessagesSelectO
 	}
 
 	// Apply ordering
-	query = query.Order("messages.priority DESC, messages.id DESC")
+	if options.OrderBy == MessagesOrderFIFO {
+		query = query.Order("messages.priority DESC, messages.id ASC")
+	} else {
+		query = query.Order("messages.priority DESC, messages.id DESC")
+	}
 
 	// Preload related data
 	if options.WithRecipients {
@@ -91,13 +95,14 @@ func (r *repository) Select(filter MessagesSelectFilter, options MessagesSelectO
 	return messages, total, nil
 }
 
-func (r *repository) SelectPending(deviceID string) ([]Message, error) {
+func (r *repository) SelectPending(deviceID string, order MessagesOrder) ([]Message, error) {
 	messages, _, err := r.Select(MessagesSelectFilter{
 		DeviceID: deviceID,
 		State:    ProcessingStatePending,
 	}, MessagesSelectOptions{
 		WithRecipients: true,
 		Limit:          100,
+		OrderBy:        order,
 	})
 
 	return messages, err

internal/sms-gateway/modules/messages/repository_filter.go

@@ -2,6 +2,13 @@ package messages
 
 import "time"
 
+type MessagesOrder string
+
+const (
+	MessagesOrderLIFO MessagesOrder = "lifo"
+	MessagesOrderFIFO MessagesOrder = "fifo"
+)
+
 type MessagesSelectFilter struct {
 	ExtID     string
 	UserID    string
@@ -16,6 +23,8 @@ type MessagesSelectOptions struct {
 	WithDevice     bool
 	WithStates     bool
 
+	OrderBy MessagesOrder
+
 	Limit  int
 	Offset int
 }

internal/sms-gateway/modules/messages/service.go

@@ -92,8 +92,12 @@ func (s *Service) RunBackgroundTasks(ctx context.Context, wg *sync.WaitGroup) {
 	}()
 }
 
-func (s *Service) SelectPending(deviceID string) ([]MessageOut, error) {
-	messages, err := s.messages.SelectPending(deviceID)
+func (s *Service) SelectPending(deviceID string, order MessagesOrder) ([]MessageOut, error) {
+	if order == "" {
+		order = MessagesOrderLIFO
+	}
+
+	messages, err := s.messages.SelectPending(deviceID, order)
 	if err != nil {
 		return nil, err
 	}