fix(BE): change name from sort to order

This commit is contained in:
Hafizh A. Y
2026-01-27 15:30:44 +07:00
parent f3ddd79974
commit 37f0324e2a
3 changed files with 15 additions and 15 deletions
@@ -15,7 +15,7 @@ type ApprovalService interface {
WorkflowSteps(workflow approvalutils.ApprovalWorkflowKey) map[approvalutils.ApprovalStep]string
WorkflowStepName(workflow approvalutils.ApprovalWorkflowKey, step approvalutils.ApprovalStep) (string, bool)
CreateApproval(ctx context.Context, workflow approvalutils.ApprovalWorkflowKey, approvableID uint, step approvalutils.ApprovalStep, action *entity.ApprovalAction, actorID uint, note *string) (*entity.Approval, error)
List(ctx context.Context, module string, approvableID *uint, page, limit int, search string, sortByDate string) ([]entity.Approval, int64, error)
List(ctx context.Context, module string, approvableID *uint, page, limit int, search string, orderByDate string) ([]entity.Approval, int64, error)
ListByTarget(ctx context.Context, workflow approvalutils.ApprovalWorkflowKey, approvableID uint, modifier func(*gorm.DB) *gorm.DB) ([]entity.Approval, error)
LatestByTarget(ctx context.Context, workflow approvalutils.ApprovalWorkflowKey, approvableID uint, modifier func(*gorm.DB) *gorm.DB) (*entity.Approval, error)
LatestByTargets(ctx context.Context, workflow approvalutils.ApprovalWorkflowKey, approvableIDs []uint, modifier func(*gorm.DB) *gorm.DB) (map[uint]*entity.Approval, error)
@@ -70,13 +70,13 @@ func (s *approvalService) List(
approvableID *uint,
page, limit int,
search string,
sortByDate string,
orderByDate string,
) ([]entity.Approval, int64, error) {
module = strings.TrimSpace(strings.ToUpper(module))
search = strings.TrimSpace(search)
sortByDate = strings.TrimSpace(strings.ToUpper(sortByDate))
if sortByDate != "ASC" && sortByDate != "DESC" {
sortByDate = "DESC"
orderByDate = strings.TrimSpace(strings.ToUpper(orderByDate))
if orderByDate != "ASC" && orderByDate != "DESC" {
orderByDate = "DESC"
}
if limit <= 0 {
@@ -95,7 +95,7 @@ func (s *approvalService) List(
func(db *gorm.DB) *gorm.DB {
query := db.
Where("approvable_type = ?", module).
Order("action_at " + sortByDate).
Order("action_at " + orderByDate).
Preload("ActionUser")
if approvableID != nil {
@@ -44,13 +44,13 @@ func (u *ApprovalController) GetAll(c *fiber.Ctx) error {
page := c.QueryInt("page", 1)
limit := c.QueryInt("limit", 10)
search := strings.TrimSpace(c.Query("search", ""))
sortByDate := strings.TrimSpace(c.Query("sort_by_date", ""))
if sortByDate == "" {
sortByDate = "DESC"
orderByDate := strings.TrimSpace(c.Query("order_by_date", ""))
if orderByDate == "" {
orderByDate = "DESC"
} else {
sortByDate = strings.ToUpper(sortByDate)
if sortByDate != "ASC" && sortByDate != "DESC" {
return fiber.NewError(fiber.StatusBadRequest, "sort_by_date must be either ASC or DESC")
orderByDate = strings.ToUpper(orderByDate)
if orderByDate != "ASC" && orderByDate != "DESC" {
return fiber.NewError(fiber.StatusBadRequest, "order_by_date must be either ASC or DESC")
}
}
@@ -61,7 +61,7 @@ func (u *ApprovalController) GetAll(c *fiber.Ctx) error {
Page: page,
Limit: limit,
Search: search,
SortByDate: sortByDate,
OrderByDate: orderByDate,
}
records, totalResults, err := u.ApprovalService.List(
@@ -71,7 +71,7 @@ func (u *ApprovalController) GetAll(c *fiber.Ctx) error {
query.Page,
query.Limit,
query.Search,
query.SortByDate,
query.OrderByDate,
)
if err != nil {
return err
@@ -7,5 +7,5 @@ type Query struct {
Page int `query:"page" validate:"omitempty,number,min=1"`
Limit int `query:"limit" validate:"omitempty,number,min=1,max=100,gt=0"`
Search string `query:"search" validate:"omitempty,max=50"`
SortByDate string `query:"sort_by_date" validate:"omitempty,oneof=ASC DESC"`
OrderByDate string `query:"order_by_date" validate:"omitempty,oneof=ASC DESC"`
}