Merge pull request #58 from dikstub-rssa/feat/getuk

Feat/getuk

go.mod

@@ -11,7 +11,7 @@ require (
 	github.com/jackc/pgx/v5 v5.5.5
 	github.com/karincake/apem v0.0.17
 	github.com/karincake/dodol v0.0.1
-	github.com/karincake/getuk v0.1.1
+	github.com/karincake/getuk v0.2.1
 	github.com/karincake/hongkue v0.0.4
 	github.com/karincake/lepet v0.0.1
 	github.com/karincake/risoles v0.0.3

go.sum

@@ -79,8 +79,8 @@ github.com/karincake/apem v0.0.17 h1:y3WXCr9GWLFFFH4Qyq/VWlWWpijHh5zpTc3Lm96twa4
 github.com/karincake/apem v0.0.17/go.mod h1:cQP2sJfDrLRIiwWoaLWw/z8uAya+DWu/FpmYeinMQXM=
 github.com/karincake/dodol v0.0.1 h1:jUXmJh1r0Ei4fmHPZ6IUkoplW/V9d27L63JEl6zudL0=
 github.com/karincake/dodol v0.0.1/go.mod h1:2f1NcvkvY0J3GMUkwILNDYVvRUpz0W3lpPp/Ha/Ld24=
-github.com/karincake/getuk v0.1.1 h1:zygZ9N5tk+sWwiRSo1SmlNwcAdl+qQVxmOG6jbQ7X1g=
+github.com/karincake/getuk v0.2.1 h1:l9qaoSE1ttwzNbGTRNGYn61EZ9/rb/V+TjdY8XPeswU=
-github.com/karincake/getuk v0.1.1/go.mod h1:NVnvxSGAkQ/xuq99FzWACvY5efyKPLFla1cKB8czm7c=
+github.com/karincake/getuk v0.2.1/go.mod h1:NVnvxSGAkQ/xuq99FzWACvY5efyKPLFla1cKB8czm7c=
 github.com/karincake/hongkue v0.0.4 h1:oWthq6cDg5DvDm1Z3e7mCLOATQf+oAdtHxN9OPnCfA8=
 github.com/karincake/hongkue v0.0.4/go.mod h1:YVi5Lyh3DE+GRHx2OSODOr7FwvLi8U4idvcPHO7yeag=
 github.com/karincake/lepet v0.0.1 h1:eq/cwn5BBg0jWZ1c/MmvhFIBma0zBpVs2LwkfDOncy4=

internal/domain/main-entities/device/dto.go

@@ -19,7 +19,7 @@ type ReadListDto struct {
 	FilterDto
 	Includes   string   `json:"includes"`
 	Preloads   []string `json:"-"`
-	Search     string   `json:"search"`
+	Sort       string   `json:"sort"`
 	Pagination ecore.Pagination
 }
 
@@ -29,6 +29,7 @@ type FilterDto struct {
 	Uom_Code string  `json:"uom-code"`
 	Infra_Id *uint16 `json:"infra-id"`
 	Item_Id  *uint   `json:"item-id"`
+	Search   string  `json:"search" gormhelper:"searchColumns=Code,Name"`
 }
 
 type ReadDetailDto struct {

internal/domain/main-entities/diagnose-src/dto.go

@@ -14,7 +14,7 @@ type ReadListDto struct {
 	FilterDto
 	Includes   string   `json:"includes"`
 	Preloads   []string `json:"-"`
-	Search     string   `json:"search"`
+	Sort       string   `json:"sort"`
 	Pagination ecore.Pagination
 }
 
@@ -22,6 +22,7 @@ type FilterDto struct {
 	Code    string `json:"code"`
 	Name    string `json:"name"`
 	IndName string `json:"indName"`
+	Search  string `json:"search" gormhelper:"searchColumns=Code,Name"`
 }
 
 type ReadDetailDto struct {

internal/domain/main-entities/district/dto.go

@@ -15,7 +15,6 @@ type ReadListDto struct {
 	FilterDto
 	Includes   string   `json:"includes"`
 	Preloads   []string `json:"-"`
-	Search     string   `json:"search"`
 	Sort       string   `json:"sort"`
 	Pagination ecore.Pagination
 }
@@ -24,6 +23,7 @@ type FilterDto struct {
 	Regency_Code string `json:"regency-code"`
 	Code         string `json:"code"`
 	Name         string `json:"name"`
+	Search       string `json:"search" gormhelper:"searchColumns=Code,Name"`
 }
 
 type ReadDetailDto struct {

internal/domain/main-entities/division-position/dto.go

@@ -18,7 +18,7 @@ type ReadListDto struct {
 	FilterDto
 	Includes   string   `json:"includes"`
 	Preloads   []string `json:"-"`
-	Search     string   `json:"search"`
+	Sort       string   `json:"sort"`
 	Pagination ecore.Pagination
 }
 
@@ -28,6 +28,7 @@ type FilterDto struct {
 	Name        string  `json:"name"`
 	HeadStatus  *bool   `json:"head-status"`
 	Employee_Id *uint   `json:"employee-id"`
+	Search      string  `json:"search" gormhelper:"searchColumns=Code,Name"`
 }
 
 type ReadDetailDto struct {

internal/domain/main-entities/division/dto.go

@@ -14,7 +14,7 @@ type ReadListDto struct {
 	FilterDto
 	Includes         string   `json:"includes"`
 	Preloads         []string `json:"-"`
-	Search           string   `json:"search"`
+	Sort             string   `json:"sort"`
 	Pagination       ecore.Pagination
 	OnlyHaveChildren bool `json:"only-have-children"`
 }
@@ -23,6 +23,7 @@ type FilterDto struct {
 	Code      string  `json:"code"`
 	Name      string  `json:"name"`
 	Parent_Id *uint16 `json:"parent-id"`
+	Search    string  `json:"search" gormhelper:"searchColumns=Code,Name"`
 }
 
 type ReadDetailDto struct {

internal/domain/main-entities/ethnic/dto.go

@@ -13,13 +13,14 @@ type ReadListDto struct {
 	FilterDto
 	Includes   string   `json:"includes"`
 	Preloads   []string `json:"-"`
-	Search     string   `json:"search"`
+	Sort       string   `json:"sort"`
 	Pagination ecore.Pagination
 }
 
 type FilterDto struct {
-	Code string `json:"code"`
+	Code   string `json:"code"`
-	Name string `json:"name"`
+	Name   string `json:"name"`
+	Search string `json:"search" gormhelper:"searchColumns=Code,Name"`
 }
 
 type ReadDetailDto struct {

internal/domain/main-entities/infra/dto.go

@@ -24,7 +24,7 @@ type ReadListDto struct {
 	FilterDto
 	Includes         string   `json:"includes"`
 	Preloads         []string `json:"-"`
-	Search           string   `json:"search"`
+	Sort             string   `json:"sort"`
 	Pagination       ecore.Pagination
 	OnlyHaveChildren bool `json:"only-have-children"`
 }
@@ -35,6 +35,7 @@ type FilterDto struct {
 	InfraGroup_Code ero.InfraGroupCode `json:"infraGroup-code"`
 	Parent_Id       *uint16            `json:"parent-id"`
 	Item_Id         *uint              `json:"item-id"`
+	Search          string             `json:"search" gormhelper:"searchColumns=Code,Name"`
 }
 
 type ReadDetailDto struct {

internal/domain/main-entities/installation/dto.go

@@ -16,7 +16,7 @@ type ReadListDto struct {
 	FilterDto
 	Includes   string   `json:"includes"`
 	Preloads   []string `json:"-"`
-	Search     string   `json:"search"`
+	Sort       string   `json:"sort"`
 	Pagination ecore.Pagination
 }
 
@@ -24,6 +24,7 @@ type FilterDto struct {
 	Code                string                 `json:"code"`
 	Name                string                 `json:"name"`
 	EncounterClass_Code ere.EncounterClassCode `json:"encounterClass-code"`
+	Search              string                 `json:"search" gormhelper:"searchColumns=Code,Name"`
 }
 
 type ReadDetailDto struct {

internal/domain/main-entities/insurance-company/dto.go

@@ -17,7 +17,7 @@ type ReadListDto struct {
 	FilterDto
 	Includes   string   `json:"includes"`
 	Preloads   []string `json:"-"`
-	Search     string   `json:"search"`
+	Sort       string   `json:"sort"`
 	Pagination ecore.Pagination
 }
 
@@ -27,6 +27,7 @@ type FilterDto struct {
 	Regency_Code *string `json:"regency-code"`
 	Address      string  `json:"address"`
 	PhoneNumber  string  `json:"phoneNumber"`
+	Search       string  `json:"search" gormhelper:"searchColumns=Code,Name"`
 }
 
 type ReadDetailDto struct {

internal/domain/main-entities/item/dto.go

@@ -19,7 +19,7 @@ type ReadListDto struct {
 	FilterDto
 	Includes   string   `json:"includes"`
 	Preloads   []string `json:"-"`
-	Search     string   `json:"search"`
+	Sort       string   `json:"sort"`
 	Pagination ecore.Pagination
 }
 
@@ -30,6 +30,7 @@ type FilterDto struct {
 	Uom_Code       *string           `json:"uom-code"`
 	Infra_Id       *uint16           `json:"infra-id"`
 	Stock          *int              `json:"stock"`
+	Search         string            `json:"search" gormhelper:"searchColumns=Code,Name"`
 }
 
 type ReadDetailDto struct {

internal/domain/main-entities/language/dto.go

@@ -13,13 +13,14 @@ type ReadListDto struct {
 	FilterDto
 	Includes   string `json:"includes"`
 	Preloads   []string
-	Search     string `json:"search"`
+	Sort       string `json:"sort"`
 	Pagination ecore.Pagination
 }
 
 type FilterDto struct {
-	Code string `json:"code"`
+	Code   string `json:"code"`
-	Name string `json:"name"`
+	Name   string `json:"name"`
+	Search string `json:"search" gormhelper:"searchColumns=Code,Name"`
 }
 
 type ReadDetailDto struct {

internal/domain/main-entities/material/dto.go

@@ -20,7 +20,7 @@ type ReadListDto struct {
 	FilterDto
 	Includes   string   `json:"includes"`
 	Preloads   []string `json:"-"`
-	Search     string   `json:"search"`
+	Sort       string   `json:"sort"`
 	Pagination ecore.Pagination
 }
 
@@ -31,6 +31,7 @@ type FilterDto struct {
 	Infra_Id *uint16 `json:"infra-id"`
 	Stock    *int    `json:"stock"`
 	Item_Id  *uint   `json:"item-id"`
+	Search   string  `json:"search" gormhelper:"searchColumns=Code,Name"`
 }
 
 type ReadDetailDto struct {

internal/domain/main-entities/mcu-src-category/dto.go

@@ -16,7 +16,7 @@ type ReadListDto struct {
 	FilterDto
 	Includes   string   `json:"includes"`
 	Preloads   []string `json:"-"`
-	Search     string   `json:"search"`
+	Sort       string   `json:"sort"`
 	Pagination ecore.Pagination
 }
 
@@ -24,6 +24,7 @@ type FilterDto struct {
 	Code       string                `json:"code"`
 	Name       string                `json:"name"`
 	Scope_Code *ere.CheckupScopeCode `json:"scope-code"`
+	Search     string                `json:"search" gormhelper:"searchColumns=Code,Name"`
 }
 
 type ReadDetailDto struct {

internal/domain/main-entities/mcu-src/dto.go

@@ -16,7 +16,7 @@ type ReadListDto struct {
 	FilterDto
 	Includes   string   `json:"includes"`
 	Preloads   []string `json:"-"`
-	Search     string   `json:"search"`
+	Sort       string   `json:"sort"`
 	Pagination ecore.Pagination
 }
 
@@ -24,6 +24,7 @@ type FilterDto struct {
 	Code                string  `json:"code"`
 	Name                string  `json:"name"`
 	McuSrcCategory_Code *string `json:"mcuSrcCategory-code"`
+	Search              string  `json:"search" gormhelper:"searchColumns=Code,Name"`
 }
 
 type ReadDetailDto struct {

internal/domain/main-entities/mcu-sub-src/dto.go

@@ -17,7 +17,7 @@ type ReadListDto struct {
 	FilterDto
 	Includes   string   `json:"includes"`
 	Preloads   []string `json:"-"`
-	Search     string   `json:"search"`
+	Sort       string   `json:"sort"`
 	Pagination ecore.Pagination
 }
 
@@ -25,6 +25,7 @@ type FilterDto struct {
 	Code                 string  `json:"code"`
 	Name                 string  `json:"name"`
 	CheckupCategory_Code *string `json:"checkupCategory-code"`
+	Search               string  `json:"search" gormhelper:"searchColumns=Code,Name"`
 }
 
 type ReadDetailDto struct {

internal/domain/main-entities/medical-action-src/dto.go

@@ -15,7 +15,7 @@ type ReadListDto struct {
 	FilterDto
 	Includes   string   `json:"includes"`
 	Preloads   []string `json:"-"`
-	Search     string   `json:"search"`
+	Sort       string   `json:"sort"`
 	Pagination ecore.Pagination
 }
 
@@ -23,6 +23,7 @@ type FilterDto struct {
 	Code    string `json:"code"`
 	Name    string `json:"name"`
 	Item_Id *uint  `json:"item-id"`
+	Search  string `json:"search" gormhelper:"searchColumns=Code,Name"`
 }
 
 type ReadDetailDto struct {

internal/domain/main-entities/medicine-group/dto.go

@@ -13,13 +13,14 @@ type ReadListDto struct {
 	FilterDto
 	Includes   string   `json:"includes"`
 	Preloads   []string `json:"-"`
-	Search     string   `json:"search"`
+	Sort       string   `json:"sort"`
 	Pagination ecore.Pagination
 }
 
 type FilterDto struct {
-	Code string `json:"code"`
+	Code   string `json:"code"`
-	Name string `json:"name"`
+	Name   string `json:"name"`
+	Search string `json:"search" gormhelper:"searchColumns=Code,Name"`
 }
 
 type ReadDetailDto struct {

internal/domain/main-entities/medicine-method/dto.go

@@ -13,13 +13,14 @@ type ReadListDto struct {
 	FilterDto
 	Includes   string   `json:"includes"`
 	Preloads   []string `json:"-"`
-	Search     string   `json:"search"`
+	Sort       string   `json:"sort"`
 	Pagination ecore.Pagination
 }
 
 type FilterDto struct {
-	Code string `json:"code"`
+	Code   string `json:"code"`
-	Name string `json:"name"`
+	Name   string `json:"name"`
+	Search string `json:"search" gormhelper:"searchColumns=Code,Name"`
 }
 
 type ReadDetailDto struct {

internal/domain/main-entities/medicine/dto.go

@@ -25,7 +25,7 @@ type ReadListDto struct {
 	FilterDto
 	Includes   string   `json:"includes"`
 	Preloads   []string `json:"-"`
-	Search     string   `json:"search"`
+	Sort       string   `json:"sort"`
 	Pagination ecore.Pagination
 }
 
@@ -39,6 +39,7 @@ type FilterDto struct {
 	Infra_Id            *uint16 `json:"infra-id"`
 	Stock               *int    `json:"stock"`
 	Item_Id             *uint   `json:"item-id"`
+	Search              string  `json:"search" gormhelper:"searchColumns=Code,Name"`
 }
 
 type ReadDetailDto struct {

internal/domain/main-entities/pharmacy-company/dto.go

@@ -14,7 +14,7 @@ type ReadListDto struct {
 	FilterDto
 	Includes   string   `json:"includes"`
 	Preloads   []string `json:"-"`
-	Search     string   `json:"search"`
+	Sort       string   `json:"sort"`
 	Pagination ecore.Pagination
 }
 
@@ -22,6 +22,7 @@ type FilterDto struct {
 	Code         string `json:"code"`
 	Name         string `json:"name"`
 	Regency_Code string `json:"regency-code"`
+	Search       string `json:"search" gormhelper:"searchColumns=Code,Name"`
 }
 
 type ReadDetailDto struct {

internal/domain/main-entities/procedure-src/dto.go

@@ -14,7 +14,7 @@ type ReadListDto struct {
 	FilterDto
 	Includes   string   `json:"includes"`
 	Preloads   []string `json:"-"`
-	Search     string   `json:"search"`
+	Sort       string   `json:"sort"`
 	Pagination ecore.Pagination
 }
 
@@ -22,6 +22,7 @@ type FilterDto struct {
 	Code    string `json:"code"`
 	Name    string `json:"name"`
 	IndName string `json:"indName"`
+	Search  string `json:"search" gormhelper:"searchColumns=Code,Name"`
 }
 
 type ReadDetailDto struct {

internal/domain/main-entities/province/dto.go

@@ -14,14 +14,14 @@ type ReadListDto struct {
 	FilterDto
 	Includes   string   `json:"includes"`
 	Preloads   []string `json:"-"`
-	Search     string   `json:"search"`
 	Sort       string   `json:"sort"`
 	Pagination ecore.Pagination
 }
 
 type FilterDto struct {
-	Code string `json:"code"`
+	Code   string `json:"code"`
-	Name string `json:"name"`
+	Name   string `json:"name"`
+	Search string `json:"search" gormhelper:"searchColumns=Code,Name"`
 }
 
 type ReadDetailDto struct {

internal/domain/main-entities/regency/dto.go

@@ -15,7 +15,6 @@ type ReadListDto struct {
 	FilterDto
 	Includes   string   `json:"includes"`
 	Preloads   []string `json:"-"`
-	Search     string   `json:"search"`
 	Sort       string   `json:"sort"`
 	Pagination ecore.Pagination
 }
@@ -24,6 +23,7 @@ type FilterDto struct {
 	Province_Code string `json:"province-code"`
 	Code          string `json:"code"`
 	Name          string `json:"name"`
+	Search        string `json:"search" gormhelper:"searchColumns=Code,Name"`
 }
 
 type ReadDetailDto struct {

internal/domain/main-entities/specialist/dto.go

@@ -14,7 +14,7 @@ type ReadListDto struct {
 	FilterDto
 	Includes   string   `json:"includes"`
 	Preloads   []string `json:"-"`
-	Search     string   `json:"search"`
+	Sort       string   `json:"sort"`
 	Pagination ecore.Pagination
 }
 
@@ -22,6 +22,7 @@ type FilterDto struct {
 	Code    string  `json:"code"`
 	Name    string  `json:"name"`
 	Unit_Id *uint16 `json:"unit-id"`
+	Search  string  `json:"search" gormhelper:"searchColumns=Code,Name"`
 }
 
 type ReadDetailDto struct {

internal/domain/main-entities/subspecialist/dto.go

@@ -14,7 +14,7 @@ type ReadListDto struct {
 	FilterDto
 	Includes   string   `json:"includes"`
 	Preloads   []string `json:"-"`
-	Search     string   `json:"search"`
+	Sort       string   `json:"sort"`
 	Pagination ecore.Pagination
 }
 
@@ -22,6 +22,7 @@ type FilterDto struct {
 	Code          *string `json:"code"`
 	Name          *string `json:"name"`
 	Specialist_Id *uint16 `json:"specialist-id"`
+	Search        string  `json:"search" gormhelper:"searchColumns=Code,Name"`
 }
 
 type ReadDetailDto struct {

internal/domain/main-entities/unit/dto.go

@@ -15,7 +15,7 @@ type ReadListDto struct {
 	FilterDto
 	Includes   string   `json:"includes"`
 	Preloads   []string `json:"-"`
-	Search     string   `json:"search"`
+	Sort       string   `json:"sort"`
 	Pagination ecore.Pagination
 }
 
@@ -23,6 +23,7 @@ type FilterDto struct {
 	Installation_Id *uint16 `json:"installation-id"`
 	Code            string  `json:"code"`
 	Name            string  `json:"name"`
+	Search          string  `json:"search" gormhelper:"searchColumns=Code,Name"`
 }
 
 type ReadDetailDto struct {

internal/domain/main-entities/uom/dto.go

@@ -13,13 +13,14 @@ type ReadListDto struct {
 	FilterDto
 	Includes   string   `json:"includes"`
 	Preloads   []string `json:"-"`
-	Search     string   `json:"search"`
+	Sort       string   `json:"sort"`
 	Pagination ecore.Pagination
 }
 
 type FilterDto struct {
-	Code string `json:"code"`
+	Code   string `json:"code"`
-	Name string `json:"name"`
+	Name   string `json:"name"`
+	Search string `json:"search" gormhelper:"searchColumns=Code,Name"`
 }
 
 type ReadDetailDto struct {

internal/domain/main-entities/village/dto.go

@@ -14,7 +14,6 @@ type ReadListDto struct {
 	FilterDto
 	Includes   string   `json:"includes"`
 	Preloads   []string `json:"-"`
-	Search     string   `json:"search"`
 	Sort       string   `json:"sort"`
 	Pagination ecore.Pagination
 }
@@ -23,6 +22,7 @@ type FilterDto struct {
 	District_Code string `json:"district-code"`
 	Code          string `json:"code"`
 	Name          string `json:"name"`
+	Search        string `json:"search" gormhelper:"searchColumns=Code,Name"`
 }
 
 type ReadDetailDto struct {

internal/use-case/main-use-case/device/lib.go

@@ -53,14 +53,12 @@ func ReadListData(input e.ReadListDto, event *pl.Event, dbx ...*gorm.DB) ([]e.De
 		}
 	}
 
-	tx = plh.SearchCodeOrName(input.Search, tx)
-
 	tx = tx.
 		Model(&e.Device{}).
 		Scopes(gh.Filter(input.FilterDto)).
 		Count(&count).
 		Scopes(gh.Paginate(input, &pagination)).
-		Order("\"CreatedAt\" DESC")
+		Scopes(gh.Sort(input.Sort))
 
 	if err := tx.Find(&data).Error; err != nil {
 		if err == gorm.ErrRecordNotFound {

internal/use-case/main-use-case/diagnose-src/lib.go

@@ -53,14 +53,12 @@ func ReadListData(input e.ReadListDto, event *pl.Event, dbx ...*gorm.DB) ([]e.Di
 		}
 	}
 
-	tx = plh.SearchCodeOrName(input.Search, tx)
-
 	tx = tx.
 		Model(&e.DiagnoseSrc{}).
 		Scopes(gh.Filter(input.FilterDto)).
 		Count(&count).
 		Scopes(gh.Paginate(input, &pagination)).
-		Order("\"CreatedAt\" DESC")
+		Scopes(gh.Sort(input.Sort))
 
 	if err := tx.Find(&data).Error; err != nil {
 		if err == gorm.ErrRecordNotFound {

internal/use-case/main-use-case/district/lib.go

@@ -53,15 +53,12 @@ func ReadListData(input e.ReadListDto, event *pl.Event, dbx ...*gorm.DB) ([]e.Di
 		}
 	}
 
-	tx = plh.SearchCodeOrName(input.Search, tx)
-
-	tx = plh.Sort(input.Sort, tx)
-
 	tx = tx.
 		Model(&e.District{}).
 		Scopes(gh.Filter(input.FilterDto)).
 		Count(&count).
-		Scopes(gh.Paginate(input, &pagination))
+		Scopes(gh.Paginate(input, &pagination)).
+		Scopes(gh.Sort(input.Sort))
 
 	if err := tx.Find(&data).Error; err != nil {
 		if err == gorm.ErrRecordNotFound {

internal/use-case/main-use-case/division-position/lib.go

@@ -53,15 +53,13 @@ func ReadListData(input e.ReadListDto, event *pl.Event, dbx ...*gorm.DB) ([]e.Di
 		}
 	}
 
-	tx = plh.SearchCodeOrName(input.Search, tx)
-
 	tx = tx.
 		Model(&e.DivisionPosition{}).
 		Preload("Division").
 		Scopes(gh.Filter(input.FilterDto)).
 		Count(&count).
 		Scopes(gh.Paginate(input, &pagination)).
-		Order("\"CreatedAt\" DESC")
+		Scopes(gh.Sort(input.Sort))
 
 	if err := tx.Find(&data).Error; err != nil {
 		if err == gorm.ErrRecordNotFound {

internal/use-case/main-use-case/division/lib.go

@@ -53,8 +53,6 @@ func ReadListData(input e.ReadListDto, event *pl.Event, dbx ...*gorm.DB) ([]e.Di
 		}
 	}
 
-	tx = plh.SearchCodeOrName(input.Search, tx)
-
 	if input.OnlyHaveChildren {
 		tx = tx.Where(`
     		EXISTS (
@@ -70,7 +68,7 @@ func ReadListData(input e.ReadListDto, event *pl.Event, dbx ...*gorm.DB) ([]e.Di
 		Scopes(gh.Filter(input.FilterDto)).
 		Count(&count).
 		Scopes(gh.Paginate(input, &pagination)).
-		Order("\"CreatedAt\" DESC")
+		Scopes(gh.Sort(input.Sort))
 
 	if err := tx.Find(&data).Error; err != nil {
 		if err == gorm.ErrRecordNotFound {

internal/use-case/main-use-case/ethnic/lib.go

@@ -47,14 +47,12 @@ func ReadListData(input e.ReadListDto, event *pl.Event, dbx ...*gorm.DB) ([]e.Et
 		tx = dg.I
 	}
 
-	tx = plh.SearchCodeOrName(input.Search, tx)
-
 	tx = tx.
 		Model(&e.Ethnic{}).
 		Scopes(gh.Filter(input.FilterDto)).
 		Count(&count).
 		Scopes(gh.Paginate(input, &pagination)).
-		Order("\"CreatedAt\" DESC")
+		Scopes(gh.Sort(input.Sort))
 
 	if err := tx.Find(&data).Error; err != nil {
 		if err == gorm.ErrRecordNotFound {

internal/use-case/main-use-case/infra/lib.go

@@ -53,8 +53,6 @@ func ReadListData(input e.ReadListDto, event *pl.Event, dbx ...*gorm.DB) ([]e.In
 		}
 	}
 
-	tx = plh.SearchCodeOrName(input.Search, tx)
-
 	if input.OnlyHaveChildren {
 		tx = tx.Where(`
     		EXISTS (
@@ -70,7 +68,7 @@ func ReadListData(input e.ReadListDto, event *pl.Event, dbx ...*gorm.DB) ([]e.In
 		Scopes(gh.Filter(input.FilterDto)).
 		Count(&count).
 		Scopes(gh.Paginate(input, &pagination)).
-		Order("\"CreatedAt\" DESC")
+		Scopes(gh.Sort(input.Sort))
 
 	if err := tx.Find(&data).Error; err != nil {
 		if err == gorm.ErrRecordNotFound {

internal/use-case/main-use-case/installation/lib.go

@@ -53,14 +53,12 @@ func ReadListData(input e.ReadListDto, event *pl.Event, dbx ...*gorm.DB) ([]e.In
 		}
 	}
 
-	tx = plh.SearchCodeOrName(input.Search, tx)
-
 	tx = tx.
 		Model(&e.Installation{}).
 		Scopes(gh.Filter(input.FilterDto)).
 		Count(&count).
 		Scopes(gh.Paginate(input, &pagination)).
-		Order("\"CreatedAt\" DESC")
+		Scopes(gh.Sort(input.Sort))
 
 	if err := tx.Find(&data).Error; err != nil {
 		if err == gorm.ErrRecordNotFound {

internal/use-case/main-use-case/insurance-company/lib.go

@@ -53,14 +53,12 @@ func ReadListData(input e.ReadListDto, event *pl.Event, dbx ...*gorm.DB) ([]e.In
 		}
 	}
 
-	tx = plh.SearchCodeOrName(input.Search, tx)
-
 	tx = tx.
 		Model(&e.InsuranceCompany{}).
 		Scopes(gh.Filter(input.FilterDto)).
 		Count(&count).
 		Scopes(gh.Paginate(input, &pagination)).
-		Order("\"CreatedAt\" DESC")
+		Scopes(gh.Sort(input.Sort))
 
 	if err := tx.Find(&data).Error; err != nil {
 		if err == gorm.ErrRecordNotFound {

internal/use-case/main-use-case/item/lib.go

@@ -53,14 +53,12 @@ func ReadListData(input e.ReadListDto, event *pl.Event, dbx ...*gorm.DB) ([]e.It
 		}
 	}
 
-	tx = plh.SearchCodeOrName(input.Search, tx)
-
 	tx = tx.
 		Model(&e.Item{}).
 		Scopes(gh.Filter(input.FilterDto)).
 		Count(&count).
 		Scopes(gh.Paginate(input, &pagination)).
-		Order("\"CreatedAt\" DESC")
+		Scopes(gh.Sort(input.Sort))
 
 	if err := tx.Find(&data).Error; err != nil {
 		if err == gorm.ErrRecordNotFound {

internal/use-case/main-use-case/language/lib.go

@@ -47,14 +47,12 @@ func ReadListData(input e.ReadListDto, event *pl.Event, dbx ...*gorm.DB) ([]e.La
 		tx = dg.I
 	}
 
-	plh.SearchCodeOrName(input.Search, tx)
-
 	tx = tx.
 		Model(&e.Language{}).
 		Scopes(gh.Filter(input.FilterDto)).
 		Count(&count).
 		Scopes(gh.Paginate(input, &pagination)).
-		Order("\"CreatedAt\" DESC")
+		Scopes(gh.Sort(input.Sort))
 
 	if err := tx.Find(&data).Error; err != nil {
 		if err == gorm.ErrRecordNotFound {

internal/use-case/main-use-case/material/lib.go

@@ -53,14 +53,12 @@ func ReadListData(input e.ReadListDto, event *pl.Event, dbx ...*gorm.DB) ([]e.Ma
 		}
 	}
 
-	plh.SearchCodeOrName(input.Search, tx)
-
 	tx = tx.
 		Model(&e.Material{}).
 		Scopes(gh.Filter(input.FilterDto)).
 		Count(&count).
 		Scopes(gh.Paginate(input, &pagination)).
-		Order("\"CreatedAt\" DESC")
+		Scopes(gh.Sort(input.Sort))
 
 	if err := tx.Find(&data).Error; err != nil {
 		if err == gorm.ErrRecordNotFound {

internal/use-case/main-use-case/mcu-src-category/lib.go

@@ -53,14 +53,12 @@ func ReadListData(input e.ReadListDto, event *pl.Event, dbx ...*gorm.DB) ([]e.Mc
 		}
 	}
 
-	tx = plh.SearchCodeOrName(input.Search, tx)
-
 	tx = tx.
 		Model(&e.McuSrcCategory{}).
 		Scopes(gh.Filter(input.FilterDto)).
 		Count(&count).
 		Scopes(gh.Paginate(input, &pagination)).
-		Order("\"CreatedAt\" DESC")
+		Scopes(gh.Sort(input.Sort))
 
 	if err := tx.Find(&data).Error; err != nil {
 		if err == gorm.ErrRecordNotFound {

internal/use-case/main-use-case/mcu-src/lib.go

@@ -53,14 +53,12 @@ func ReadListData(input e.ReadListDto, event *pl.Event, dbx ...*gorm.DB) ([]e.Mc
 		}
 	}
 
-	tx = plh.SearchCodeOrName(input.Search, tx)
-
 	tx = tx.
 		Model(&e.McuSrc{}).
 		Scopes(gh.Filter(input.FilterDto)).
 		Count(&count).
 		Scopes(gh.Paginate(input, &pagination)).
-		Order("\"CreatedAt\" DESC")
+		Scopes(gh.Sort(input.Sort))
 
 	if err := tx.Find(&data).Error; err != nil {
 		if err == gorm.ErrRecordNotFound {

internal/use-case/main-use-case/mcu-sub-src/lib.go

@@ -53,14 +53,12 @@ func ReadListData(input e.ReadListDto, event *pl.Event, dbx ...*gorm.DB) ([]e.Mc
 		}
 	}
 
-	tx = plh.SearchCodeOrName(input.Search, tx)
-
 	tx = tx.
 		Model(&e.McuSubSrc{}).
 		Scopes(gh.Filter(input.FilterDto)).
 		Count(&count).
 		Scopes(gh.Paginate(input, &pagination)).
-		Order("\"CreatedAt\" DESC")
+		Scopes(gh.Sort(input.Sort))
 
 	if err := tx.Find(&data).Error; err != nil {
 		if err == gorm.ErrRecordNotFound {

internal/use-case/main-use-case/medical-action-src/lib.go

@@ -53,14 +53,12 @@ func ReadListData(input e.ReadListDto, event *pl.Event, dbx ...*gorm.DB) ([]e.Me
 		}
 	}
 
-	tx = plh.SearchCodeOrName(input.Search, tx)
-
 	tx = tx.
 		Model(&e.MedicalActionSrc{}).
 		Scopes(gh.Filter(input.FilterDto)).
 		Count(&count).
 		Scopes(gh.Paginate(input, &pagination)).
-		Order("\"CreatedAt\" DESC")
+		Scopes(gh.Sort(input.Sort))
 
 	if err := tx.Find(&data).Error; err != nil {
 		if err == gorm.ErrRecordNotFound {

internal/use-case/main-use-case/medicine-group/lib.go

@@ -53,14 +53,12 @@ func ReadListData(input e.ReadListDto, event *pl.Event, dbx ...*gorm.DB) ([]e.Me
 		}
 	}
 
-	tx = plh.SearchCodeOrName(input.Search, tx)
-
 	tx = tx.
 		Model(&e.MedicineGroup{}).
 		Scopes(gh.Filter(input.FilterDto)).
 		Count(&count).
 		Scopes(gh.Paginate(input, &pagination)).
-		Order("\"CreatedAt\" DESC")
+		Scopes(gh.Sort(input.Sort))
 
 	if err := tx.Find(&data).Error; err != nil {
 		if err == gorm.ErrRecordNotFound {

internal/use-case/main-use-case/medicine-method/lib.go

@@ -53,14 +53,12 @@ func ReadListData(input e.ReadListDto, event *pl.Event, dbx ...*gorm.DB) ([]e.Me
 		}
 	}
 
-	tx = plh.SearchCodeOrName(input.Search, tx)
-
 	tx = tx.
 		Model(&e.MedicineMethod{}).
 		Scopes(gh.Filter(input.FilterDto)).
 		Count(&count).
 		Scopes(gh.Paginate(input, &pagination)).
-		Order("\"CreatedAt\" DESC")
+		Scopes(gh.Sort(input.Sort))
 
 	if err := tx.Find(&data).Error; err != nil {
 		if err == gorm.ErrRecordNotFound {

internal/use-case/main-use-case/medicine/lib.go

@@ -53,14 +53,12 @@ func ReadListData(input e.ReadListDto, event *pl.Event, dbx ...*gorm.DB) ([]e.Me
 		}
 	}
 
-	tx = plh.SearchCodeOrName(input.Search, tx)
-
 	tx = tx.
 		Model(&e.Medicine{}).
 		Scopes(gh.Filter(input.FilterDto)).
 		Count(&count).
 		Scopes(gh.Paginate(input, &pagination)).
-		Order("\"CreatedAt\" DESC")
+		Scopes(gh.Sort(input.Sort))
 
 	if err := tx.Find(&data).Error; err != nil {
 		if err == gorm.ErrRecordNotFound {

internal/use-case/main-use-case/pharmacy-company/lib.go

@@ -53,14 +53,12 @@ func ReadListData(input e.ReadListDto, event *pl.Event, dbx ...*gorm.DB) ([]e.Ph
 		}
 	}
 
-	tx = plh.SearchCodeOrName(input.Search, tx)
-
 	tx = tx.
 		Model(&e.PharmacyCompany{}).
 		Scopes(gh.Filter(input.FilterDto)).
 		Count(&count).
 		Scopes(gh.Paginate(input, &pagination)).
-		Order("\"CreatedAt\" DESC")
+		Scopes(gh.Sort(input.Sort))
 
 	if err := tx.Find(&data).Error; err != nil {
 		if err == gorm.ErrRecordNotFound {

internal/use-case/main-use-case/procedure-src/lib.go

@@ -47,14 +47,12 @@ func ReadListData(input e.ReadListDto, event *pl.Event, dbx ...*gorm.DB) ([]e.Pr
 		tx = dg.I
 	}
 
-	tx = plh.SearchCodeOrName(input.Search, tx)
-
 	tx = tx.
 		Model(&e.ProcedureSrc{}).
 		Scopes(gh.Filter(input.FilterDto)).
 		Count(&count).
 		Scopes(gh.Paginate(input, &pagination)).
-		Order("\"CreatedAt\" DESC")
+		Scopes(gh.Sort(input.Sort))
 
 	if err := tx.Find(&data).Error; err != nil {
 		if err == gorm.ErrRecordNotFound {

internal/use-case/main-use-case/province/lib.go

@@ -53,15 +53,12 @@ func ReadListData(input e.ReadListDto, event *pl.Event, dbx ...*gorm.DB) ([]e.Pr
 		}
 	}
 
-	tx = plh.SearchCodeOrName(input.Search, tx)
-
-	tx = plh.Sort(input.Sort, tx)
-
 	tx = tx.
 		Model(&e.Province{}).
 		Scopes(gh.Filter(input.FilterDto)).
 		Count(&count).
-		Scopes(gh.Paginate(input, &pagination))
+		Scopes(gh.Paginate(input, &pagination)).
+		Scopes(gh.Sort(input.Sort))
 
 	if err := tx.Find(&data).Error; err != nil {
 		if err == gorm.ErrRecordNotFound {

internal/use-case/main-use-case/regency/lib.go

@@ -53,15 +53,12 @@ func ReadListData(input e.ReadListDto, event *pl.Event, dbx ...*gorm.DB) ([]e.Re
 		}
 	}
 
-	tx = plh.SearchCodeOrName(input.Search, tx)
-
-	tx = plh.Sort(input.Sort, tx)
-
 	tx = tx.
 		Model(&e.Regency{}).
 		Scopes(gh.Filter(input.FilterDto)).
 		Count(&count).
-		Scopes(gh.Paginate(input, &pagination))
+		Scopes(gh.Paginate(input, &pagination)).
+		Scopes(gh.Sort(input.Sort))
 
 	if err := tx.Find(&data).Error; err != nil {
 		if err == gorm.ErrRecordNotFound {

internal/use-case/main-use-case/specialist/lib.go

@@ -53,14 +53,12 @@ func ReadListData(input e.ReadListDto, event *pl.Event, dbx ...*gorm.DB) ([]e.Sp
 		}
 	}
 
-	tx = plh.SearchCodeOrName(input.Search, tx)
-
 	tx = tx.
 		Model(&e.Specialist{}).
 		Scopes(gh.Filter(input.FilterDto)).
 		Count(&count).
 		Scopes(gh.Paginate(input, &pagination)).
-		Order("\"CreatedAt\" DESC")
+		Scopes(gh.Sort(input.Sort))
 
 	if err := tx.Find(&data).Error; err != nil {
 		if err == gorm.ErrRecordNotFound {

internal/use-case/main-use-case/subspecialist/lib.go

@@ -53,14 +53,12 @@ func ReadListData(input e.ReadListDto, event *pl.Event, dbx ...*gorm.DB) ([]e.Su
 		}
 	}
 
-	tx = plh.SearchCodeOrName(input.Search, tx)
-
 	tx = tx.
 		Model(&e.Subspecialist{}).
 		Scopes(gh.Filter(input.FilterDto)).
 		Count(&count).
 		Scopes(gh.Paginate(input, &pagination)).
-		Order("\"CreatedAt\" DESC")
+		Scopes(gh.Sort(input.Sort))
 
 	if err := tx.Find(&data).Error; err != nil {
 		if err == gorm.ErrRecordNotFound {

internal/use-case/main-use-case/unit/lib.go

@@ -53,15 +53,13 @@ func ReadListData(input e.ReadListDto, event *pl.Event, dbx ...*gorm.DB) ([]e.Un
 		}
 	}
 
-	tx = plh.SearchCodeOrName(input.Search, tx)
-
 	tx = tx.
 		Model(&e.Unit{}).
 		Preload("Installation").
 		Scopes(gh.Filter(input.FilterDto)).
 		Count(&count).
 		Scopes(gh.Paginate(input, &pagination)).
-		Order("\"CreatedAt\" DESC")
+		Scopes(gh.Sort(input.Sort))
 
 	if err := tx.Find(&data).Error; err != nil {
 		if err == gorm.ErrRecordNotFound {

internal/use-case/main-use-case/uom/lib.go

@@ -53,14 +53,12 @@ func ReadListData(input e.ReadListDto, event *pl.Event, dbx ...*gorm.DB) ([]e.Uo
 		}
 	}
 
-	tx = plh.SearchCodeOrName(input.Search, tx)
-
 	tx = tx.
 		Model(&e.Uom{}).
 		Scopes(gh.Filter(input.FilterDto)).
 		Count(&count).
 		Scopes(gh.Paginate(input, &pagination)).
-		Order("\"CreatedAt\" DESC")
+		Scopes(gh.Sort(input.Sort))
 
 	if err := tx.Find(&data).Error; err != nil {
 		if err == gorm.ErrRecordNotFound {

internal/use-case/main-use-case/village/lib.go

@@ -53,15 +53,12 @@ func ReadListData(input e.ReadListDto, event *pl.Event, dbx ...*gorm.DB) ([]e.Vi
 		}
 	}
 
-	tx = plh.SearchCodeOrName(input.Search, tx)
-
-	tx = plh.Sort(input.Sort, tx)
-
 	tx = tx.
 		Model(&e.Village{}).
 		Scopes(gh.Filter(input.FilterDto)).
 		Count(&count).
-		Scopes(gh.Paginate(input, &pagination))
+		Scopes(gh.Paginate(input, &pagination)).
+		Scopes(gh.Sort(input.Sort))
 
 	if err := tx.Find(&data).Error; err != nil {
 		if err == gorm.ErrRecordNotFound {