diff --git a/internal/domain/main-entities/device/dto.go b/internal/domain/main-entities/device/dto.go index 5a00ca18..14da4c6c 100644 --- a/internal/domain/main-entities/device/dto.go +++ b/internal/domain/main-entities/device/dto.go @@ -19,7 +19,6 @@ type ReadListDto struct { FilterDto Includes string `json:"includes"` Preloads []string `json:"-"` - Search string `json:"search"` Pagination ecore.Pagination } @@ -29,6 +28,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 { diff --git a/internal/domain/main-entities/diagnose-src/dto.go b/internal/domain/main-entities/diagnose-src/dto.go index 5182b522..5e98ce21 100644 --- a/internal/domain/main-entities/diagnose-src/dto.go +++ b/internal/domain/main-entities/diagnose-src/dto.go @@ -14,7 +14,6 @@ type ReadListDto struct { FilterDto Includes string `json:"includes"` Preloads []string `json:"-"` - Search string `json:"search"` Pagination ecore.Pagination } @@ -22,6 +21,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 { diff --git a/internal/domain/main-entities/district/dto.go b/internal/domain/main-entities/district/dto.go index 7205c2b0..f126867d 100644 --- a/internal/domain/main-entities/district/dto.go +++ b/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 { diff --git a/internal/domain/main-entities/division-position/dto.go b/internal/domain/main-entities/division-position/dto.go index 48287959..923e0c06 100644 --- a/internal/domain/main-entities/division-position/dto.go +++ b/internal/domain/main-entities/division-position/dto.go @@ -18,7 +18,6 @@ type ReadListDto struct { FilterDto Includes string `json:"includes"` Preloads []string `json:"-"` - Search string `json:"search"` Pagination ecore.Pagination } @@ -28,6 +27,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 { diff --git a/internal/domain/main-entities/division/dto.go b/internal/domain/main-entities/division/dto.go index 87f1a5f7..ef2f5306 100644 --- a/internal/domain/main-entities/division/dto.go +++ b/internal/domain/main-entities/division/dto.go @@ -14,7 +14,6 @@ type ReadListDto struct { FilterDto Includes string `json:"includes"` Preloads []string `json:"-"` - Search string `json:"search"` Pagination ecore.Pagination OnlyHaveChildren bool `json:"only-have-children"` } @@ -23,6 +22,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 { diff --git a/internal/domain/main-entities/ethnic/dto.go b/internal/domain/main-entities/ethnic/dto.go index 2fac2e81..a1560d8b 100644 --- a/internal/domain/main-entities/ethnic/dto.go +++ b/internal/domain/main-entities/ethnic/dto.go @@ -13,13 +13,13 @@ type ReadListDto struct { FilterDto Includes string `json:"includes"` Preloads []string `json:"-"` - Search string `json:"search"` Pagination ecore.Pagination } type FilterDto struct { - Code string `json:"code"` - Name string `json:"name"` + Code string `json:"code"` + Name string `json:"name"` + Search string `json:"search" gormhelper:"searchColumns=Code,Name"` } type ReadDetailDto struct { diff --git a/internal/domain/main-entities/infra/dto.go b/internal/domain/main-entities/infra/dto.go index f350bf43..591cb32e 100644 --- a/internal/domain/main-entities/infra/dto.go +++ b/internal/domain/main-entities/infra/dto.go @@ -24,7 +24,6 @@ type ReadListDto struct { FilterDto Includes string `json:"includes"` Preloads []string `json:"-"` - Search string `json:"search"` Pagination ecore.Pagination OnlyHaveChildren bool `json:"only-have-children"` } @@ -35,6 +34,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 { diff --git a/internal/domain/main-entities/installation/dto.go b/internal/domain/main-entities/installation/dto.go index 591c7a6d..062b92a1 100644 --- a/internal/domain/main-entities/installation/dto.go +++ b/internal/domain/main-entities/installation/dto.go @@ -16,7 +16,6 @@ type ReadListDto struct { FilterDto Includes string `json:"includes"` Preloads []string `json:"-"` - Search string `json:"search"` Pagination ecore.Pagination } @@ -24,6 +23,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 { diff --git a/internal/domain/main-entities/insurance-company/dto.go b/internal/domain/main-entities/insurance-company/dto.go index b42137b5..af2f5c63 100644 --- a/internal/domain/main-entities/insurance-company/dto.go +++ b/internal/domain/main-entities/insurance-company/dto.go @@ -17,7 +17,6 @@ type ReadListDto struct { FilterDto Includes string `json:"includes"` Preloads []string `json:"-"` - Search string `json:"search"` Pagination ecore.Pagination } @@ -27,6 +26,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 { diff --git a/internal/domain/main-entities/item/dto.go b/internal/domain/main-entities/item/dto.go index 7a7aba50..11d4c0e9 100644 --- a/internal/domain/main-entities/item/dto.go +++ b/internal/domain/main-entities/item/dto.go @@ -19,7 +19,6 @@ type ReadListDto struct { FilterDto Includes string `json:"includes"` Preloads []string `json:"-"` - Search string `json:"search"` Pagination ecore.Pagination } @@ -30,6 +29,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 { diff --git a/internal/domain/main-entities/language/dto.go b/internal/domain/main-entities/language/dto.go index 30bf9eaf..6857980c 100644 --- a/internal/domain/main-entities/language/dto.go +++ b/internal/domain/main-entities/language/dto.go @@ -13,13 +13,13 @@ type ReadListDto struct { FilterDto Includes string `json:"includes"` Preloads []string - Search string `json:"search"` Pagination ecore.Pagination } type FilterDto struct { - Code string `json:"code"` - Name string `json:"name"` + Code string `json:"code"` + Name string `json:"name"` + Search string `json:"search" gormhelper:"searchColumns=Code,Name"` } type ReadDetailDto struct { diff --git a/internal/domain/main-entities/material/dto.go b/internal/domain/main-entities/material/dto.go index 695b3d11..d93309e0 100644 --- a/internal/domain/main-entities/material/dto.go +++ b/internal/domain/main-entities/material/dto.go @@ -20,7 +20,6 @@ type ReadListDto struct { FilterDto Includes string `json:"includes"` Preloads []string `json:"-"` - Search string `json:"search"` Pagination ecore.Pagination } @@ -31,6 +30,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 { diff --git a/internal/domain/main-entities/mcu-src-category/dto.go b/internal/domain/main-entities/mcu-src-category/dto.go index 34d6463c..d8b76724 100644 --- a/internal/domain/main-entities/mcu-src-category/dto.go +++ b/internal/domain/main-entities/mcu-src-category/dto.go @@ -16,7 +16,6 @@ type ReadListDto struct { FilterDto Includes string `json:"includes"` Preloads []string `json:"-"` - Search string `json:"search"` Pagination ecore.Pagination } @@ -24,6 +23,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 { diff --git a/internal/domain/main-entities/mcu-src/dto.go b/internal/domain/main-entities/mcu-src/dto.go index be1c14bf..81622cd7 100644 --- a/internal/domain/main-entities/mcu-src/dto.go +++ b/internal/domain/main-entities/mcu-src/dto.go @@ -16,7 +16,6 @@ type ReadListDto struct { FilterDto Includes string `json:"includes"` Preloads []string `json:"-"` - Search string `json:"search"` Pagination ecore.Pagination } @@ -24,6 +23,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 { diff --git a/internal/domain/main-entities/mcu-sub-src/dto.go b/internal/domain/main-entities/mcu-sub-src/dto.go index 0a3f52a9..499e59e5 100644 --- a/internal/domain/main-entities/mcu-sub-src/dto.go +++ b/internal/domain/main-entities/mcu-sub-src/dto.go @@ -17,7 +17,6 @@ type ReadListDto struct { FilterDto Includes string `json:"includes"` Preloads []string `json:"-"` - Search string `json:"search"` Pagination ecore.Pagination } @@ -25,6 +24,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 { diff --git a/internal/domain/main-entities/medical-action-src/dto.go b/internal/domain/main-entities/medical-action-src/dto.go index 509f5b49..e95d25df 100644 --- a/internal/domain/main-entities/medical-action-src/dto.go +++ b/internal/domain/main-entities/medical-action-src/dto.go @@ -15,7 +15,6 @@ type ReadListDto struct { FilterDto Includes string `json:"includes"` Preloads []string `json:"-"` - Search string `json:"search"` Pagination ecore.Pagination } @@ -23,6 +22,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 { diff --git a/internal/domain/main-entities/medicine-group/dto.go b/internal/domain/main-entities/medicine-group/dto.go index 91b52eaa..6ccde818 100644 --- a/internal/domain/main-entities/medicine-group/dto.go +++ b/internal/domain/main-entities/medicine-group/dto.go @@ -13,13 +13,13 @@ type ReadListDto struct { FilterDto Includes string `json:"includes"` Preloads []string `json:"-"` - Search string `json:"search"` Pagination ecore.Pagination } type FilterDto struct { - Code string `json:"code"` - Name string `json:"name"` + Code string `json:"code"` + Name string `json:"name"` + Search string `json:"search" gormhelper:"searchColumns=Code,Name"` } type ReadDetailDto struct { diff --git a/internal/domain/main-entities/medicine-method/dto.go b/internal/domain/main-entities/medicine-method/dto.go index 2c1018ac..485e43b0 100644 --- a/internal/domain/main-entities/medicine-method/dto.go +++ b/internal/domain/main-entities/medicine-method/dto.go @@ -13,13 +13,13 @@ type ReadListDto struct { FilterDto Includes string `json:"includes"` Preloads []string `json:"-"` - Search string `json:"search"` Pagination ecore.Pagination } type FilterDto struct { - Code string `json:"code"` - Name string `json:"name"` + Code string `json:"code"` + Name string `json:"name"` + Search string `json:"search" gormhelper:"searchColumns=Code,Name"` } type ReadDetailDto struct { diff --git a/internal/domain/main-entities/medicine/dto.go b/internal/domain/main-entities/medicine/dto.go index 6b6517f9..2e59d1f4 100644 --- a/internal/domain/main-entities/medicine/dto.go +++ b/internal/domain/main-entities/medicine/dto.go @@ -25,7 +25,6 @@ type ReadListDto struct { FilterDto Includes string `json:"includes"` Preloads []string `json:"-"` - Search string `json:"search"` Pagination ecore.Pagination } @@ -39,6 +38,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 { diff --git a/internal/domain/main-entities/pharmacy-company/dto.go b/internal/domain/main-entities/pharmacy-company/dto.go index 19c128fa..8acab0ed 100644 --- a/internal/domain/main-entities/pharmacy-company/dto.go +++ b/internal/domain/main-entities/pharmacy-company/dto.go @@ -14,7 +14,6 @@ type ReadListDto struct { FilterDto Includes string `json:"includes"` Preloads []string `json:"-"` - Search string `json:"search"` Pagination ecore.Pagination } @@ -22,6 +21,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 { diff --git a/internal/domain/main-entities/procedure-src/dto.go b/internal/domain/main-entities/procedure-src/dto.go index e608e7c7..d6c6e6c9 100644 --- a/internal/domain/main-entities/procedure-src/dto.go +++ b/internal/domain/main-entities/procedure-src/dto.go @@ -14,7 +14,6 @@ type ReadListDto struct { FilterDto Includes string `json:"includes"` Preloads []string `json:"-"` - Search string `json:"search"` Pagination ecore.Pagination } @@ -22,6 +21,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 { diff --git a/internal/domain/main-entities/province/dto.go b/internal/domain/main-entities/province/dto.go index b4b13cfe..cf49cd43 100644 --- a/internal/domain/main-entities/province/dto.go +++ b/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"` - Name string `json:"name"` + Code string `json:"code"` + Name string `json:"name"` + Search string `json:"search" gormhelper:"searchColumns=Code,Name"` } type ReadDetailDto struct { diff --git a/internal/domain/main-entities/regency/dto.go b/internal/domain/main-entities/regency/dto.go index 09e44e66..0bc7ca51 100644 --- a/internal/domain/main-entities/regency/dto.go +++ b/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 { diff --git a/internal/domain/main-entities/specialist/dto.go b/internal/domain/main-entities/specialist/dto.go index a7dc48e9..e331871b 100644 --- a/internal/domain/main-entities/specialist/dto.go +++ b/internal/domain/main-entities/specialist/dto.go @@ -14,7 +14,6 @@ type ReadListDto struct { FilterDto Includes string `json:"includes"` Preloads []string `json:"-"` - Search string `json:"search"` Pagination ecore.Pagination } @@ -22,6 +21,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 { diff --git a/internal/domain/main-entities/subspecialist/dto.go b/internal/domain/main-entities/subspecialist/dto.go index 1a98906f..d0966011 100644 --- a/internal/domain/main-entities/subspecialist/dto.go +++ b/internal/domain/main-entities/subspecialist/dto.go @@ -14,7 +14,6 @@ type ReadListDto struct { FilterDto Includes string `json:"includes"` Preloads []string `json:"-"` - Search string `json:"search"` Pagination ecore.Pagination } @@ -22,6 +21,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 { diff --git a/internal/domain/main-entities/unit/dto.go b/internal/domain/main-entities/unit/dto.go index 6f11f849..afe3a741 100644 --- a/internal/domain/main-entities/unit/dto.go +++ b/internal/domain/main-entities/unit/dto.go @@ -15,7 +15,6 @@ type ReadListDto struct { FilterDto Includes string `json:"includes"` Preloads []string `json:"-"` - Search string `json:"search"` Pagination ecore.Pagination } @@ -23,6 +22,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 { diff --git a/internal/domain/main-entities/uom/dto.go b/internal/domain/main-entities/uom/dto.go index 30df9752..0cc3beef 100644 --- a/internal/domain/main-entities/uom/dto.go +++ b/internal/domain/main-entities/uom/dto.go @@ -13,13 +13,13 @@ type ReadListDto struct { FilterDto Includes string `json:"includes"` Preloads []string `json:"-"` - Search string `json:"search"` Pagination ecore.Pagination } type FilterDto struct { - Code string `json:"code"` - Name string `json:"name"` + Code string `json:"code"` + Name string `json:"name"` + Search string `json:"search" gormhelper:"searchColumns=Code,Name"` } type ReadDetailDto struct { diff --git a/internal/domain/main-entities/village/dto.go b/internal/domain/main-entities/village/dto.go index f8bc7ab1..70b738df 100644 --- a/internal/domain/main-entities/village/dto.go +++ b/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 { diff --git a/internal/use-case/main-use-case/province/lib.go b/internal/use-case/main-use-case/province/lib.go index 311cdad7..2662a1bd 100644 --- a/internal/use-case/main-use-case/province/lib.go +++ b/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. + tx = tx.Debug(). Model(&e.Province{}). Scopes(gh.Filter(input.FilterDto)). Count(&count). Scopes(gh.Paginate(input, &pagination)) + // Scopes(gh.Sort(input.Sort)) if err := tx.Find(&data).Error; err != nil { if err == gorm.ErrRecordNotFound {