Merge branch 'fix/master-data-kandang' into 'development'

[FIX][BE] Master Data Kandang

See merge request mbugroup/lti-api!501

internal/modules/master/kandang-groups/controllers/kandang_group.controller.go

@@ -29,6 +29,8 @@ func (u *KandangGroupController) GetAll(c *fiber.Ctx) error {
 		Search:     c.Query("search", ""),
 		LocationId: c.QueryInt("location_id", 0),
 		PicId:      c.QueryInt("pic_id", 0),
+		OrderBy:    c.Query("order_by", "desc"),
+		SortBy:     c.Query("sort_by", "updated_at"),
 	}
 
 	if query.Page < 1 || query.Limit < 1 {

internal/modules/master/kandang-groups/services/kandang_group.service.go

@@ -70,7 +70,14 @@ func (s kandangGroupService) GetAll(c *fiber.Ctx, params *validation.Query) ([]e
 		if params.PicId != 0 {
 			db = db.Where("kandang_groups.pic_id = ?", params.PicId)
 		}
-		return db.Order("kandang_groups.created_at DESC").Order("kandang_groups.updated_at DESC")
+
+		if params.OrderBy == "desc" || params.OrderBy == "" {
+			db = db.Order(fmt.Sprintf("kandang_groups.%s DESC", params.SortBy))
+		} else {
+			db = db.Order(fmt.Sprintf("kandang_groups.%s ASC", params.SortBy))
+		}
+
+		return db
 	})
 
 	if scopeErr != nil {

internal/modules/master/kandang-groups/validations/kandang_group.validation.go

@@ -20,4 +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"`
 }

internal/modules/master/kandangs/controllers/kandang.controller.go

@@ -29,6 +29,8 @@ func (u *KandangController) GetAll(c *fiber.Ctx) error {
 		Search:     c.Query("search", ""),
 		LocationId: c.QueryInt("location_id", 0),
 		PicId:      c.QueryInt("pic_id", 0),
+		OrderBy:    c.Query("order_by", "desc"),
+		SortBy:     c.Query("sort_by", "created_at"),
 	}
 
 	if query.Page < 1 || query.Limit < 1 {

internal/modules/master/kandangs/services/kandang.service.go

@@ -66,7 +66,14 @@ func (s kandangService) GetAll(c *fiber.Ctx, params *validation.Query) ([]entity
 		if params.PicId != 0 {
 			db = db.Where("pic_id = ?", params.PicId)
 		}
-		return db.Order("created_at DESC").Order("updated_at DESC")
+
+		if params.OrderBy == "desc" || params.OrderBy == "" {
+			db = db.Order(fmt.Sprintf("%s DESC", params.SortBy))
+		} else {
+			db = db.Order(fmt.Sprintf("%s ASC", params.SortBy))
+		}
+
+		return db
 	})
 
 	if scopeErr != nil {

internal/modules/master/kandangs/validations/kandang.validation.go

@@ -26,4 +26,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"`
 }