Merge branch 'fix/kandang-group' into 'development'

fix get list kandang group

See merge request mbugroup/lti-api!615
This commit is contained in:
Giovanni Gabriel Septriadi
2026-06-09 04:17:07 +00:00
2 changed files with 4 additions and 4 deletions
@@ -72,9 +72,9 @@ func (s kandangGroupService) GetAll(c *fiber.Ctx, params *validation.Query) ([]e
} }
if params.OrderBy == "desc" || params.OrderBy == "" { if params.OrderBy == "desc" || params.OrderBy == "" {
db = db.Order(fmt.Sprintf("kandang_groups.%s DESC", params.SortBy)) db = db.Order(fmt.Sprintf("kandang_groups.%s DESC, kandang_groups.id ASC", params.SortBy))
} else { } else {
db = db.Order(fmt.Sprintf("kandang_groups.%s ASC", params.SortBy)) db = db.Order(fmt.Sprintf("kandang_groups.%s ASC, kandang_groups.id ASC", params.SortBy))
} }
return db return db
@@ -20,6 +20,6 @@ type Query struct {
Search string `query:"search" validate:"omitempty,max=50"` Search string `query:"search" validate:"omitempty,max=50"`
LocationId int `query:"location_id" validate:"omitempty,number,gt=0"` LocationId int `query:"location_id" validate:"omitempty,number,gt=0"`
PicId int `query:"pic_id" validate:"omitempty,number,gt=0"` PicId int `query:"pic_id" validate:"omitempty,number,gt=0"`
SortBy string `query:"sort_by" validate:"omitempty,max=50,oneof=name created_at updated_at" default:"updated_at"` SortBy string `query:"sort_by" validate:"omitempty,max=50,oneof=name created_at updated_at" default:"name"`
OrderBy string `query:"order_by" validate:"omitempty,oneof=asc desc" default:"desc"` OrderBy string `query:"order_by" validate:"omitempty,oneof=asc desc" default:"asc"`
} }