From 22bf66dbb9101800f8e42ea9a578c04649cbf51b Mon Sep 17 00:00:00 2001 From: giovanni Date: Tue, 9 Jun 2026 11:16:06 +0700 Subject: [PATCH] fix get list kandang group --- .../master/kandang-groups/services/kandang_group.service.go | 4 ++-- .../kandang-groups/validations/kandang_group.validation.go | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/internal/modules/master/kandang-groups/services/kandang_group.service.go b/internal/modules/master/kandang-groups/services/kandang_group.service.go index 4293bfce..2fe415b4 100644 --- a/internal/modules/master/kandang-groups/services/kandang_group.service.go +++ b/internal/modules/master/kandang-groups/services/kandang_group.service.go @@ -72,9 +72,9 @@ func (s kandangGroupService) GetAll(c *fiber.Ctx, params *validation.Query) ([]e } 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 { - 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 diff --git a/internal/modules/master/kandang-groups/validations/kandang_group.validation.go b/internal/modules/master/kandang-groups/validations/kandang_group.validation.go index b1edd49a..174727e7 100644 --- a/internal/modules/master/kandang-groups/validations/kandang_group.validation.go +++ b/internal/modules/master/kandang-groups/validations/kandang_group.validation.go @@ -20,6 +20,6 @@ type Query struct { Search string `query:"search" validate:"omitempty,max=50"` LocationId int `query:"location_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"` - OrderBy string `query:"order_by" validate:"omitempty,oneof=asc desc" default:"desc"` + 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:"asc"` }