Skip to content

[mobile] messages processing order param #162

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 2 commits into from
Aug 16, 2025
Merged

[mobile] messages processing order param #162

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
e62d560
[mobile] add order param for `GET /message` endpoint
capcom6 Aug 13, 2025
7ad51af
[handlers] use `Validate.Var` for slice validation
capcom6 Aug 14, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion internal/sms-gateway/handlers/base/handler.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -43,7 +43,7 @@ func (h *Handler) ParamsParserValidator(c *fiber.Ctx, out any) error {

func (h *Handler) ValidateStruct(out any) error {
if h.Validator != nil {
if err := h.Validator.Struct(out); err != nil {
if err := h.Validator.Var(out, "required,dive"); err != nil {
return fiber.NewError(fiber.StatusBadRequest, err.Error())
}
}
Expand Down
253 changes: 195 additions & 58 deletions internal/sms-gateway/handlers/base/handler_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,6 @@ import (
"github.com/android-sms-gateway/server/internal/sms-gateway/handlers/base"
"github.com/go-playground/validator/v10"
"github.com/gofiber/fiber/v2"
"go.uber.org/zap"
"go.uber.org/zap/zaptest"
)

Expand All @@ -25,13 +24,37 @@ type testRequestBodyNoValidate struct {
Age int `json:"age" validate:"required"`
}

type testRequestQuery struct {
Name string `query:"name" validate:"required"`
Age int `query:"age" validate:"required"`
}

type testRequestParams struct {
ID string `params:"id" validate:"required"`
Name string `params:"name" validate:"required"`
}

func (t *testRequestBody) Validate() error {
if t.Age < 18 {
return fmt.Errorf("must be at least 18 years old")
}
return nil
}

func (t *testRequestQuery) Validate() error {
if t.Age < 18 {
return fmt.Errorf("must be at least 18 years old")
}
return nil
}

func (t *testRequestParams) Validate() error {
if t.ID == "invalid" {
return fmt.Errorf("invalid ID")
}
return nil
}

func TestHandler_BodyParserValidator(t *testing.T) {
logger := zaptest.NewLogger(t)
validate := validator.New()
Expand Down Expand Up @@ -100,7 +123,10 @@ func TestHandler_BodyParserValidator(t *testing.T) {
req = httptest.NewRequest("POST", test.path, nil)
}

resp, _ := app.Test(req)
resp, err := app.Test(req)
if err != nil {
t.Fatalf("app.Test failed: %v", err)
}
if test.expectedStatus != resp.StatusCode {
t.Errorf("Expected status code %d, got %d", test.expectedStatus, resp.StatusCode)
}
Expand All @@ -109,89 +135,200 @@ func TestHandler_BodyParserValidator(t *testing.T) {
}

func TestHandler_QueryParserValidator(t *testing.T) {
type fields struct {
Logger *zap.Logger
Validator *validator.Validate
}
type args struct {
c *fiber.Ctx
out any
logger := zaptest.NewLogger(t)
validate := validator.New()

handler := &base.Handler{
Logger: logger,
Validator: validate,
}

app := fiber.New()
app.Get("/test", func(c *fiber.Ctx) error {
var query testRequestQuery
return handler.QueryParserValidator(c, &query)
})

tests := []struct {
name string
fields fields
args args
wantErr bool
description string
path string
expectedStatus int
}{
// TODO: Add test cases.
{
description: "Invalid query parameters - non-integer age",
path: "/test?name=John&age=abc",
expectedStatus: fiber.StatusBadRequest,
},
{
description: "Valid query parameters",
path: "/test?name=John&age=25",
expectedStatus: fiber.StatusOK,
},
{
description: "Invalid query parameters - missing name",
path: "/test?age=25",
expectedStatus: fiber.StatusBadRequest,
},
{
description: "Invalid query parameters - age too low",
path: "/test?name=John&age=17",
expectedStatus: fiber.StatusBadRequest,
},
{
description: "Invalid query parameters - missing age",
path: "/test?name=John",
expectedStatus: fiber.StatusBadRequest,
},
}
for _, tt := range tests {
t.Run(tt.name, func(t *testing.T) {
h := &base.Handler{
Logger: tt.fields.Logger,
Validator: tt.fields.Validator,

for _, test := range tests {
t.Run(test.description, func(t *testing.T) {
req := httptest.NewRequest("GET", test.path, nil)

resp, err := app.Test(req)
if err != nil {
t.Fatalf("app.Test failed: %v", err)
}
if err := h.QueryParserValidator(tt.args.c, tt.args.out); (err != nil) != tt.wantErr {
t.Errorf("Handler.QueryParserValidator() error = %v, wantErr %v", err, tt.wantErr)
if test.expectedStatus != resp.StatusCode {
t.Errorf("Expected status code %d, got %d", test.expectedStatus, resp.StatusCode)
}
})
}
}

func TestHandler_ParamsParserValidator(t *testing.T) {
type fields struct {
Logger *zap.Logger
Validator *validator.Validate
}
type args struct {
c *fiber.Ctx
out any
logger := zaptest.NewLogger(t)
validate := validator.New()

handler := &base.Handler{
Logger: logger,
Validator: validate,
}

app := fiber.New()
app.Get("/test/:id/:name", func(c *fiber.Ctx) error {
var params testRequestParams
return handler.ParamsParserValidator(c, &params)
})

tests := []struct {
name string
fields fields
args args
wantErr bool
description string
path string
expectedStatus int
}{
// TODO: Add test cases.
{
description: "Valid path parameters",
path: "/test/123/John",
expectedStatus: fiber.StatusOK,
},
{
description: "Invalid path parameters - missing id",
path: "/test//John",
expectedStatus: fiber.StatusNotFound,
},
{
description: "Invalid path parameters - missing name",
path: "/test/123/",
expectedStatus: fiber.StatusNotFound,
},
{
description: "Invalid path parameters - invalid ID",
path: "/test/invalid/John",
expectedStatus: fiber.StatusBadRequest,
},
}
for _, tt := range tests {
t.Run(tt.name, func(t *testing.T) {
h := &base.Handler{
Logger: tt.fields.Logger,
Validator: tt.fields.Validator,

for _, test := range tests {
t.Run(test.description, func(t *testing.T) {
req := httptest.NewRequest("GET", test.path, nil)

resp, err := app.Test(req)
if err != nil {
t.Fatalf("app.Test failed: %v", err)
}
if err := h.ParamsParserValidator(tt.args.c, tt.args.out); (err != nil) != tt.wantErr {
t.Errorf("Handler.ParamsParserValidator() error = %v, wantErr %v", err, tt.wantErr)
if test.expectedStatus != resp.StatusCode {
t.Errorf("Expected status code %d, got %d", test.expectedStatus, resp.StatusCode)
}
})
}
}

func TestHandler_validateStruct(t *testing.T) {
type fields struct {
Logger *zap.Logger
Validator *validator.Validate
func TestHandler_ValidateStruct(t *testing.T) {
logger := zaptest.NewLogger(t)
validate := validator.New()

// Test with validator
handlerWithValidator := &base.Handler{
Logger: logger,
Validator: validate,
}
type args struct {
out any

// Test without validator
handlerWithoutValidator := &base.Handler{
Logger: logger,
Validator: nil,
}

tests := []struct {
name string
fields fields
args args
wantErr bool
description string
handler *base.Handler
input any
expectedStatus int
}{
// TODO: Add test cases.
{
description: "Valid struct with validator",
handler: handlerWithValidator,
input: &testRequestBody{Name: "John Doe", Age: 25},
expectedStatus: fiber.StatusOK,
},
{
description: "Invalid struct with validator - missing required field",
handler: handlerWithValidator,
input: &testRequestBody{Age: 25},
expectedStatus: fiber.StatusBadRequest,
},
{
description: "Invalid struct with validator - custom validation fails",
handler: handlerWithValidator,
input: &testRequestBody{Name: "John Doe", Age: 17},
expectedStatus: fiber.StatusBadRequest,
},
{
description: "Valid struct without validator",
handler: handlerWithoutValidator,
input: &testRequestBody{Name: "John Doe", Age: 25},
expectedStatus: fiber.StatusOK,
},
{
description: "Invalid struct without validator - custom validation fails",
handler: handlerWithoutValidator,
input: &testRequestBody{Name: "John Doe", Age: 17},
expectedStatus: fiber.StatusBadRequest,
},
{
description: "Valid struct with Validatable interface",
handler: handlerWithValidator,
input: &testRequestQuery{Name: "John", Age: 25},
expectedStatus: fiber.StatusOK,
},
{
description: "Invalid struct with Validatable interface",
handler: handlerWithValidator,
input: &testRequestQuery{Name: "John", Age: 17},
expectedStatus: fiber.StatusBadRequest,
},
}
for _, tt := range tests {
t.Run(tt.name, func(t *testing.T) {
h := &base.Handler{
Logger: tt.fields.Logger,
Validator: tt.fields.Validator,

for _, test := range tests {
t.Run(test.description, func(t *testing.T) {
err := test.handler.ValidateStruct(test.input)

if test.expectedStatus == fiber.StatusOK && err != nil {
t.Errorf("Expected no error, got %v", err)
}
if err := h.ValidateStruct(tt.args.out); (err != nil) != tt.wantErr {
t.Errorf("Handler.validateStruct() error = %v, wantErr %v", err, tt.wantErr)

if test.expectedStatus == fiber.StatusBadRequest && err == nil {
t.Errorf("Expected error, got nil")
}
})
}
Expand Down
12 changes: 6 additions & 6 deletions internal/sms-gateway/handlers/messages/3rdparty.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -60,14 +60,14 @@ 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())
return err
}

var req smsgateway.Message
if err := h.BodyParserValidator(c, &req); err != nil {
return fiber.NewError(fiber.StatusBadRequest, err.Error())
return err
}

var device models.Device
Expand Down Expand Up @@ -190,9 +190,9 @@ 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())
return err
}

messages, total, err := h.messagesSvc.SelectStates(user, params.ToFilter(), params.ToOptions())
Expand Down Expand Up @@ -252,7 +252,7 @@ func (h *ThirdPartyController) get(user models.User, c *fiber.Ctx) error {
func (h *ThirdPartyController) postInboxExport(user models.User, c *fiber.Ctx) error {
req := smsgateway.MessagesExportRequest{}
if err := h.BodyParserValidator(c, &req); err != nil {
return fiber.NewError(fiber.StatusBadRequest, err.Error())
return err
}

device, err := h.devicesSvc.Get(user.ID, devices.WithID(req.DeviceID))
Expand Down
Loading
Loading