mirror of
https://gitlab.com/mbugroup/lti-api.git
synced 2026-05-20 13:31:56 +00:00
adjust default order dan sort by
This commit is contained in:
@@ -55,9 +55,9 @@ func (s areaService) GetAll(c *fiber.Ctx, params *validation.Query) ([]entity.Ar
|
|||||||
db = s.withRelations(db)
|
db = s.withRelations(db)
|
||||||
db, scopeErr = m.ApplyAreaScope(c, db, "id")
|
db, scopeErr = m.ApplyAreaScope(c, db, "id")
|
||||||
if params.Search != "" {
|
if params.Search != "" {
|
||||||
return db.Where("name ILIKE ?", "%"+params.Search+"%")
|
db = db.Where("name ILIKE ?", "%"+params.Search+"%")
|
||||||
}
|
}
|
||||||
return db.Order("created_at DESC").Order("updated_at DESC")
|
return db.Order("name ASC").Order("id ASC")
|
||||||
})
|
})
|
||||||
|
|
||||||
if scopeErr != nil {
|
if scopeErr != nil {
|
||||||
|
|||||||
@@ -71,7 +71,7 @@ func (s locationService) GetAll(c *fiber.Ctx, params *validation.Query) ([]entit
|
|||||||
)
|
)
|
||||||
`, utils.ProjectFlockCategoryLaying)
|
`, utils.ProjectFlockCategoryLaying)
|
||||||
}
|
}
|
||||||
return db.Order("created_at DESC").Order("updated_at DESC")
|
return db.Order("locations.name ASC").Order("locations.id ASC")
|
||||||
})
|
})
|
||||||
|
|
||||||
if scopeErr != nil {
|
if scopeErr != nil {
|
||||||
|
|||||||
@@ -322,8 +322,8 @@ func (r *ProjectflockRepositoryImpl) buildOrderExpressions(sortBy, sortOrder str
|
|||||||
}
|
}
|
||||||
default:
|
default:
|
||||||
return []string{
|
return []string{
|
||||||
"project_flocks.created_at DESC",
|
"project_flocks.flock_name ASC",
|
||||||
"project_flocks.updated_at DESC",
|
"project_flocks.id ASC",
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|||||||
Reference in New Issue
Block a user