diff --git a/assets/language/en/data.json b/assets/language/en/data.json index d78f3424..ffea29e2 100644 --- a/assets/language/en/data.json +++ b/assets/language/en/data.json @@ -27,6 +27,7 @@ "data-notFound": "data or resource can not be found", "data-notFound-condition": "\"%v\" with %v \"%v\" can not be found", "data-get-fail": "get data failed, %v", + "data-get-invalid-relation": "database get failed, invalid relation", "data-update-fail": "failed to update data", "data-delete-success": "data has been deleted", "data-delete-fail": "failed to delete data", diff --git a/go.mod b/go.mod index 7fd2a149..d6f7fbe8 100644 --- a/go.mod +++ b/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.2.1 + github.com/karincake/getuk v0.3.1 github.com/karincake/hongkue v0.0.4 github.com/karincake/lepet v0.0.1 github.com/karincake/risoles v0.0.3 @@ -61,4 +61,4 @@ require ( gorm.io/driver/postgres v1.5.11 // indirect gorm.io/driver/sqlite v1.5.7 // indirect gorm.io/driver/sqlserver v1.5.4 // indirect -) +) \ No newline at end of file diff --git a/internal/domain/main-entities/adime/dto.go b/internal/domain/main-entities/adime/dto.go index d121c24b..49257154 100644 --- a/internal/domain/main-entities/adime/dto.go +++ b/internal/domain/main-entities/adime/dto.go @@ -21,8 +21,7 @@ type CreateDto struct { type ReadListDto struct { FilterDto - Includes string `json:"includes"` - Preloads []string `json:"-"` + Includes string `json:"includes"` Pagination ecore.Pagination } diff --git a/internal/domain/main-entities/ambulatory/dto.go b/internal/domain/main-entities/ambulatory/dto.go index 79a69807..455f7f02 100644 --- a/internal/domain/main-entities/ambulatory/dto.go +++ b/internal/domain/main-entities/ambulatory/dto.go @@ -13,8 +13,7 @@ type CreateDto struct { type ReadListDto struct { FilterDto - Includes string `json:"includes"` - Preloads []string `json:"-"` + Includes string `json:"includes"` Pagination ecore.Pagination } diff --git a/internal/domain/main-entities/chemo/dto.go b/internal/domain/main-entities/chemo/dto.go index dd432d43..19e5f803 100644 --- a/internal/domain/main-entities/chemo/dto.go +++ b/internal/domain/main-entities/chemo/dto.go @@ -21,8 +21,7 @@ type CreateDto struct { type ReadListDto struct { FilterDto - Includes string `json:"includes"` - Preloads []string `json:"-"` + Includes string `json:"includes"` Pagination ecore.Pagination } diff --git a/internal/domain/main-entities/consultation/dto.go b/internal/domain/main-entities/consultation/dto.go index ea141ace..1b0e3cc5 100644 --- a/internal/domain/main-entities/consultation/dto.go +++ b/internal/domain/main-entities/consultation/dto.go @@ -20,8 +20,7 @@ type CreateDto struct { type ReadListDto struct { FilterDto - Includes string `json:"includes"` - Preloads []string `json:"-"` + Includes string `json:"includes"` Pagination ecore.Pagination } diff --git a/internal/domain/main-entities/device-order-item/dto.go b/internal/domain/main-entities/device-order-item/dto.go index 7206e7db..e89d5fad 100644 --- a/internal/domain/main-entities/device-order-item/dto.go +++ b/internal/domain/main-entities/device-order-item/dto.go @@ -14,8 +14,7 @@ type CreateDto struct { type ReadListDto struct { FilterDto - Includes string `json:"includes"` - Preloads []string `json:"-"` + Includes string `json:"includes"` Pagination ecore.Pagination } diff --git a/internal/domain/main-entities/device-order/dto.go b/internal/domain/main-entities/device-order/dto.go index e1c5c1ea..01ef34b2 100644 --- a/internal/domain/main-entities/device-order/dto.go +++ b/internal/domain/main-entities/device-order/dto.go @@ -20,8 +20,7 @@ type CreateDto struct { type ReadListDto struct { FilterDto - Includes string `json:"includes"` - Preloads []string `json:"-"` + Includes string `json:"includes"` Pagination ecore.Pagination } diff --git a/internal/domain/main-entities/device/dto.go b/internal/domain/main-entities/device/dto.go index f10ccc86..1c874576 100644 --- a/internal/domain/main-entities/device/dto.go +++ b/internal/domain/main-entities/device/dto.go @@ -17,9 +17,8 @@ type CreateDto struct { type ReadListDto struct { FilterDto - Includes string `json:"includes"` - Preloads []string `json:"-"` - Sort string `json:"sort"` + Includes string `json:"includes"` + Sort string `json:"sort"` Pagination ecore.Pagination } diff --git a/internal/domain/main-entities/diagnose-src/dto.go b/internal/domain/main-entities/diagnose-src/dto.go index d8af8e24..6266484a 100644 --- a/internal/domain/main-entities/diagnose-src/dto.go +++ b/internal/domain/main-entities/diagnose-src/dto.go @@ -12,9 +12,8 @@ type CreateDto struct { type ReadListDto struct { FilterDto - Includes string `json:"includes"` - Preloads []string `json:"-"` - Sort string `json:"sort"` + Includes string `json:"includes"` + Sort string `json:"sort"` Pagination ecore.Pagination } diff --git a/internal/domain/main-entities/district/dto.go b/internal/domain/main-entities/district/dto.go index 1f3c4494..ae818d45 100644 --- a/internal/domain/main-entities/district/dto.go +++ b/internal/domain/main-entities/district/dto.go @@ -15,9 +15,8 @@ type CreateDto struct { type ReadListDto struct { FilterDto - Includes string `json:"includes"` - Preloads []string `json:"-"` - Sort string `json:"sort"` + Includes string `json:"includes"` + Sort string `json:"sort"` Pagination ecore.Pagination } diff --git a/internal/domain/main-entities/division-position/dto.go b/internal/domain/main-entities/division-position/dto.go index c316c196..b93e0e98 100644 --- a/internal/domain/main-entities/division-position/dto.go +++ b/internal/domain/main-entities/division-position/dto.go @@ -16,9 +16,8 @@ type CreateDto struct { type ReadListDto struct { FilterDto - Includes string `json:"includes"` - Preloads []string `json:"-"` - Sort string `json:"sort"` + Includes string `json:"includes"` + Sort string `json:"sort"` Pagination ecore.Pagination } diff --git a/internal/domain/main-entities/division/dto.go b/internal/domain/main-entities/division/dto.go index bf0fd6c8..95ea9119 100644 --- a/internal/domain/main-entities/division/dto.go +++ b/internal/domain/main-entities/division/dto.go @@ -12,9 +12,8 @@ type CreateDto struct { type ReadListDto struct { FilterDto - Includes string `json:"includes"` - Preloads []string `json:"-"` - Sort string `json:"sort"` + Includes string `json:"includes"` + Sort string `json:"sort"` Pagination ecore.Pagination OnlyHaveChildren bool `json:"only-have-children"` } diff --git a/internal/domain/main-entities/doctor-fee/dto.go b/internal/domain/main-entities/doctor-fee/dto.go index 4bec752e..baaf5cbf 100644 --- a/internal/domain/main-entities/doctor-fee/dto.go +++ b/internal/domain/main-entities/doctor-fee/dto.go @@ -16,8 +16,7 @@ type CreateDto struct { type ReadListDto struct { FilterDto - Includes string `json:"includes"` - Preloads []string `json:"-"` + Includes string `json:"includes"` Pagination ecore.Pagination } diff --git a/internal/domain/main-entities/doctor/dto.go b/internal/domain/main-entities/doctor/dto.go index 4f298795..62d5f5b4 100644 --- a/internal/domain/main-entities/doctor/dto.go +++ b/internal/domain/main-entities/doctor/dto.go @@ -19,8 +19,7 @@ type CreateDto struct { type ReadListDto struct { FilterDto - Includes string `json:"includes"` - Preloads []string `json:"-"` + Includes string `json:"includes"` Pagination ecore.Pagination } diff --git a/internal/domain/main-entities/emergency/dto.go b/internal/domain/main-entities/emergency/dto.go index e37ba95d..99628b88 100644 --- a/internal/domain/main-entities/emergency/dto.go +++ b/internal/domain/main-entities/emergency/dto.go @@ -13,8 +13,7 @@ type CreateDto struct { type ReadListDto struct { FilterDto - Includes string `json:"includes"` - Preloads []string `json:"-"` + Includes string `json:"includes"` Pagination ecore.Pagination } diff --git a/internal/domain/main-entities/employee/dto.go b/internal/domain/main-entities/employee/dto.go index d7b723f9..00891cc6 100644 --- a/internal/domain/main-entities/employee/dto.go +++ b/internal/domain/main-entities/employee/dto.go @@ -19,8 +19,7 @@ type CreateDto struct { type ReadListDto struct { FilterDto - Includes string `json:"includes"` - Preloads []string `json:"-"` + Includes string `json:"includes"` Pagination ecore.Pagination } diff --git a/internal/domain/main-entities/encounter/dto.go b/internal/domain/main-entities/encounter/dto.go index b9057610..34b74d6a 100644 --- a/internal/domain/main-entities/encounter/dto.go +++ b/internal/domain/main-entities/encounter/dto.go @@ -33,8 +33,7 @@ type CreateDto struct { type ReadListDto struct { FilterDto - Includes string `json:"includes"` - Preloads []string `json:"-"` + Includes string `json:"includes"` Pagination ecore.Pagination } diff --git a/internal/domain/main-entities/ethnic/dto.go b/internal/domain/main-entities/ethnic/dto.go index d21a1519..a8277e27 100644 --- a/internal/domain/main-entities/ethnic/dto.go +++ b/internal/domain/main-entities/ethnic/dto.go @@ -11,9 +11,8 @@ type CreateDto struct { type ReadListDto struct { FilterDto - Includes string `json:"includes"` - Preloads []string `json:"-"` - Sort string `json:"sort"` + Includes string `json:"includes"` + Sort string `json:"sort"` Pagination ecore.Pagination } diff --git a/internal/domain/main-entities/infra/dto.go b/internal/domain/main-entities/infra/dto.go index 97675eaa..de566fad 100644 --- a/internal/domain/main-entities/infra/dto.go +++ b/internal/domain/main-entities/infra/dto.go @@ -22,9 +22,8 @@ type CreateDto struct { type ReadListDto struct { FilterDto - Includes string `json:"includes"` - Preloads []string `json:"-"` - Sort string `json:"sort"` + Includes string `json:"includes"` + Sort string `json:"sort"` Pagination ecore.Pagination OnlyHaveChildren bool `json:"only-have-children"` } diff --git a/internal/domain/main-entities/inpatient/dto.go b/internal/domain/main-entities/inpatient/dto.go index c2191c6b..d92232dd 100644 --- a/internal/domain/main-entities/inpatient/dto.go +++ b/internal/domain/main-entities/inpatient/dto.go @@ -16,8 +16,7 @@ type CreateDto struct { type ReadListDto struct { FilterDto - Includes string `json:"includes"` - Preloads []string `json:"-"` + Includes string `json:"includes"` Pagination ecore.Pagination } diff --git a/internal/domain/main-entities/installation/dto.go b/internal/domain/main-entities/installation/dto.go index df0469b2..55981981 100644 --- a/internal/domain/main-entities/installation/dto.go +++ b/internal/domain/main-entities/installation/dto.go @@ -14,9 +14,8 @@ type CreateDto struct { type ReadListDto struct { FilterDto - Includes string `json:"includes"` - Preloads []string `json:"-"` - Sort string `json:"sort"` + Includes string `json:"includes"` + Sort string `json:"sort"` Pagination ecore.Pagination } diff --git a/internal/domain/main-entities/insurance-company/dto.go b/internal/domain/main-entities/insurance-company/dto.go index 6e51ca0c..e4104bf7 100644 --- a/internal/domain/main-entities/insurance-company/dto.go +++ b/internal/domain/main-entities/insurance-company/dto.go @@ -15,9 +15,8 @@ type CreateDto struct { type ReadListDto struct { FilterDto - Includes string `json:"includes"` - Preloads []string `json:"-"` - Sort string `json:"sort"` + Includes string `json:"includes"` + Sort string `json:"sort"` Pagination ecore.Pagination } diff --git a/internal/domain/main-entities/item-price/dto.go b/internal/domain/main-entities/item-price/dto.go index 1a4ca2a4..5adde2e1 100644 --- a/internal/domain/main-entities/item-price/dto.go +++ b/internal/domain/main-entities/item-price/dto.go @@ -14,8 +14,7 @@ type CreateDto struct { type ReadListDto struct { FilterDto - Includes string `json:"includes"` - Preloads []string `json:"-"` + Includes string `json:"includes"` Pagination ecore.Pagination } diff --git a/internal/domain/main-entities/item/dto.go b/internal/domain/main-entities/item/dto.go index c60d68f2..22be4c1a 100644 --- a/internal/domain/main-entities/item/dto.go +++ b/internal/domain/main-entities/item/dto.go @@ -17,9 +17,8 @@ type CreateDto struct { type ReadListDto struct { FilterDto - Includes string `json:"includes"` - Preloads []string `json:"-"` - Sort string `json:"sort"` + Includes string `json:"includes"` + Sort string `json:"sort"` Pagination ecore.Pagination } diff --git a/internal/domain/main-entities/laborant/dto.go b/internal/domain/main-entities/laborant/dto.go index 3648455c..4397d2f1 100644 --- a/internal/domain/main-entities/laborant/dto.go +++ b/internal/domain/main-entities/laborant/dto.go @@ -12,8 +12,7 @@ type CreateDto struct { type ReadListDto struct { FilterDto - Includes string `json:"includes"` - Preloads []string `json:"-"` + Includes string `json:"includes"` Pagination ecore.Pagination } diff --git a/internal/domain/main-entities/language/dto.go b/internal/domain/main-entities/language/dto.go index 744fefb4..069fbf50 100644 --- a/internal/domain/main-entities/language/dto.go +++ b/internal/domain/main-entities/language/dto.go @@ -12,7 +12,6 @@ type CreateDto struct { type ReadListDto struct { FilterDto Includes string `json:"includes"` - Preloads []string Sort string `json:"sort"` Pagination ecore.Pagination } diff --git a/internal/domain/main-entities/material-order-item/dto.go b/internal/domain/main-entities/material-order-item/dto.go index 74b1f05f..b76792bf 100644 --- a/internal/domain/main-entities/material-order-item/dto.go +++ b/internal/domain/main-entities/material-order-item/dto.go @@ -14,8 +14,7 @@ type CreateDto struct { type ReadListDto struct { FilterDto - Includes string `json:"includes"` - Preloads []string `json:"-"` + Includes string `json:"includes"` Pagination ecore.Pagination } diff --git a/internal/domain/main-entities/material-order/dto.go b/internal/domain/main-entities/material-order/dto.go index d2971a85..5485d2dd 100644 --- a/internal/domain/main-entities/material-order/dto.go +++ b/internal/domain/main-entities/material-order/dto.go @@ -20,8 +20,7 @@ type CreateDto struct { type ReadListDto struct { FilterDto - Includes string `json:"includes"` - Preloads []string `json:"-"` + Includes string `json:"includes"` Pagination ecore.Pagination } diff --git a/internal/domain/main-entities/material/dto.go b/internal/domain/main-entities/material/dto.go index a9705cf8..18a93723 100644 --- a/internal/domain/main-entities/material/dto.go +++ b/internal/domain/main-entities/material/dto.go @@ -18,9 +18,8 @@ type CreateDto struct { type ReadListDto struct { FilterDto - Includes string `json:"includes"` - Preloads []string `json:"-"` - Sort string `json:"sort"` + Includes string `json:"includes"` + Sort string `json:"sort"` Pagination ecore.Pagination } diff --git a/internal/domain/main-entities/mcu-order-item/dto.go b/internal/domain/main-entities/mcu-order-item/dto.go index 06ebd781..64e56a85 100644 --- a/internal/domain/main-entities/mcu-order-item/dto.go +++ b/internal/domain/main-entities/mcu-order-item/dto.go @@ -18,8 +18,7 @@ type CreateDto struct { type ReadListDto struct { FilterDto - Includes string `json:"includes"` - Preloads []string `json:"-"` + Includes string `json:"includes"` Pagination ecore.Pagination } diff --git a/internal/domain/main-entities/mcu-order-sub-item/dto.go b/internal/domain/main-entities/mcu-order-sub-item/dto.go index a38376d3..615b0ee9 100644 --- a/internal/domain/main-entities/mcu-order-sub-item/dto.go +++ b/internal/domain/main-entities/mcu-order-sub-item/dto.go @@ -16,8 +16,7 @@ type CreateDto struct { type ReadListDto struct { FilterDto - Includes string `json:"includes"` - Preloads []string `json:"-"` + Includes string `json:"includes"` Pagination ecore.Pagination } diff --git a/internal/domain/main-entities/mcu-order/dto.go b/internal/domain/main-entities/mcu-order/dto.go index a5e09f5e..caf3ef58 100644 --- a/internal/domain/main-entities/mcu-order/dto.go +++ b/internal/domain/main-entities/mcu-order/dto.go @@ -27,8 +27,7 @@ type CreateDto struct { type ReadListDto struct { FilterDto - Includes string `json:"includes"` - Preloads []string `json:"-"` + Includes string `json:"includes"` Pagination ecore.Pagination } diff --git a/internal/domain/main-entities/mcu-src-category/dto.go b/internal/domain/main-entities/mcu-src-category/dto.go index a7ea9763..278c5e5c 100644 --- a/internal/domain/main-entities/mcu-src-category/dto.go +++ b/internal/domain/main-entities/mcu-src-category/dto.go @@ -14,9 +14,8 @@ type CreateDto struct { type ReadListDto struct { FilterDto - Includes string `json:"includes"` - Preloads []string `json:"-"` - Sort string `json:"sort"` + Includes string `json:"includes"` + Sort string `json:"sort"` Pagination ecore.Pagination } diff --git a/internal/domain/main-entities/mcu-src/dto.go b/internal/domain/main-entities/mcu-src/dto.go index f0d0b8a0..96586057 100644 --- a/internal/domain/main-entities/mcu-src/dto.go +++ b/internal/domain/main-entities/mcu-src/dto.go @@ -14,9 +14,8 @@ type CreateDto struct { type ReadListDto struct { FilterDto - Includes string `json:"includes"` - Preloads []string `json:"-"` - Sort string `json:"sort"` + Includes string `json:"includes"` + Sort string `json:"sort"` Pagination ecore.Pagination } diff --git a/internal/domain/main-entities/mcu-sub-src/dto.go b/internal/domain/main-entities/mcu-sub-src/dto.go index ef68edd1..f1b6d3bb 100644 --- a/internal/domain/main-entities/mcu-sub-src/dto.go +++ b/internal/domain/main-entities/mcu-sub-src/dto.go @@ -15,9 +15,8 @@ type CreateDto struct { type ReadListDto struct { FilterDto - Includes string `json:"includes"` - Preloads []string `json:"-"` - Sort string `json:"sort"` + Includes string `json:"includes"` + Sort string `json:"sort"` Pagination ecore.Pagination } diff --git a/internal/domain/main-entities/medical-action-src-item/dto.go b/internal/domain/main-entities/medical-action-src-item/dto.go index e60a12ed..540a6ca5 100644 --- a/internal/domain/main-entities/medical-action-src-item/dto.go +++ b/internal/domain/main-entities/medical-action-src-item/dto.go @@ -15,8 +15,7 @@ type CreateDto struct { type ReadListDto struct { FilterDto - Includes string `json:"includes"` - Preloads []string `json:"-"` + Includes string `json:"includes"` Pagination ecore.Pagination } diff --git a/internal/domain/main-entities/medical-action-src/dto.go b/internal/domain/main-entities/medical-action-src/dto.go index 4fa6d833..c67a2429 100644 --- a/internal/domain/main-entities/medical-action-src/dto.go +++ b/internal/domain/main-entities/medical-action-src/dto.go @@ -13,9 +13,8 @@ type CreateDto struct { type ReadListDto struct { FilterDto - Includes string `json:"includes"` - Preloads []string `json:"-"` - Sort string `json:"sort"` + Includes string `json:"includes"` + Sort string `json:"sort"` Pagination ecore.Pagination } diff --git a/internal/domain/main-entities/medication-item-dist/dto.go b/internal/domain/main-entities/medication-item-dist/dto.go index 5186b99c..9790895a 100644 --- a/internal/domain/main-entities/medication-item-dist/dto.go +++ b/internal/domain/main-entities/medication-item-dist/dto.go @@ -18,8 +18,7 @@ type CreateDto struct { type ReadListDto struct { FilterDto - Includes string `json:"includes"` - Preloads []string `json:"-"` + Includes string `json:"includes"` Pagination ecore.Pagination } diff --git a/internal/domain/main-entities/medication/dto.go b/internal/domain/main-entities/medication/dto.go index abf91fc7..c2cf9d14 100644 --- a/internal/domain/main-entities/medication/dto.go +++ b/internal/domain/main-entities/medication/dto.go @@ -21,8 +21,7 @@ type CreateDto struct { type ReadListDto struct { FilterDto - Includes string `json:"includes"` - Preloads []string `json:"-"` + Includes string `json:"includes"` Pagination ecore.Pagination } diff --git a/internal/domain/main-entities/medicine-group/dto.go b/internal/domain/main-entities/medicine-group/dto.go index 5894558e..1f71debe 100644 --- a/internal/domain/main-entities/medicine-group/dto.go +++ b/internal/domain/main-entities/medicine-group/dto.go @@ -11,9 +11,8 @@ type CreateDto struct { type ReadListDto struct { FilterDto - Includes string `json:"includes"` - Preloads []string `json:"-"` - Sort string `json:"sort"` + Includes string `json:"includes"` + Sort string `json:"sort"` Pagination ecore.Pagination } diff --git a/internal/domain/main-entities/medicine-method/dto.go b/internal/domain/main-entities/medicine-method/dto.go index 48685259..4840fd27 100644 --- a/internal/domain/main-entities/medicine-method/dto.go +++ b/internal/domain/main-entities/medicine-method/dto.go @@ -11,9 +11,8 @@ type CreateDto struct { type ReadListDto struct { FilterDto - Includes string `json:"includes"` - Preloads []string `json:"-"` - Sort string `json:"sort"` + Includes string `json:"includes"` + Sort string `json:"sort"` Pagination ecore.Pagination } diff --git a/internal/domain/main-entities/medicine-mix-item/dto.go b/internal/domain/main-entities/medicine-mix-item/dto.go index 1790a207..e834e7ec 100644 --- a/internal/domain/main-entities/medicine-mix-item/dto.go +++ b/internal/domain/main-entities/medicine-mix-item/dto.go @@ -14,8 +14,7 @@ type CreateDto struct { type ReadListDto struct { FilterDto - Includes string `json:"includes"` - Preloads []string `json:"-"` + Includes string `json:"includes"` Pagination ecore.Pagination } diff --git a/internal/domain/main-entities/medicine/dto.go b/internal/domain/main-entities/medicine/dto.go index 4c29fdb3..82431fc1 100644 --- a/internal/domain/main-entities/medicine/dto.go +++ b/internal/domain/main-entities/medicine/dto.go @@ -23,9 +23,8 @@ type CreateDto struct { type ReadListDto struct { FilterDto - Includes string `json:"includes"` - Preloads []string `json:"-"` - Sort string `json:"sort"` + Includes string `json:"includes"` + Sort string `json:"sort"` Pagination ecore.Pagination } diff --git a/internal/domain/main-entities/midwife/dto.go b/internal/domain/main-entities/midwife/dto.go index 308f0559..d1adfdaf 100644 --- a/internal/domain/main-entities/midwife/dto.go +++ b/internal/domain/main-entities/midwife/dto.go @@ -12,8 +12,7 @@ type CreateDto struct { type ReadListDto struct { FilterDto - Includes string `json:"includes"` - Preloads []string `json:"-"` + Includes string `json:"includes"` Pagination ecore.Pagination } diff --git a/internal/domain/main-entities/nurse/dto.go b/internal/domain/main-entities/nurse/dto.go index 11d4bfb8..1707f212 100644 --- a/internal/domain/main-entities/nurse/dto.go +++ b/internal/domain/main-entities/nurse/dto.go @@ -16,8 +16,7 @@ type CreateDto struct { type ReadListDto struct { FilterDto - Includes string `json:"includes"` - Preloads []string `json:"-"` + Includes string `json:"includes"` Pagination ecore.Pagination } diff --git a/internal/domain/main-entities/nutritionist/dto.go b/internal/domain/main-entities/nutritionist/dto.go index f48160a2..df6365bf 100644 --- a/internal/domain/main-entities/nutritionist/dto.go +++ b/internal/domain/main-entities/nutritionist/dto.go @@ -12,8 +12,7 @@ type CreateDto struct { type ReadListDto struct { FilterDto - Includes string `json:"includes"` - Preloads []string `json:"-"` + Includes string `json:"includes"` Pagination ecore.Pagination } diff --git a/internal/domain/main-entities/patient/dto.go b/internal/domain/main-entities/patient/dto.go index 26cac97e..d1d32324 100644 --- a/internal/domain/main-entities/patient/dto.go +++ b/internal/domain/main-entities/patient/dto.go @@ -27,8 +27,7 @@ type CreateDto struct { type ReadListDto struct { FilterDto - Includes string `json:"includes"` - Preloads []string `json:"-"` + Includes string `json:"includes"` Pagination ecore.Pagination } diff --git a/internal/domain/main-entities/person/dto.go b/internal/domain/main-entities/person/dto.go index dfba0115..7fb6a235 100644 --- a/internal/domain/main-entities/person/dto.go +++ b/internal/domain/main-entities/person/dto.go @@ -36,8 +36,7 @@ type CreateDto struct { type ReadListDto struct { FilterDto - Includes string `json:"includes"` - Preloads []string `json:"-"` + Includes string `json:"includes"` Pagination ecore.Pagination } diff --git a/internal/domain/main-entities/pharmacist/dto.go b/internal/domain/main-entities/pharmacist/dto.go index fd1bde79..4a04f8d2 100644 --- a/internal/domain/main-entities/pharmacist/dto.go +++ b/internal/domain/main-entities/pharmacist/dto.go @@ -12,8 +12,7 @@ type CreateDto struct { type ReadListDto struct { FilterDto - Includes string `json:"includes"` - Preloads []string `json:"-"` + Includes string `json:"includes"` Pagination ecore.Pagination } diff --git a/internal/domain/main-entities/pharmacy-company/dto.go b/internal/domain/main-entities/pharmacy-company/dto.go index 42c512bf..2bb7e1ac 100644 --- a/internal/domain/main-entities/pharmacy-company/dto.go +++ b/internal/domain/main-entities/pharmacy-company/dto.go @@ -12,9 +12,8 @@ type CreateDto struct { type ReadListDto struct { FilterDto - Includes string `json:"includes"` - Preloads []string `json:"-"` - Sort string `json:"sort"` + Includes string `json:"includes"` + Sort string `json:"sort"` Pagination ecore.Pagination } diff --git a/internal/domain/main-entities/postal-region/dto.go b/internal/domain/main-entities/postal-region/dto.go index f8e36c6a..bc3a0fdc 100644 --- a/internal/domain/main-entities/postal-region/dto.go +++ b/internal/domain/main-entities/postal-region/dto.go @@ -12,9 +12,8 @@ type CreateDto struct { type ReadListDto struct { FilterDto - Includes string `json:"includes"` - Preloads []string `json:"-"` - Sort string `json:"sort"` + Includes string `json:"includes"` + Sort string `json:"sort"` Pagination ecore.Pagination } diff --git a/internal/domain/main-entities/practice-schedule/dto.go b/internal/domain/main-entities/practice-schedule/dto.go index 48f61543..00eea2ad 100644 --- a/internal/domain/main-entities/practice-schedule/dto.go +++ b/internal/domain/main-entities/practice-schedule/dto.go @@ -15,8 +15,7 @@ type CreateDto struct { type ReadListDto struct { FilterDto - Includes string `json:"includes"` - Preloads []string `json:"-"` + Includes string `json:"includes"` Pagination ecore.Pagination } diff --git a/internal/domain/main-entities/prescription-item/dto.go b/internal/domain/main-entities/prescription-item/dto.go index 91922664..64b5f78f 100644 --- a/internal/domain/main-entities/prescription-item/dto.go +++ b/internal/domain/main-entities/prescription-item/dto.go @@ -25,8 +25,7 @@ type CreateDto struct { type ReadListDto struct { FilterDto - Includes string `json:"includes"` - Preloads []string `json:"-"` + Includes string `json:"includes"` Pagination ecore.Pagination } diff --git a/internal/domain/main-entities/prescription/dto.go b/internal/domain/main-entities/prescription/dto.go index e05db349..431f1e2d 100644 --- a/internal/domain/main-entities/prescription/dto.go +++ b/internal/domain/main-entities/prescription/dto.go @@ -19,8 +19,7 @@ type CreateDto struct { type ReadListDto struct { FilterDto - Includes string `json:"includes"` - Preloads []string `json:"-"` + Includes string `json:"includes"` Pagination ecore.Pagination } diff --git a/internal/domain/main-entities/procedure-src/dto.go b/internal/domain/main-entities/procedure-src/dto.go index 2e26164f..477a9885 100644 --- a/internal/domain/main-entities/procedure-src/dto.go +++ b/internal/domain/main-entities/procedure-src/dto.go @@ -12,9 +12,8 @@ type CreateDto struct { type ReadListDto struct { FilterDto - Includes string `json:"includes"` - Preloads []string `json:"-"` - Sort string `json:"sort"` + Includes string `json:"includes"` + Sort string `json:"sort"` Pagination ecore.Pagination } diff --git a/internal/domain/main-entities/province/dto.go b/internal/domain/main-entities/province/dto.go index e8ea71ce..a7cc5a70 100644 --- a/internal/domain/main-entities/province/dto.go +++ b/internal/domain/main-entities/province/dto.go @@ -12,9 +12,8 @@ type CreateDto struct { type ReadListDto struct { FilterDto - Includes string `json:"includes"` - Preloads []string `json:"-"` - Sort string `json:"sort"` + Includes string `json:"includes"` + Sort string `json:"sort"` Pagination ecore.Pagination } diff --git a/internal/domain/main-entities/regency/dto.go b/internal/domain/main-entities/regency/dto.go index f709f001..40682f43 100644 --- a/internal/domain/main-entities/regency/dto.go +++ b/internal/domain/main-entities/regency/dto.go @@ -15,9 +15,8 @@ type CreateDto struct { type ReadListDto struct { FilterDto - Includes string `json:"includes"` - Preloads []string `json:"-"` - Sort string `json:"sort"` + Includes string `json:"includes"` + Sort string `json:"sort"` Pagination ecore.Pagination } diff --git a/internal/domain/main-entities/room/dto.go b/internal/domain/main-entities/room/dto.go index 808e1ee2..0ca2e8d4 100644 --- a/internal/domain/main-entities/room/dto.go +++ b/internal/domain/main-entities/room/dto.go @@ -17,8 +17,7 @@ type CreateDto struct { type ReadListDto struct { FilterDto - Includes string `json:"includes"` - Preloads []string `json:"-"` + Includes string `json:"includes"` Pagination ecore.Pagination } diff --git a/internal/domain/main-entities/sbar/dto.go b/internal/domain/main-entities/sbar/dto.go index 4e3317a8..46cf69a8 100644 --- a/internal/domain/main-entities/sbar/dto.go +++ b/internal/domain/main-entities/sbar/dto.go @@ -21,8 +21,7 @@ type CreateDto struct { type ReadListDto struct { FilterDto - Includes string `json:"includes"` - Preloads []string `json:"-"` + Includes string `json:"includes"` Pagination ecore.Pagination } diff --git a/internal/domain/main-entities/soapi/dto.go b/internal/domain/main-entities/soapi/dto.go index 2a431942..418a7fb8 100644 --- a/internal/domain/main-entities/soapi/dto.go +++ b/internal/domain/main-entities/soapi/dto.go @@ -24,8 +24,7 @@ type CreateDto struct { type ReadListDto struct { FilterDto - Includes string `json:"includes"` - Preloads []string `json:"-"` + Includes string `json:"includes"` Pagination ecore.Pagination } diff --git a/internal/domain/main-entities/specialist-intern/dto.go b/internal/domain/main-entities/specialist-intern/dto.go index 1090793c..2d01c861 100644 --- a/internal/domain/main-entities/specialist-intern/dto.go +++ b/internal/domain/main-entities/specialist-intern/dto.go @@ -17,8 +17,7 @@ type CreateDto struct { type ReadListDto struct { FilterDto - Includes string `json:"includes"` - Preloads []string `json:"-"` + Includes string `json:"includes"` Pagination ecore.Pagination } diff --git a/internal/domain/main-entities/specialist/dto.go b/internal/domain/main-entities/specialist/dto.go index e6d2dfa1..f1338c19 100644 --- a/internal/domain/main-entities/specialist/dto.go +++ b/internal/domain/main-entities/specialist/dto.go @@ -12,9 +12,8 @@ type CreateDto struct { type ReadListDto struct { FilterDto - Includes string `json:"includes"` - Preloads []string `json:"-"` - Sort string `json:"sort"` + Includes string `json:"includes"` + Sort string `json:"sort"` Pagination ecore.Pagination } diff --git a/internal/domain/main-entities/subspecialist/dto.go b/internal/domain/main-entities/subspecialist/dto.go index 797b089c..e28f96ae 100644 --- a/internal/domain/main-entities/subspecialist/dto.go +++ b/internal/domain/main-entities/subspecialist/dto.go @@ -12,9 +12,8 @@ type CreateDto struct { type ReadListDto struct { FilterDto - Includes string `json:"includes"` - Preloads []string `json:"-"` - Sort string `json:"sort"` + Includes string `json:"includes"` + Sort string `json:"sort"` Pagination ecore.Pagination } diff --git a/internal/domain/main-entities/unit/dto.go b/internal/domain/main-entities/unit/dto.go index 06724859..10960609 100644 --- a/internal/domain/main-entities/unit/dto.go +++ b/internal/domain/main-entities/unit/dto.go @@ -13,9 +13,8 @@ type CreateDto struct { type ReadListDto struct { FilterDto - Includes string `json:"includes"` - Preloads []string `json:"-"` - Sort string `json:"sort"` + Includes string `json:"includes"` + Sort string `json:"sort"` Pagination ecore.Pagination } diff --git a/internal/domain/main-entities/uom/dto.go b/internal/domain/main-entities/uom/dto.go index 4cfac41c..4feb5746 100644 --- a/internal/domain/main-entities/uom/dto.go +++ b/internal/domain/main-entities/uom/dto.go @@ -11,9 +11,8 @@ type CreateDto struct { type ReadListDto struct { FilterDto - Includes string `json:"includes"` - Preloads []string `json:"-"` - Sort string `json:"sort"` + Includes string `json:"includes"` + Sort string `json:"sort"` Pagination ecore.Pagination } diff --git a/internal/domain/main-entities/village/dto.go b/internal/domain/main-entities/village/dto.go index 86a08055..bfa8cfc3 100644 --- a/internal/domain/main-entities/village/dto.go +++ b/internal/domain/main-entities/village/dto.go @@ -15,9 +15,8 @@ type CreateDto struct { type ReadListDto struct { FilterDto - Includes string `json:"includes"` - Preloads []string `json:"-"` - Sort string `json:"sort"` + Includes string `json:"includes"` + Sort string `json:"sort"` Pagination ecore.Pagination } diff --git a/internal/use-case/main-use-case/adime/case.go b/internal/use-case/main-use-case/adime/case.go index 5d07ab13..01d101ae 100644 --- a/internal/use-case/main-use-case/adime/case.go +++ b/internal/use-case/main-use-case/adime/case.go @@ -107,9 +107,6 @@ func ReadList(input e.ReadListDto) (*d.Data, error) { return err } - if len(input.Includes) > 0 { - input.Preloads = pu.GetPreloads(input.Includes) - } if dataList, metaList, err = ReadListData(input, &event, tx); err != nil { return err } diff --git a/internal/use-case/main-use-case/adime/lib.go b/internal/use-case/main-use-case/adime/lib.go index 5b0574fe..f198829d 100644 --- a/internal/use-case/main-use-case/adime/lib.go +++ b/internal/use-case/main-use-case/adime/lib.go @@ -47,14 +47,9 @@ func ReadListData(input e.ReadListDto, event *pl.Event, dbx ...*gorm.DB) ([]e.Ad tx = dg.I } - if len(input.Preloads) > 0 { - for _, preload := range input.Preloads { - tx = tx.Preload(preload) - } - } - tx = tx. Model(&e.Adime{}). + Scopes(gh.Preload(input.Includes)). Scopes(gh.Filter(input.FilterDto)). Count(&count). Scopes(gh.Paginate(input, &pagination)). @@ -64,15 +59,9 @@ func ReadListData(input e.ReadListDto, event *pl.Event, dbx ...*gorm.DB) ([]e.Ad if err == gorm.ErrRecordNotFound { return nil, &meta, nil } - event.Status = "failed" - event.ErrInfo = pl.ErrorInfo{ - Code: "data-get-fail", - Detail: "Database get failed", - Raw: err, - } - return nil, nil, pl.SetLogError(event, input) - + return nil, nil, plh.HandleListError(input, event, err) } + meta.Count = int(count) meta.PageNumber = pagination.PageNumber meta.PageSize = pagination.PageSize diff --git a/internal/use-case/main-use-case/ambulatory/case.go b/internal/use-case/main-use-case/ambulatory/case.go index 312a9376..7a2bef47 100644 --- a/internal/use-case/main-use-case/ambulatory/case.go +++ b/internal/use-case/main-use-case/ambulatory/case.go @@ -87,9 +87,6 @@ func ReadList(input e.ReadListDto) (*d.Data, error) { return err } - if len(input.Includes) > 0 { - input.Preloads = pu.GetPreloads(input.Includes) - } if dataList, metaList, err = ReadListData(input, &event, tx); err != nil { return err } diff --git a/internal/use-case/main-use-case/ambulatory/lib.go b/internal/use-case/main-use-case/ambulatory/lib.go index 2a68a980..6b89b0c7 100644 --- a/internal/use-case/main-use-case/ambulatory/lib.go +++ b/internal/use-case/main-use-case/ambulatory/lib.go @@ -47,14 +47,9 @@ func ReadListData(input e.ReadListDto, event *pl.Event, dbx ...*gorm.DB) ([]e.Am tx = dg.I } - if len(input.Preloads) > 0 { - for _, preload := range input.Preloads { - tx = tx.Preload(preload) - } - } - tx = tx. Model(&e.Ambulatory{}). + Scopes(gh.Preload(input.Includes)). Scopes(gh.Filter(input.FilterDto)). Count(&count). Scopes(gh.Paginate(input, &pagination)). @@ -64,15 +59,9 @@ func ReadListData(input e.ReadListDto, event *pl.Event, dbx ...*gorm.DB) ([]e.Am if err == gorm.ErrRecordNotFound { return nil, &meta, nil } - event.Status = "failed" - event.ErrInfo = pl.ErrorInfo{ - Code: "data-get-fail", - Detail: "Database get failed", - Raw: err, - } - return nil, nil, pl.SetLogError(event, input) - + return nil, nil, plh.HandleListError(input, event, err) } + meta.Count = int(count) meta.PageNumber = pagination.PageNumber meta.PageSize = pagination.PageSize diff --git a/internal/use-case/main-use-case/chemo/case.go b/internal/use-case/main-use-case/chemo/case.go index 7167588b..541faa04 100644 --- a/internal/use-case/main-use-case/chemo/case.go +++ b/internal/use-case/main-use-case/chemo/case.go @@ -91,9 +91,6 @@ func ReadList(input e.ReadListDto) (*d.Data, error) { return err } - if len(input.Includes) > 0 { - input.Preloads = pu.GetPreloads(input.Includes) - } if dataList, metaList, err = ReadListData(input, &event, tx); err != nil { return err } diff --git a/internal/use-case/main-use-case/chemo/lib.go b/internal/use-case/main-use-case/chemo/lib.go index 0fa1d51e..39679170 100644 --- a/internal/use-case/main-use-case/chemo/lib.go +++ b/internal/use-case/main-use-case/chemo/lib.go @@ -47,14 +47,9 @@ func ReadListData(input e.ReadListDto, event *pl.Event, dbx ...*gorm.DB) ([]e.Ch tx = dg.I } - if len(input.Preloads) > 0 { - for _, preload := range input.Preloads { - tx = tx.Preload(preload) - } - } - tx = tx. Model(&e.Chemo{}). + Scopes(gh.Preload(input.Includes)). Scopes(gh.Filter(input.FilterDto)). Count(&count). Scopes(gh.Paginate(input, &pagination)). @@ -64,15 +59,9 @@ func ReadListData(input e.ReadListDto, event *pl.Event, dbx ...*gorm.DB) ([]e.Ch if err == gorm.ErrRecordNotFound { return nil, &meta, nil } - event.Status = "failed" - event.ErrInfo = pl.ErrorInfo{ - Code: "data-get-fail", - Detail: "Database get failed", - Raw: err, - } - return nil, nil, pl.SetLogError(event, input) - + return nil, nil, plh.HandleListError(input, event, err) } + meta.Count = int(count) meta.PageNumber = pagination.PageNumber meta.PageSize = pagination.PageSize diff --git a/internal/use-case/main-use-case/consultation/case.go b/internal/use-case/main-use-case/consultation/case.go index 1b20d463..3cda31d9 100644 --- a/internal/use-case/main-use-case/consultation/case.go +++ b/internal/use-case/main-use-case/consultation/case.go @@ -97,9 +97,6 @@ func ReadList(input e.ReadListDto) (*d.Data, error) { return err } - if len(input.Includes) > 0 { - input.Preloads = pu.GetPreloads(input.Includes) - } if dataList, metaList, err = ReadListData(input, &event, tx); err != nil { return err } diff --git a/internal/use-case/main-use-case/consultation/lib.go b/internal/use-case/main-use-case/consultation/lib.go index 2cb2753b..4ff9e7e2 100644 --- a/internal/use-case/main-use-case/consultation/lib.go +++ b/internal/use-case/main-use-case/consultation/lib.go @@ -47,14 +47,9 @@ func ReadListData(input e.ReadListDto, event *pl.Event, dbx ...*gorm.DB) ([]e.Co tx = dg.I } - if len(input.Preloads) > 0 { - for _, preload := range input.Preloads { - tx = tx.Preload(preload) - } - } - tx = tx. Model(&e.Consultation{}). + Scopes(gh.Preload(input.Includes)). Scopes(gh.Filter(input.FilterDto)). Count(&count). Scopes(gh.Paginate(input, &pagination)). @@ -64,15 +59,9 @@ func ReadListData(input e.ReadListDto, event *pl.Event, dbx ...*gorm.DB) ([]e.Co if err == gorm.ErrRecordNotFound { return nil, &meta, nil } - event.Status = "failed" - event.ErrInfo = pl.ErrorInfo{ - Code: "data-get-fail", - Detail: "Database get failed", - Raw: err, - } - return nil, nil, pl.SetLogError(event, input) - + return nil, nil, plh.HandleListError(input, event, err) } + meta.Count = int(count) meta.PageNumber = pagination.PageNumber meta.PageSize = pagination.PageSize diff --git a/internal/use-case/main-use-case/counter/lib.go b/internal/use-case/main-use-case/counter/lib.go index 1a28e29a..022fa622 100644 --- a/internal/use-case/main-use-case/counter/lib.go +++ b/internal/use-case/main-use-case/counter/lib.go @@ -58,15 +58,9 @@ func ReadListData(input e.ReadListDto, event *pl.Event, dbx ...*gorm.DB) ([]e.Co if err == gorm.ErrRecordNotFound { return nil, &meta, nil } - event.Status = "failed" - event.ErrInfo = pl.ErrorInfo{ - Code: "data-get-fail", - Detail: "Database get failed", - Raw: err, - } - return nil, nil, pl.SetLogError(event, input) - + return nil, nil, plh.HandleListError(input, event, err) } + meta.Count = int(count) meta.PageNumber = pagination.PageNumber meta.PageSize = pagination.PageSize diff --git a/internal/use-case/main-use-case/device-order-item/case.go b/internal/use-case/main-use-case/device-order-item/case.go index 11cd88ab..1765e52a 100644 --- a/internal/use-case/main-use-case/device-order-item/case.go +++ b/internal/use-case/main-use-case/device-order-item/case.go @@ -88,9 +88,6 @@ func ReadList(input e.ReadListDto) (*d.Data, error) { return err } - if len(input.Includes) > 0 { - input.Preloads = pu.GetPreloads(input.Includes) - } if dataList, metaList, err = ReadListData(input, &event, tx); err != nil { return err } diff --git a/internal/use-case/main-use-case/device-order-item/lib.go b/internal/use-case/main-use-case/device-order-item/lib.go index 5861f403..70ccc5d7 100644 --- a/internal/use-case/main-use-case/device-order-item/lib.go +++ b/internal/use-case/main-use-case/device-order-item/lib.go @@ -47,14 +47,9 @@ func ReadListData(input e.ReadListDto, event *pl.Event, dbx ...*gorm.DB) ([]e.De tx = dg.I } - if len(input.Preloads) > 0 { - for _, preload := range input.Preloads { - tx = tx.Preload(preload) - } - } - tx = tx. Model(&e.DeviceOrderItem{}). + Scopes(gh.Preload(input.Includes)). Scopes(gh.Filter(input.FilterDto)). Count(&count). Scopes(gh.Paginate(input, &pagination)). @@ -64,15 +59,9 @@ func ReadListData(input e.ReadListDto, event *pl.Event, dbx ...*gorm.DB) ([]e.De if err == gorm.ErrRecordNotFound { return nil, &meta, nil } - event.Status = "failed" - event.ErrInfo = pl.ErrorInfo{ - Code: "data-get-fail", - Detail: "Database get failed", - Raw: err, - } - return nil, nil, pl.SetLogError(event, input) - + return nil, nil, plh.HandleListError(input, event, err) } + meta.Count = int(count) meta.PageNumber = pagination.PageNumber meta.PageSize = pagination.PageSize diff --git a/internal/use-case/main-use-case/device-order/case.go b/internal/use-case/main-use-case/device-order/case.go index d8f52238..89466ead 100644 --- a/internal/use-case/main-use-case/device-order/case.go +++ b/internal/use-case/main-use-case/device-order/case.go @@ -119,9 +119,6 @@ func ReadList(input e.ReadListDto) (*d.Data, error) { return err } - if len(input.Includes) > 0 { - input.Preloads = pu.GetPreloads(input.Includes) - } if dataList, metaList, err = ReadListData(input, &event, tx); err != nil { return err } diff --git a/internal/use-case/main-use-case/device-order/lib.go b/internal/use-case/main-use-case/device-order/lib.go index d8a9c8f3..996dfc86 100644 --- a/internal/use-case/main-use-case/device-order/lib.go +++ b/internal/use-case/main-use-case/device-order/lib.go @@ -47,14 +47,9 @@ func ReadListData(input e.ReadListDto, event *pl.Event, dbx ...*gorm.DB) ([]e.De tx = dg.I } - if len(input.Preloads) > 0 { - for _, preload := range input.Preloads { - tx = tx.Preload(preload) - } - } - tx = tx. Model(&e.DeviceOrder{}). + Scopes(gh.Preload(input.Includes)). Scopes(gh.Filter(input.FilterDto)). Count(&count). Scopes(gh.Paginate(input, &pagination)). @@ -64,15 +59,9 @@ func ReadListData(input e.ReadListDto, event *pl.Event, dbx ...*gorm.DB) ([]e.De if err == gorm.ErrRecordNotFound { return nil, &meta, nil } - event.Status = "failed" - event.ErrInfo = pl.ErrorInfo{ - Code: "data-get-fail", - Detail: "Database get failed", - Raw: err, - } - return nil, nil, pl.SetLogError(event, input) - + return nil, nil, plh.HandleListError(input, event, err) } + meta.Count = int(count) meta.PageNumber = pagination.PageNumber meta.PageSize = pagination.PageSize diff --git a/internal/use-case/main-use-case/device/case.go b/internal/use-case/main-use-case/device/case.go index 3e97fe6c..ff548a4b 100644 --- a/internal/use-case/main-use-case/device/case.go +++ b/internal/use-case/main-use-case/device/case.go @@ -90,9 +90,6 @@ func ReadList(input e.ReadListDto) (*d.Data, error) { return err } - if len(input.Includes) > 0 { - input.Preloads = pu.GetPreloads(input.Includes) - } if dataList, metaList, err = ReadListData(input, &event, tx); err != nil { return err } diff --git a/internal/use-case/main-use-case/device/lib.go b/internal/use-case/main-use-case/device/lib.go index 94410c61..664db248 100644 --- a/internal/use-case/main-use-case/device/lib.go +++ b/internal/use-case/main-use-case/device/lib.go @@ -47,14 +47,9 @@ func ReadListData(input e.ReadListDto, event *pl.Event, dbx ...*gorm.DB) ([]e.De tx = dg.I } - if len(input.Preloads) > 0 { - for _, preload := range input.Preloads { - tx = tx.Preload(preload) - } - } - tx = tx. Model(&e.Device{}). + Scopes(gh.Preload(input.Includes)). Scopes(gh.Filter(input.FilterDto)). Count(&count). Scopes(gh.Paginate(input, &pagination)). @@ -64,15 +59,9 @@ func ReadListData(input e.ReadListDto, event *pl.Event, dbx ...*gorm.DB) ([]e.De if err == gorm.ErrRecordNotFound { return nil, &meta, nil } - event.Status = "failed" - event.ErrInfo = pl.ErrorInfo{ - Code: "data-get-fail", - Detail: "Database get failed", - Raw: err, - } - return nil, nil, pl.SetLogError(event, input) - + return nil, nil, plh.HandleListError(input, event, err) } + meta.Count = int(count) meta.PageNumber = pagination.PageNumber meta.PageSize = pagination.PageSize diff --git a/internal/use-case/main-use-case/diagnose-src/case.go b/internal/use-case/main-use-case/diagnose-src/case.go index 587305ba..184e68a8 100644 --- a/internal/use-case/main-use-case/diagnose-src/case.go +++ b/internal/use-case/main-use-case/diagnose-src/case.go @@ -87,9 +87,6 @@ func ReadList(input e.ReadListDto) (*d.Data, error) { return err } - if len(input.Includes) > 0 { - input.Preloads = pu.GetPreloads(input.Includes) - } if dataList, metaList, err = ReadListData(input, &event, tx); err != nil { return err } diff --git a/internal/use-case/main-use-case/diagnose-src/lib.go b/internal/use-case/main-use-case/diagnose-src/lib.go index 66de0020..d45f6bb3 100644 --- a/internal/use-case/main-use-case/diagnose-src/lib.go +++ b/internal/use-case/main-use-case/diagnose-src/lib.go @@ -47,14 +47,9 @@ func ReadListData(input e.ReadListDto, event *pl.Event, dbx ...*gorm.DB) ([]e.Di tx = dg.I } - if len(input.Preloads) > 0 { - for _, preload := range input.Preloads { - tx = tx.Preload(preload) - } - } - tx = tx. Model(&e.DiagnoseSrc{}). + Scopes(gh.Preload(input.Includes)). Scopes(gh.Filter(input.FilterDto)). Count(&count). Scopes(gh.Paginate(input, &pagination)). @@ -64,15 +59,9 @@ func ReadListData(input e.ReadListDto, event *pl.Event, dbx ...*gorm.DB) ([]e.Di if err == gorm.ErrRecordNotFound { return nil, &meta, nil } - event.Status = "failed" - event.ErrInfo = pl.ErrorInfo{ - Code: "data-get-fail", - Detail: "Database get failed", - Raw: err, - } - return nil, nil, pl.SetLogError(event, input) - + return nil, nil, plh.HandleListError(input, event, err) } + meta.Count = int(count) meta.PageNumber = pagination.PageNumber meta.PageSize = pagination.PageSize diff --git a/internal/use-case/main-use-case/district/case.go b/internal/use-case/main-use-case/district/case.go index 8ab41024..b7a4b1a0 100644 --- a/internal/use-case/main-use-case/district/case.go +++ b/internal/use-case/main-use-case/district/case.go @@ -87,9 +87,6 @@ func ReadList(input e.ReadListDto) (*d.Data, error) { return err } - if len(input.Includes) > 0 { - input.Preloads = pu.GetPreloads(input.Includes) - } if dataList, metaList, err = ReadListData(input, &event, tx); err != nil { return err } diff --git a/internal/use-case/main-use-case/district/lib.go b/internal/use-case/main-use-case/district/lib.go index ccc7b775..4c8ac32f 100644 --- a/internal/use-case/main-use-case/district/lib.go +++ b/internal/use-case/main-use-case/district/lib.go @@ -47,14 +47,9 @@ func ReadListData(input e.ReadListDto, event *pl.Event, dbx ...*gorm.DB) ([]e.Di tx = dg.I } - if len(input.Preloads) > 0 { - for _, preload := range input.Preloads { - tx = tx.Preload(preload) - } - } - tx = tx. Model(&e.District{}). + Scopes(gh.Preload(input.Includes)). Scopes(gh.Filter(input.FilterDto)). Count(&count). Scopes(gh.Paginate(input, &pagination)). @@ -64,15 +59,9 @@ func ReadListData(input e.ReadListDto, event *pl.Event, dbx ...*gorm.DB) ([]e.Di if err == gorm.ErrRecordNotFound { return nil, &meta, nil } - event.Status = "failed" - event.ErrInfo = pl.ErrorInfo{ - Code: "data-get-fail", - Detail: "Database get failed", - Raw: err, - } - return nil, nil, pl.SetLogError(event, input) - + return nil, nil, plh.HandleListError(input, event, err) } + meta.Count = int(count) meta.PageNumber = pagination.PageNumber meta.PageSize = pagination.PageSize diff --git a/internal/use-case/main-use-case/division-position/case.go b/internal/use-case/main-use-case/division-position/case.go index 2ab963e5..159e9edc 100644 --- a/internal/use-case/main-use-case/division-position/case.go +++ b/internal/use-case/main-use-case/division-position/case.go @@ -87,9 +87,6 @@ func ReadList(input e.ReadListDto) (*d.Data, error) { return err } - if len(input.Includes) > 0 { - input.Preloads = pu.GetPreloads(input.Includes) - } if dataList, metaList, err = ReadListData(input, &event, tx); err != nil { return err } diff --git a/internal/use-case/main-use-case/division-position/lib.go b/internal/use-case/main-use-case/division-position/lib.go index 3a9b8d78..d1327d47 100644 --- a/internal/use-case/main-use-case/division-position/lib.go +++ b/internal/use-case/main-use-case/division-position/lib.go @@ -47,15 +47,9 @@ func ReadListData(input e.ReadListDto, event *pl.Event, dbx ...*gorm.DB) ([]e.Di tx = dg.I } - if len(input.Preloads) > 0 { - for _, preload := range input.Preloads { - tx = tx.Preload(preload) - } - } - tx = tx. Model(&e.DivisionPosition{}). - Preload("Division"). + Scopes(gh.Preload(input.Includes)). Scopes(gh.Filter(input.FilterDto)). Count(&count). Scopes(gh.Paginate(input, &pagination)). @@ -65,15 +59,9 @@ func ReadListData(input e.ReadListDto, event *pl.Event, dbx ...*gorm.DB) ([]e.Di if err == gorm.ErrRecordNotFound { return nil, &meta, nil } - event.Status = "failed" - event.ErrInfo = pl.ErrorInfo{ - Code: "data-get-fail", - Detail: "Database get failed", - Raw: err, - } - return nil, nil, pl.SetLogError(event, input) - + return nil, nil, plh.HandleListError(input, event, err) } + meta.Count = int(count) meta.PageNumber = pagination.PageNumber meta.PageSize = pagination.PageSize diff --git a/internal/use-case/main-use-case/division/case.go b/internal/use-case/main-use-case/division/case.go index 885d5724..daabd2f8 100644 --- a/internal/use-case/main-use-case/division/case.go +++ b/internal/use-case/main-use-case/division/case.go @@ -87,9 +87,6 @@ func ReadList(input e.ReadListDto) (*d.Data, error) { return err } - if len(input.Includes) > 0 { - input.Preloads = pu.GetPreloads(input.Includes) - } if dataList, metaList, err = ReadListData(input, &event, tx); err != nil { return err } diff --git a/internal/use-case/main-use-case/division/lib.go b/internal/use-case/main-use-case/division/lib.go index d098490d..828395e7 100644 --- a/internal/use-case/main-use-case/division/lib.go +++ b/internal/use-case/main-use-case/division/lib.go @@ -47,12 +47,6 @@ func ReadListData(input e.ReadListDto, event *pl.Event, dbx ...*gorm.DB) ([]e.Di tx = dg.I } - if len(input.Preloads) > 0 { - for _, preload := range input.Preloads { - tx = tx.Preload(preload) - } - } - if input.OnlyHaveChildren { tx = tx.Where(` EXISTS ( @@ -65,6 +59,7 @@ func ReadListData(input e.ReadListDto, event *pl.Event, dbx ...*gorm.DB) ([]e.Di tx = tx. Model(&e.Division{}). + Scopes(gh.Preload(input.Includes)). Scopes(gh.Filter(input.FilterDto)). Count(&count). Scopes(gh.Paginate(input, &pagination)). @@ -74,15 +69,9 @@ func ReadListData(input e.ReadListDto, event *pl.Event, dbx ...*gorm.DB) ([]e.Di if err == gorm.ErrRecordNotFound { return nil, &meta, nil } - event.Status = "failed" - event.ErrInfo = pl.ErrorInfo{ - Code: "data-get-fail", - Detail: "Database get failed", - Raw: err, - } - return nil, nil, pl.SetLogError(event, input) - + return nil, nil, plh.HandleListError(input, event, err) } + meta.Count = int(count) meta.PageNumber = pagination.PageNumber meta.PageSize = pagination.PageSize diff --git a/internal/use-case/main-use-case/doctor-fee/case.go b/internal/use-case/main-use-case/doctor-fee/case.go index 6a93b57d..94b57da5 100644 --- a/internal/use-case/main-use-case/doctor-fee/case.go +++ b/internal/use-case/main-use-case/doctor-fee/case.go @@ -87,9 +87,6 @@ func ReadList(input e.ReadListDto) (*d.Data, error) { return err } - if len(input.Includes) > 0 { - input.Preloads = pu.GetPreloads(input.Includes) - } if dataList, metaList, err = ReadListData(input, &event, tx); err != nil { return err } diff --git a/internal/use-case/main-use-case/doctor-fee/lib.go b/internal/use-case/main-use-case/doctor-fee/lib.go index 17c8a86d..e657537a 100644 --- a/internal/use-case/main-use-case/doctor-fee/lib.go +++ b/internal/use-case/main-use-case/doctor-fee/lib.go @@ -47,14 +47,9 @@ func ReadListData(input e.ReadListDto, event *pl.Event, dbx ...*gorm.DB) ([]e.Do tx = dg.I } - if len(input.Preloads) > 0 { - for _, preload := range input.Preloads { - tx = tx.Preload(preload) - } - } - tx = tx. Model(&e.DoctorFee{}). + Scopes(gh.Preload(input.Includes)). Scopes(gh.Filter(input.FilterDto)). Count(&count). Scopes(gh.Paginate(input, &pagination)). @@ -64,15 +59,9 @@ func ReadListData(input e.ReadListDto, event *pl.Event, dbx ...*gorm.DB) ([]e.Do if err == gorm.ErrRecordNotFound { return nil, &meta, nil } - event.Status = "failed" - event.ErrInfo = pl.ErrorInfo{ - Code: "data-get-fail", - Detail: "Database get failed", - Raw: err, - } - return nil, nil, pl.SetLogError(event, input) - + return nil, nil, plh.HandleListError(input, event, err) } + meta.Count = int(count) meta.PageNumber = pagination.PageNumber meta.PageSize = pagination.PageSize diff --git a/internal/use-case/main-use-case/doctor/case.go b/internal/use-case/main-use-case/doctor/case.go index e09376b7..74337056 100644 --- a/internal/use-case/main-use-case/doctor/case.go +++ b/internal/use-case/main-use-case/doctor/case.go @@ -87,9 +87,6 @@ func ReadList(input e.ReadListDto) (*d.Data, error) { return err } - if len(input.Includes) > 0 { - input.Preloads = pu.GetPreloads(input.Includes) - } if dataList, metaList, err = ReadListData(input, &event, tx); err != nil { return err } diff --git a/internal/use-case/main-use-case/doctor/lib.go b/internal/use-case/main-use-case/doctor/lib.go index 859a2bd6..3355bb3c 100644 --- a/internal/use-case/main-use-case/doctor/lib.go +++ b/internal/use-case/main-use-case/doctor/lib.go @@ -47,14 +47,9 @@ func ReadListData(input e.ReadListDto, event *pl.Event, dbx ...*gorm.DB) ([]e.Do tx = dg.I } - if len(input.Preloads) > 0 { - for _, preload := range input.Preloads { - tx = tx.Preload(preload) - } - } - tx = tx. Model(&e.Doctor{}). + Scopes(gh.Preload(input.Includes)). Scopes(gh.Filter(input.FilterDto)). Count(&count). Scopes(gh.Paginate(input, &pagination)). @@ -64,15 +59,9 @@ func ReadListData(input e.ReadListDto, event *pl.Event, dbx ...*gorm.DB) ([]e.Do if err == gorm.ErrRecordNotFound { return nil, &meta, nil } - event.Status = "failed" - event.ErrInfo = pl.ErrorInfo{ - Code: "data-get-fail", - Detail: "Database get failed", - Raw: err, - } - return nil, nil, pl.SetLogError(event, input) - + return nil, nil, plh.HandleListError(input, event, err) } + meta.Count = int(count) meta.PageNumber = pagination.PageNumber meta.PageSize = pagination.PageSize diff --git a/internal/use-case/main-use-case/emergency/case.go b/internal/use-case/main-use-case/emergency/case.go index 0a9e48e7..88f662db 100644 --- a/internal/use-case/main-use-case/emergency/case.go +++ b/internal/use-case/main-use-case/emergency/case.go @@ -87,9 +87,6 @@ func ReadList(input e.ReadListDto) (*d.Data, error) { return err } - if len(input.Includes) > 0 { - input.Preloads = pu.GetPreloads(input.Includes) - } if dataList, metaList, err = ReadListData(input, &event, tx); err != nil { return err } diff --git a/internal/use-case/main-use-case/emergency/lib.go b/internal/use-case/main-use-case/emergency/lib.go index 414deba7..df7812f4 100644 --- a/internal/use-case/main-use-case/emergency/lib.go +++ b/internal/use-case/main-use-case/emergency/lib.go @@ -47,14 +47,9 @@ func ReadListData(input e.ReadListDto, event *pl.Event, dbx ...*gorm.DB) ([]e.Em tx = dg.I } - if len(input.Preloads) > 0 { - for _, preload := range input.Preloads { - tx = tx.Preload(preload) - } - } - tx = tx. Model(&e.Emergency{}). + Scopes(gh.Preload(input.Includes)). Scopes(gh.Filter(input.FilterDto)). Count(&count). Scopes(gh.Paginate(input, &pagination)). @@ -64,15 +59,9 @@ func ReadListData(input e.ReadListDto, event *pl.Event, dbx ...*gorm.DB) ([]e.Em if err == gorm.ErrRecordNotFound { return nil, &meta, nil } - event.Status = "failed" - event.ErrInfo = pl.ErrorInfo{ - Code: "data-get-fail", - Detail: "Database get failed", - Raw: err, - } - return nil, nil, pl.SetLogError(event, input) - + return nil, nil, plh.HandleListError(input, event, err) } + meta.Count = int(count) meta.PageNumber = pagination.PageNumber meta.PageSize = pagination.PageSize diff --git a/internal/use-case/main-use-case/employee/case.go b/internal/use-case/main-use-case/employee/case.go index c68fd7cf..b59eae18 100644 --- a/internal/use-case/main-use-case/employee/case.go +++ b/internal/use-case/main-use-case/employee/case.go @@ -82,9 +82,6 @@ func ReadList(input e.ReadListDto) (*d.Data, error) { return err } - if len(input.Includes) > 0 { - input.Preloads = pu.GetPreloads(input.Includes) - } if dataList, metaList, err = ReadListData(input, &event, tx); err != nil { return err } diff --git a/internal/use-case/main-use-case/employee/lib.go b/internal/use-case/main-use-case/employee/lib.go index 020328b5..e36dacee 100644 --- a/internal/use-case/main-use-case/employee/lib.go +++ b/internal/use-case/main-use-case/employee/lib.go @@ -48,14 +48,9 @@ func ReadListData(input e.ReadListDto, event *pl.Event, dbx ...*gorm.DB) ([]e.Em tx = dg.I } - if len(input.Preloads) > 0 { - for _, preload := range input.Preloads { - tx = tx.Preload(preload) - } - } - tx = tx. Model(&e.Employee{}). + Scopes(gh.Preload(input.Includes)). Scopes(gh.Filter(input.FilterDto)). Count(&count). Scopes(gh.Paginate(input, &pagination)). @@ -65,15 +60,9 @@ func ReadListData(input e.ReadListDto, event *pl.Event, dbx ...*gorm.DB) ([]e.Em if err == gorm.ErrRecordNotFound { return nil, &meta, nil } - event.Status = "failed" - event.ErrInfo = pl.ErrorInfo{ - Code: "data-get-fail", - Detail: "Database get failed", - Raw: err, - } - return nil, nil, pl.SetLogError(event, input) - + return nil, nil, plh.HandleListError(input, event, err) } + meta.Count = int(count) meta.PageNumber = pagination.PageNumber meta.PageSize = pagination.PageSize diff --git a/internal/use-case/main-use-case/encounter/case.go b/internal/use-case/main-use-case/encounter/case.go index cdd3beb2..7d209041 100644 --- a/internal/use-case/main-use-case/encounter/case.go +++ b/internal/use-case/main-use-case/encounter/case.go @@ -159,9 +159,6 @@ func ReadList(input e.ReadListDto) (*d.Data, error) { return err } - if len(input.Includes) > 0 { - input.Preloads = pu.GetPreloads(input.Includes) - } if dataList, metaList, err = ReadListData(input, &event, tx); err != nil { return err } diff --git a/internal/use-case/main-use-case/encounter/lib.go b/internal/use-case/main-use-case/encounter/lib.go index bfc62fdc..e1bcc630 100644 --- a/internal/use-case/main-use-case/encounter/lib.go +++ b/internal/use-case/main-use-case/encounter/lib.go @@ -47,14 +47,9 @@ func ReadListData(input e.ReadListDto, event *pl.Event, dbx ...*gorm.DB) ([]e.En tx = dg.I } - if len(input.Preloads) > 0 { - for _, preload := range input.Preloads { - tx = tx.Preload(preload) - } - } - tx = tx. Model(&e.Encounter{}). + Scopes(gh.Preload(input.Includes)). Scopes(gh.Filter(input.FilterDto)). Count(&count). Scopes(gh.Paginate(input, &pagination)). @@ -64,15 +59,9 @@ func ReadListData(input e.ReadListDto, event *pl.Event, dbx ...*gorm.DB) ([]e.En if err == gorm.ErrRecordNotFound { return nil, &meta, nil } - event.Status = "failed" - event.ErrInfo = pl.ErrorInfo{ - Code: "data-get-fail", - Detail: "Database get failed", - Raw: err, - } - return nil, nil, pl.SetLogError(event, input) - + return nil, nil, plh.HandleListError(input, event, err) } + meta.Count = int(count) meta.PageNumber = pagination.PageNumber meta.PageSize = pagination.PageSize diff --git a/internal/use-case/main-use-case/ethnic/case.go b/internal/use-case/main-use-case/ethnic/case.go index 5885f742..c8ca95a1 100644 --- a/internal/use-case/main-use-case/ethnic/case.go +++ b/internal/use-case/main-use-case/ethnic/case.go @@ -87,9 +87,6 @@ func ReadList(input e.ReadListDto) (*d.Data, error) { return err } - if len(input.Includes) > 0 { - input.Preloads = pu.GetPreloads(input.Includes) - } if dataList, metaList, err = ReadListData(input, &event, tx); err != nil { return err } diff --git a/internal/use-case/main-use-case/ethnic/lib.go b/internal/use-case/main-use-case/ethnic/lib.go index 9b7a3cf4..0bc91e3f 100644 --- a/internal/use-case/main-use-case/ethnic/lib.go +++ b/internal/use-case/main-use-case/ethnic/lib.go @@ -49,6 +49,7 @@ func ReadListData(input e.ReadListDto, event *pl.Event, dbx ...*gorm.DB) ([]e.Et tx = tx. Model(&e.Ethnic{}). + Scopes(gh.Preload(input.Includes)). Scopes(gh.Filter(input.FilterDto)). Count(&count). Scopes(gh.Paginate(input, &pagination)). @@ -58,15 +59,9 @@ func ReadListData(input e.ReadListDto, event *pl.Event, dbx ...*gorm.DB) ([]e.Et if err == gorm.ErrRecordNotFound { return nil, &meta, nil } - event.Status = "failed" - event.ErrInfo = pl.ErrorInfo{ - Code: "data-get-fail", - Detail: "Database get failed", - Raw: err, - } - return nil, nil, pl.SetLogError(event, input) - + return nil, nil, plh.HandleListError(input, event, err) } + meta.Count = int(count) meta.PageNumber = pagination.PageNumber meta.PageSize = pagination.PageSize diff --git a/internal/use-case/main-use-case/infra/case.go b/internal/use-case/main-use-case/infra/case.go index 52e594a5..7c227e8b 100644 --- a/internal/use-case/main-use-case/infra/case.go +++ b/internal/use-case/main-use-case/infra/case.go @@ -112,9 +112,6 @@ func ReadList(input e.ReadListDto) (*d.Data, error) { return err } - if len(input.Includes) > 0 { - input.Preloads = pu.GetPreloads(input.Includes) - } if dataList, metaList, err = ReadListData(input, &event, tx); err != nil { return err } diff --git a/internal/use-case/main-use-case/infra/lib.go b/internal/use-case/main-use-case/infra/lib.go index 1b51a98a..234104bb 100644 --- a/internal/use-case/main-use-case/infra/lib.go +++ b/internal/use-case/main-use-case/infra/lib.go @@ -47,12 +47,6 @@ func ReadListData(input e.ReadListDto, event *pl.Event, dbx ...*gorm.DB) ([]e.In tx = dg.I } - if len(input.Preloads) > 0 { - for _, preload := range input.Preloads { - tx = tx.Preload(preload) - } - } - if input.OnlyHaveChildren { tx = tx.Where(` EXISTS ( @@ -65,6 +59,7 @@ func ReadListData(input e.ReadListDto, event *pl.Event, dbx ...*gorm.DB) ([]e.In tx = tx. Model(&e.Infra{}). + Scopes(gh.Preload(input.Includes)). Scopes(gh.Filter(input.FilterDto)). Count(&count). Scopes(gh.Paginate(input, &pagination)). @@ -74,15 +69,9 @@ func ReadListData(input e.ReadListDto, event *pl.Event, dbx ...*gorm.DB) ([]e.In if err == gorm.ErrRecordNotFound { return nil, &meta, nil } - event.Status = "failed" - event.ErrInfo = pl.ErrorInfo{ - Code: "data-get-fail", - Detail: "Database get failed", - Raw: err, - } - return nil, nil, pl.SetLogError(event, input) - + return nil, nil, plh.HandleListError(input, event, err) } + meta.Count = int(count) meta.PageNumber = pagination.PageNumber meta.PageSize = pagination.PageSize diff --git a/internal/use-case/main-use-case/inpatient/case.go b/internal/use-case/main-use-case/inpatient/case.go index 3548a908..05982b0d 100644 --- a/internal/use-case/main-use-case/inpatient/case.go +++ b/internal/use-case/main-use-case/inpatient/case.go @@ -87,9 +87,6 @@ func ReadList(input e.ReadListDto) (*d.Data, error) { return err } - if len(input.Includes) > 0 { - input.Preloads = pu.GetPreloads(input.Includes) - } if dataList, metaList, err = ReadListData(input, &event, tx); err != nil { return err } diff --git a/internal/use-case/main-use-case/inpatient/lib.go b/internal/use-case/main-use-case/inpatient/lib.go index f70b2add..157fe511 100644 --- a/internal/use-case/main-use-case/inpatient/lib.go +++ b/internal/use-case/main-use-case/inpatient/lib.go @@ -47,14 +47,9 @@ func ReadListData(input e.ReadListDto, event *pl.Event, dbx ...*gorm.DB) ([]e.In tx = dg.I } - if len(input.Preloads) > 0 { - for _, preload := range input.Preloads { - tx = tx.Preload(preload) - } - } - tx = tx. Model(&e.Inpatient{}). + Scopes(gh.Preload(input.Includes)). Scopes(gh.Filter(input.FilterDto)). Count(&count). Scopes(gh.Paginate(input, &pagination)). @@ -64,15 +59,9 @@ func ReadListData(input e.ReadListDto, event *pl.Event, dbx ...*gorm.DB) ([]e.In if err == gorm.ErrRecordNotFound { return nil, &meta, nil } - event.Status = "failed" - event.ErrInfo = pl.ErrorInfo{ - Code: "data-get-fail", - Detail: "Database get failed", - Raw: err, - } - return nil, nil, pl.SetLogError(event, input) - + return nil, nil, plh.HandleListError(input, event, err) } + meta.Count = int(count) meta.PageNumber = pagination.PageNumber meta.PageSize = pagination.PageSize diff --git a/internal/use-case/main-use-case/installation/case.go b/internal/use-case/main-use-case/installation/case.go index 234681e8..5e1339da 100644 --- a/internal/use-case/main-use-case/installation/case.go +++ b/internal/use-case/main-use-case/installation/case.go @@ -87,9 +87,6 @@ func ReadList(input e.ReadListDto) (*d.Data, error) { return err } - if len(input.Includes) > 0 { - input.Preloads = pu.GetPreloads(input.Includes) - } if dataList, metaList, err = ReadListData(input, &event, tx); err != nil { return err } diff --git a/internal/use-case/main-use-case/installation/lib.go b/internal/use-case/main-use-case/installation/lib.go index 6ef39b29..fd0158ee 100644 --- a/internal/use-case/main-use-case/installation/lib.go +++ b/internal/use-case/main-use-case/installation/lib.go @@ -47,14 +47,9 @@ func ReadListData(input e.ReadListDto, event *pl.Event, dbx ...*gorm.DB) ([]e.In tx = dg.I } - if len(input.Preloads) > 0 { - for _, preload := range input.Preloads { - tx = tx.Preload(preload) - } - } - tx = tx. Model(&e.Installation{}). + Scopes(gh.Preload(input.Includes)). Scopes(gh.Filter(input.FilterDto)). Count(&count). Scopes(gh.Paginate(input, &pagination)). @@ -64,15 +59,9 @@ func ReadListData(input e.ReadListDto, event *pl.Event, dbx ...*gorm.DB) ([]e.In if err == gorm.ErrRecordNotFound { return nil, &meta, nil } - event.Status = "failed" - event.ErrInfo = pl.ErrorInfo{ - Code: "data-get-fail", - Detail: "Database get failed", - Raw: err, - } - return nil, nil, pl.SetLogError(event, input) - + return nil, nil, plh.HandleListError(input, event, err) } + meta.Count = int(count) meta.PageNumber = pagination.PageNumber meta.PageSize = pagination.PageSize diff --git a/internal/use-case/main-use-case/insurance-company/case.go b/internal/use-case/main-use-case/insurance-company/case.go index 3d55fa1f..29aed939 100644 --- a/internal/use-case/main-use-case/insurance-company/case.go +++ b/internal/use-case/main-use-case/insurance-company/case.go @@ -87,9 +87,6 @@ func ReadList(input e.ReadListDto) (*d.Data, error) { return err } - if len(input.Includes) > 0 { - input.Preloads = pu.GetPreloads(input.Includes) - } if dataList, metaList, err = ReadListData(input, &event, tx); err != nil { return err } diff --git a/internal/use-case/main-use-case/insurance-company/lib.go b/internal/use-case/main-use-case/insurance-company/lib.go index abcca36f..262a99d9 100644 --- a/internal/use-case/main-use-case/insurance-company/lib.go +++ b/internal/use-case/main-use-case/insurance-company/lib.go @@ -47,14 +47,9 @@ func ReadListData(input e.ReadListDto, event *pl.Event, dbx ...*gorm.DB) ([]e.In tx = dg.I } - if len(input.Preloads) > 0 { - for _, preload := range input.Preloads { - tx = tx.Preload(preload) - } - } - tx = tx. Model(&e.InsuranceCompany{}). + Scopes(gh.Preload(input.Includes)). Scopes(gh.Filter(input.FilterDto)). Count(&count). Scopes(gh.Paginate(input, &pagination)). @@ -64,15 +59,9 @@ func ReadListData(input e.ReadListDto, event *pl.Event, dbx ...*gorm.DB) ([]e.In if err == gorm.ErrRecordNotFound { return nil, &meta, nil } - event.Status = "failed" - event.ErrInfo = pl.ErrorInfo{ - Code: "data-get-fail", - Detail: "Database get failed", - Raw: err, - } - return nil, nil, pl.SetLogError(event, input) - + return nil, nil, plh.HandleListError(input, event, err) } + meta.Count = int(count) meta.PageNumber = pagination.PageNumber meta.PageSize = pagination.PageSize diff --git a/internal/use-case/main-use-case/item-price/case.go b/internal/use-case/main-use-case/item-price/case.go index 9c916875..e6be1800 100644 --- a/internal/use-case/main-use-case/item-price/case.go +++ b/internal/use-case/main-use-case/item-price/case.go @@ -87,9 +87,6 @@ func ReadList(input e.ReadListDto) (*d.Data, error) { return err } - if len(input.Includes) > 0 { - input.Preloads = pu.GetPreloads(input.Includes) - } if dataList, metaList, err = ReadListData(input, &event, tx); err != nil { return err } diff --git a/internal/use-case/main-use-case/item-price/lib.go b/internal/use-case/main-use-case/item-price/lib.go index 32b387ea..91744132 100644 --- a/internal/use-case/main-use-case/item-price/lib.go +++ b/internal/use-case/main-use-case/item-price/lib.go @@ -47,14 +47,9 @@ func ReadListData(input e.ReadListDto, event *pl.Event, dbx ...*gorm.DB) ([]e.It tx = dg.I } - if len(input.Preloads) > 0 { - for _, preload := range input.Preloads { - tx = tx.Preload(preload) - } - } - tx = tx. Model(&e.ItemPrice{}). + Scopes(gh.Preload(input.Includes)). Scopes(gh.Filter(input.FilterDto)). Count(&count). Scopes(gh.Paginate(input, &pagination)). @@ -64,15 +59,9 @@ func ReadListData(input e.ReadListDto, event *pl.Event, dbx ...*gorm.DB) ([]e.It if err == gorm.ErrRecordNotFound { return nil, &meta, nil } - event.Status = "failed" - event.ErrInfo = pl.ErrorInfo{ - Code: "data-get-fail", - Detail: "Database get failed", - Raw: err, - } - return nil, nil, pl.SetLogError(event, input) - + return nil, nil, plh.HandleListError(input, event, err) } + meta.Count = int(count) meta.PageNumber = pagination.PageNumber meta.PageSize = pagination.PageSize diff --git a/internal/use-case/main-use-case/item/case.go b/internal/use-case/main-use-case/item/case.go index be9f6b16..914d777f 100644 --- a/internal/use-case/main-use-case/item/case.go +++ b/internal/use-case/main-use-case/item/case.go @@ -87,9 +87,6 @@ func ReadList(input e.ReadListDto) (*d.Data, error) { return err } - if len(input.Includes) > 0 { - input.Preloads = pu.GetPreloads(input.Includes) - } if dataList, metaList, err = ReadListData(input, &event, tx); err != nil { return err } diff --git a/internal/use-case/main-use-case/item/lib.go b/internal/use-case/main-use-case/item/lib.go index 0f01e82b..56c4c915 100644 --- a/internal/use-case/main-use-case/item/lib.go +++ b/internal/use-case/main-use-case/item/lib.go @@ -47,14 +47,9 @@ func ReadListData(input e.ReadListDto, event *pl.Event, dbx ...*gorm.DB) ([]e.It tx = dg.I } - if len(input.Preloads) > 0 { - for _, preload := range input.Preloads { - tx = tx.Preload(preload) - } - } - tx = tx. Model(&e.Item{}). + Scopes(gh.Preload(input.Includes)). Scopes(gh.Filter(input.FilterDto)). Count(&count). Scopes(gh.Paginate(input, &pagination)). @@ -64,15 +59,9 @@ func ReadListData(input e.ReadListDto, event *pl.Event, dbx ...*gorm.DB) ([]e.It if err == gorm.ErrRecordNotFound { return nil, &meta, nil } - event.Status = "failed" - event.ErrInfo = pl.ErrorInfo{ - Code: "data-get-fail", - Detail: "Database get failed", - Raw: err, - } - return nil, nil, pl.SetLogError(event, input) - + return nil, nil, plh.HandleListError(input, event, err) } + meta.Count = int(count) meta.PageNumber = pagination.PageNumber meta.PageSize = pagination.PageSize diff --git a/internal/use-case/main-use-case/laborant/case.go b/internal/use-case/main-use-case/laborant/case.go index 79a9ba32..f8696b9a 100644 --- a/internal/use-case/main-use-case/laborant/case.go +++ b/internal/use-case/main-use-case/laborant/case.go @@ -87,9 +87,6 @@ func ReadList(input e.ReadListDto) (*d.Data, error) { return err } - if len(input.Includes) > 0 { - input.Preloads = pu.GetPreloads(input.Includes) - } if dataList, metaList, err = ReadListData(input, &event, tx); err != nil { return err } diff --git a/internal/use-case/main-use-case/laborant/lib.go b/internal/use-case/main-use-case/laborant/lib.go index a02889bb..efe8bb37 100644 --- a/internal/use-case/main-use-case/laborant/lib.go +++ b/internal/use-case/main-use-case/laborant/lib.go @@ -47,14 +47,9 @@ func ReadListData(input e.ReadListDto, event *pl.Event, dbx ...*gorm.DB) ([]e.La tx = dg.I } - if len(input.Preloads) > 0 { - for _, preload := range input.Preloads { - tx = tx.Preload(preload) - } - } - tx = tx. Model(&e.Laborant{}). + Scopes(gh.Preload(input.Includes)). Scopes(gh.Filter(input.FilterDto)). Count(&count). Scopes(gh.Paginate(input, &pagination)). @@ -64,15 +59,9 @@ func ReadListData(input e.ReadListDto, event *pl.Event, dbx ...*gorm.DB) ([]e.La if err == gorm.ErrRecordNotFound { return nil, &meta, nil } - event.Status = "failed" - event.ErrInfo = pl.ErrorInfo{ - Code: "data-get-fail", - Detail: "Database get failed", - Raw: err, - } - return nil, nil, pl.SetLogError(event, input) - + return nil, nil, plh.HandleListError(input, event, err) } + meta.Count = int(count) meta.PageNumber = pagination.PageNumber meta.PageSize = pagination.PageSize diff --git a/internal/use-case/main-use-case/language/case.go b/internal/use-case/main-use-case/language/case.go index 24061c86..885bcfeb 100644 --- a/internal/use-case/main-use-case/language/case.go +++ b/internal/use-case/main-use-case/language/case.go @@ -87,9 +87,6 @@ func ReadList(input e.ReadListDto) (*d.Data, error) { return err } - if len(input.Includes) > 0 { - input.Preloads = pu.GetPreloads(input.Includes) - } if dataList, metaList, err = ReadListData(input, &event, tx); err != nil { return err } diff --git a/internal/use-case/main-use-case/language/lib.go b/internal/use-case/main-use-case/language/lib.go index f8277d06..11992794 100644 --- a/internal/use-case/main-use-case/language/lib.go +++ b/internal/use-case/main-use-case/language/lib.go @@ -49,6 +49,7 @@ func ReadListData(input e.ReadListDto, event *pl.Event, dbx ...*gorm.DB) ([]e.La tx = tx. Model(&e.Language{}). + Scopes(gh.Preload(input.Includes)). Scopes(gh.Filter(input.FilterDto)). Count(&count). Scopes(gh.Paginate(input, &pagination)). @@ -58,15 +59,9 @@ func ReadListData(input e.ReadListDto, event *pl.Event, dbx ...*gorm.DB) ([]e.La if err == gorm.ErrRecordNotFound { return nil, &meta, nil } - event.Status = "failed" - event.ErrInfo = pl.ErrorInfo{ - Code: "data-get-fail", - Detail: "Database get failed", - Raw: err, - } - return nil, nil, pl.SetLogError(event, input) - + return nil, nil, plh.HandleListError(input, event, err) } + meta.Count = int(count) meta.PageNumber = pagination.PageNumber meta.PageSize = pagination.PageSize diff --git a/internal/use-case/main-use-case/material-order-item/case.go b/internal/use-case/main-use-case/material-order-item/case.go index b1a6f61d..d1e3ffe8 100644 --- a/internal/use-case/main-use-case/material-order-item/case.go +++ b/internal/use-case/main-use-case/material-order-item/case.go @@ -96,9 +96,6 @@ func ReadList(input e.ReadListDto) (*d.Data, error) { return err } - if len(input.Includes) > 0 { - input.Preloads = pu.GetPreloads(input.Includes) - } if dataList, metaList, err = ReadListData(input, &event, tx); err != nil { return err } diff --git a/internal/use-case/main-use-case/material-order-item/lib.go b/internal/use-case/main-use-case/material-order-item/lib.go index 121d2360..f6533ecb 100644 --- a/internal/use-case/main-use-case/material-order-item/lib.go +++ b/internal/use-case/main-use-case/material-order-item/lib.go @@ -47,14 +47,9 @@ func ReadListData(input e.ReadListDto, event *pl.Event, dbx ...*gorm.DB) ([]e.Ma tx = dg.I } - if len(input.Preloads) > 0 { - for _, preload := range input.Preloads { - tx = tx.Preload(preload) - } - } - tx = tx. Model(&e.MaterialOrderItem{}). + Scopes(gh.Preload(input.Includes)). Scopes(gh.Filter(input.FilterDto)). Count(&count). Scopes(gh.Paginate(input, &pagination)). @@ -64,15 +59,9 @@ func ReadListData(input e.ReadListDto, event *pl.Event, dbx ...*gorm.DB) ([]e.Ma if err == gorm.ErrRecordNotFound { return nil, &meta, nil } - event.Status = "failed" - event.ErrInfo = pl.ErrorInfo{ - Code: "data-get-fail", - Detail: "Database get failed", - Raw: err, - } - return nil, nil, pl.SetLogError(event, input) - + return nil, nil, plh.HandleListError(input, event, err) } + meta.Count = int(count) meta.PageNumber = pagination.PageNumber meta.PageSize = pagination.PageSize diff --git a/internal/use-case/main-use-case/material-order/case.go b/internal/use-case/main-use-case/material-order/case.go index 558c55f6..713f64c0 100644 --- a/internal/use-case/main-use-case/material-order/case.go +++ b/internal/use-case/main-use-case/material-order/case.go @@ -115,9 +115,6 @@ func ReadList(input e.ReadListDto) (*d.Data, error) { return err } - if len(input.Includes) > 0 { - input.Preloads = pu.GetPreloads(input.Includes) - } if dataList, metaList, err = ReadListData(input, &event, tx); err != nil { return err } diff --git a/internal/use-case/main-use-case/material-order/lib.go b/internal/use-case/main-use-case/material-order/lib.go index 333628c2..c38e9fa6 100644 --- a/internal/use-case/main-use-case/material-order/lib.go +++ b/internal/use-case/main-use-case/material-order/lib.go @@ -47,14 +47,9 @@ func ReadListData(input e.ReadListDto, event *pl.Event, dbx ...*gorm.DB) ([]e.Ma tx = dg.I } - if len(input.Preloads) > 0 { - for _, preload := range input.Preloads { - tx = tx.Preload(preload) - } - } - tx = tx. Model(&e.MaterialOrder{}). + Scopes(gh.Preload(input.Includes)). Scopes(gh.Filter(input.FilterDto)). Count(&count). Scopes(gh.Paginate(input, &pagination)). @@ -64,15 +59,9 @@ func ReadListData(input e.ReadListDto, event *pl.Event, dbx ...*gorm.DB) ([]e.Ma if err == gorm.ErrRecordNotFound { return nil, &meta, nil } - event.Status = "failed" - event.ErrInfo = pl.ErrorInfo{ - Code: "data-get-fail", - Detail: "Database get failed", - Raw: err, - } - return nil, nil, pl.SetLogError(event, input) - + return nil, nil, plh.HandleListError(input, event, err) } + meta.Count = int(count) meta.PageNumber = pagination.PageNumber meta.PageSize = pagination.PageSize diff --git a/internal/use-case/main-use-case/material/case.go b/internal/use-case/main-use-case/material/case.go index 3462971c..42346dc6 100644 --- a/internal/use-case/main-use-case/material/case.go +++ b/internal/use-case/main-use-case/material/case.go @@ -90,9 +90,6 @@ func ReadList(input e.ReadListDto) (*d.Data, error) { return err } - if len(input.Includes) > 0 { - input.Preloads = pu.GetPreloads(input.Includes) - } if dataList, metaList, err = ReadListData(input, &event, tx); err != nil { return err } diff --git a/internal/use-case/main-use-case/material/lib.go b/internal/use-case/main-use-case/material/lib.go index da43d109..3f9adc9a 100644 --- a/internal/use-case/main-use-case/material/lib.go +++ b/internal/use-case/main-use-case/material/lib.go @@ -47,14 +47,9 @@ func ReadListData(input e.ReadListDto, event *pl.Event, dbx ...*gorm.DB) ([]e.Ma tx = dg.I } - if len(input.Preloads) > 0 { - for _, preload := range input.Preloads { - tx = tx.Preload(preload) - } - } - tx = tx. Model(&e.Material{}). + Scopes(gh.Preload(input.Includes)). Scopes(gh.Filter(input.FilterDto)). Count(&count). Scopes(gh.Paginate(input, &pagination)). @@ -64,15 +59,9 @@ func ReadListData(input e.ReadListDto, event *pl.Event, dbx ...*gorm.DB) ([]e.Ma if err == gorm.ErrRecordNotFound { return nil, &meta, nil } - event.Status = "failed" - event.ErrInfo = pl.ErrorInfo{ - Code: "data-get-fail", - Detail: "Database get failed", - Raw: err, - } - return nil, nil, pl.SetLogError(event, input) - + return nil, nil, plh.HandleListError(input, event, err) } + meta.Count = int(count) meta.PageNumber = pagination.PageNumber meta.PageSize = pagination.PageSize diff --git a/internal/use-case/main-use-case/mcu-order-item/case.go b/internal/use-case/main-use-case/mcu-order-item/case.go index a2149006..9037b771 100644 --- a/internal/use-case/main-use-case/mcu-order-item/case.go +++ b/internal/use-case/main-use-case/mcu-order-item/case.go @@ -98,9 +98,6 @@ func ReadList(input e.ReadListDto) (*d.Data, error) { return err } - if len(input.Includes) > 0 { - input.Preloads = pu.GetPreloads(input.Includes) - } if dataList, metaList, err = ReadListData(input, &event, tx); err != nil { return err } diff --git a/internal/use-case/main-use-case/mcu-order-item/lib.go b/internal/use-case/main-use-case/mcu-order-item/lib.go index 3fab2d62..e53f1c2f 100644 --- a/internal/use-case/main-use-case/mcu-order-item/lib.go +++ b/internal/use-case/main-use-case/mcu-order-item/lib.go @@ -47,14 +47,9 @@ func ReadListData(input e.ReadListDto, event *pl.Event, dbx ...*gorm.DB) ([]e.Mc tx = dg.I } - if len(input.Preloads) > 0 { - for _, preload := range input.Preloads { - tx = tx.Preload(preload) - } - } - tx = tx. Model(&e.McuOrderItem{}). + Scopes(gh.Preload(input.Includes)). Scopes(gh.Filter(input.FilterDto)). Count(&count). Scopes(gh.Paginate(input, &pagination)). @@ -64,15 +59,9 @@ func ReadListData(input e.ReadListDto, event *pl.Event, dbx ...*gorm.DB) ([]e.Mc if err == gorm.ErrRecordNotFound { return nil, &meta, nil } - event.Status = "failed" - event.ErrInfo = pl.ErrorInfo{ - Code: "data-get-fail", - Detail: "Database get failed", - Raw: err, - } - return nil, nil, pl.SetLogError(event, input) - + return nil, nil, plh.HandleListError(input, event, err) } + meta.Count = int(count) meta.PageNumber = pagination.PageNumber meta.PageSize = pagination.PageSize diff --git a/internal/use-case/main-use-case/mcu-order-sub-item/case.go b/internal/use-case/main-use-case/mcu-order-sub-item/case.go index d7fd5af5..b2676390 100644 --- a/internal/use-case/main-use-case/mcu-order-sub-item/case.go +++ b/internal/use-case/main-use-case/mcu-order-sub-item/case.go @@ -98,9 +98,6 @@ func ReadList(input e.ReadListDto) (*d.Data, error) { return err } - if len(input.Includes) > 0 { - input.Preloads = pu.GetPreloads(input.Includes) - } if dataList, metaList, err = ReadListData(input, &event, tx); err != nil { return err } diff --git a/internal/use-case/main-use-case/mcu-order-sub-item/lib.go b/internal/use-case/main-use-case/mcu-order-sub-item/lib.go index 45b45645..d7073573 100644 --- a/internal/use-case/main-use-case/mcu-order-sub-item/lib.go +++ b/internal/use-case/main-use-case/mcu-order-sub-item/lib.go @@ -47,14 +47,9 @@ func ReadListData(input e.ReadListDto, event *pl.Event, dbx ...*gorm.DB) ([]e.Mc tx = dg.I } - if len(input.Preloads) > 0 { - for _, preload := range input.Preloads { - tx = tx.Preload(preload) - } - } - tx = tx. Model(&e.McuOrderSubItem{}). + Scopes(gh.Preload(input.Includes)). Scopes(gh.Filter(input.FilterDto)). Count(&count). Scopes(gh.Paginate(input, &pagination)). @@ -64,15 +59,9 @@ func ReadListData(input e.ReadListDto, event *pl.Event, dbx ...*gorm.DB) ([]e.Mc if err == gorm.ErrRecordNotFound { return nil, &meta, nil } - event.Status = "failed" - event.ErrInfo = pl.ErrorInfo{ - Code: "data-get-fail", - Detail: "Database get failed", - Raw: err, - } - return nil, nil, pl.SetLogError(event, input) - + return nil, nil, plh.HandleListError(input, event, err) } + meta.Count = int(count) meta.PageNumber = pagination.PageNumber meta.PageSize = pagination.PageSize diff --git a/internal/use-case/main-use-case/mcu-order/case.go b/internal/use-case/main-use-case/mcu-order/case.go index 1d3d43dc..19b34cbe 100644 --- a/internal/use-case/main-use-case/mcu-order/case.go +++ b/internal/use-case/main-use-case/mcu-order/case.go @@ -115,9 +115,6 @@ func ReadList(input e.ReadListDto) (*d.Data, error) { return err } - if len(input.Includes) > 0 { - input.Preloads = pu.GetPreloads(input.Includes) - } if dataList, metaList, err = ReadListData(input, &event, tx); err != nil { return err } diff --git a/internal/use-case/main-use-case/mcu-order/lib.go b/internal/use-case/main-use-case/mcu-order/lib.go index b269e559..ccb63db9 100644 --- a/internal/use-case/main-use-case/mcu-order/lib.go +++ b/internal/use-case/main-use-case/mcu-order/lib.go @@ -47,14 +47,9 @@ func ReadListData(input e.ReadListDto, event *pl.Event, dbx ...*gorm.DB) ([]e.Mc tx = dg.I } - if len(input.Preloads) > 0 { - for _, preload := range input.Preloads { - tx = tx.Preload(preload) - } - } - tx = tx. Model(&e.McuOrder{}). + Scopes(gh.Preload(input.Includes)). Scopes(gh.Filter(input.FilterDto)). Count(&count). Scopes(gh.Paginate(input, &pagination)). @@ -64,15 +59,9 @@ func ReadListData(input e.ReadListDto, event *pl.Event, dbx ...*gorm.DB) ([]e.Mc if err == gorm.ErrRecordNotFound { return nil, &meta, nil } - event.Status = "failed" - event.ErrInfo = pl.ErrorInfo{ - Code: "data-get-fail", - Detail: "Database get failed", - Raw: err, - } - return nil, nil, pl.SetLogError(event, input) - + return nil, nil, plh.HandleListError(input, event, err) } + meta.Count = int(count) meta.PageNumber = pagination.PageNumber meta.PageSize = pagination.PageSize diff --git a/internal/use-case/main-use-case/mcu-src-category/case.go b/internal/use-case/main-use-case/mcu-src-category/case.go index c8e53edc..c105603c 100644 --- a/internal/use-case/main-use-case/mcu-src-category/case.go +++ b/internal/use-case/main-use-case/mcu-src-category/case.go @@ -87,9 +87,6 @@ func ReadList(input e.ReadListDto) (*d.Data, error) { return err } - if len(input.Includes) > 0 { - input.Preloads = pu.GetPreloads(input.Includes) - } if dataList, metaList, err = ReadListData(input, &event, tx); err != nil { return err } diff --git a/internal/use-case/main-use-case/mcu-src-category/lib.go b/internal/use-case/main-use-case/mcu-src-category/lib.go index 70321ff4..0cd44cfd 100644 --- a/internal/use-case/main-use-case/mcu-src-category/lib.go +++ b/internal/use-case/main-use-case/mcu-src-category/lib.go @@ -47,14 +47,9 @@ func ReadListData(input e.ReadListDto, event *pl.Event, dbx ...*gorm.DB) ([]e.Mc tx = dg.I } - if len(input.Preloads) > 0 { - for _, preload := range input.Preloads { - tx = tx.Preload(preload) - } - } - tx = tx. Model(&e.McuSrcCategory{}). + Scopes(gh.Preload(input.Includes)). Scopes(gh.Filter(input.FilterDto)). Count(&count). Scopes(gh.Paginate(input, &pagination)). @@ -64,15 +59,9 @@ func ReadListData(input e.ReadListDto, event *pl.Event, dbx ...*gorm.DB) ([]e.Mc if err == gorm.ErrRecordNotFound { return nil, &meta, nil } - event.Status = "failed" - event.ErrInfo = pl.ErrorInfo{ - Code: "data-get-fail", - Detail: "Database get failed", - Raw: err, - } - return nil, nil, pl.SetLogError(event, input) - + return nil, nil, plh.HandleListError(input, event, err) } + meta.Count = int(count) meta.PageNumber = pagination.PageNumber meta.PageSize = pagination.PageSize diff --git a/internal/use-case/main-use-case/mcu-src/case.go b/internal/use-case/main-use-case/mcu-src/case.go index 9509b219..564a582b 100644 --- a/internal/use-case/main-use-case/mcu-src/case.go +++ b/internal/use-case/main-use-case/mcu-src/case.go @@ -91,9 +91,6 @@ func ReadList(input e.ReadListDto) (*d.Data, error) { return err } - if len(input.Includes) > 0 { - input.Preloads = pu.GetPreloads(input.Includes) - } if dataList, metaList, err = ReadListData(input, &event, tx); err != nil { return err } diff --git a/internal/use-case/main-use-case/mcu-src/lib.go b/internal/use-case/main-use-case/mcu-src/lib.go index dd95f7d3..e74d5ce8 100644 --- a/internal/use-case/main-use-case/mcu-src/lib.go +++ b/internal/use-case/main-use-case/mcu-src/lib.go @@ -47,14 +47,9 @@ func ReadListData(input e.ReadListDto, event *pl.Event, dbx ...*gorm.DB) ([]e.Mc tx = dg.I } - if len(input.Preloads) > 0 { - for _, preload := range input.Preloads { - tx = tx.Preload(preload) - } - } - tx = tx. Model(&e.McuSrc{}). + Scopes(gh.Preload(input.Includes)). Scopes(gh.Filter(input.FilterDto)). Count(&count). Scopes(gh.Paginate(input, &pagination)). @@ -64,15 +59,9 @@ func ReadListData(input e.ReadListDto, event *pl.Event, dbx ...*gorm.DB) ([]e.Mc if err == gorm.ErrRecordNotFound { return nil, &meta, nil } - event.Status = "failed" - event.ErrInfo = pl.ErrorInfo{ - Code: "data-get-fail", - Detail: "Database get failed", - Raw: err, - } - return nil, nil, pl.SetLogError(event, input) - + return nil, nil, plh.HandleListError(input, event, err) } + meta.Count = int(count) meta.PageNumber = pagination.PageNumber meta.PageSize = pagination.PageSize diff --git a/internal/use-case/main-use-case/mcu-sub-src/case.go b/internal/use-case/main-use-case/mcu-sub-src/case.go index 1463facd..ba533bc4 100644 --- a/internal/use-case/main-use-case/mcu-sub-src/case.go +++ b/internal/use-case/main-use-case/mcu-sub-src/case.go @@ -91,9 +91,6 @@ func ReadList(input e.ReadListDto) (*d.Data, error) { return err } - if len(input.Includes) > 0 { - input.Preloads = pu.GetPreloads(input.Includes) - } if dataList, metaList, err = ReadListData(input, &event, tx); err != nil { return err } diff --git a/internal/use-case/main-use-case/mcu-sub-src/lib.go b/internal/use-case/main-use-case/mcu-sub-src/lib.go index a39649ba..96684fef 100644 --- a/internal/use-case/main-use-case/mcu-sub-src/lib.go +++ b/internal/use-case/main-use-case/mcu-sub-src/lib.go @@ -47,14 +47,9 @@ func ReadListData(input e.ReadListDto, event *pl.Event, dbx ...*gorm.DB) ([]e.Mc tx = dg.I } - if len(input.Preloads) > 0 { - for _, preload := range input.Preloads { - tx = tx.Preload(preload) - } - } - tx = tx. Model(&e.McuSubSrc{}). + Scopes(gh.Preload(input.Includes)). Scopes(gh.Filter(input.FilterDto)). Count(&count). Scopes(gh.Paginate(input, &pagination)). @@ -64,15 +59,9 @@ func ReadListData(input e.ReadListDto, event *pl.Event, dbx ...*gorm.DB) ([]e.Mc if err == gorm.ErrRecordNotFound { return nil, &meta, nil } - event.Status = "failed" - event.ErrInfo = pl.ErrorInfo{ - Code: "data-get-fail", - Detail: "Database get failed", - Raw: err, - } - return nil, nil, pl.SetLogError(event, input) - + return nil, nil, plh.HandleListError(input, event, err) } + meta.Count = int(count) meta.PageNumber = pagination.PageNumber meta.PageSize = pagination.PageSize diff --git a/internal/use-case/main-use-case/medical-action-src-item/case.go b/internal/use-case/main-use-case/medical-action-src-item/case.go index 74af5873..7a1eefb7 100644 --- a/internal/use-case/main-use-case/medical-action-src-item/case.go +++ b/internal/use-case/main-use-case/medical-action-src-item/case.go @@ -87,9 +87,6 @@ func ReadList(input e.ReadListDto) (*d.Data, error) { return err } - if len(input.Includes) > 0 { - input.Preloads = pu.GetPreloads(input.Includes) - } if dataList, metaList, err = ReadListData(input, &event, tx); err != nil { return err } diff --git a/internal/use-case/main-use-case/medical-action-src-item/lib.go b/internal/use-case/main-use-case/medical-action-src-item/lib.go index 20fc526d..723e615d 100644 --- a/internal/use-case/main-use-case/medical-action-src-item/lib.go +++ b/internal/use-case/main-use-case/medical-action-src-item/lib.go @@ -47,14 +47,9 @@ func ReadListData(input e.ReadListDto, event *pl.Event, dbx ...*gorm.DB) ([]e.Me tx = dg.I } - if len(input.Preloads) > 0 { - for _, preload := range input.Preloads { - tx = tx.Preload(preload) - } - } - tx = tx. Model(&e.MedicalActionSrcItem{}). + Scopes(gh.Preload(input.Includes)). Scopes(gh.Filter(input.FilterDto)). Count(&count). Scopes(gh.Paginate(input, &pagination)). @@ -64,15 +59,9 @@ func ReadListData(input e.ReadListDto, event *pl.Event, dbx ...*gorm.DB) ([]e.Me if err == gorm.ErrRecordNotFound { return nil, &meta, nil } - event.Status = "failed" - event.ErrInfo = pl.ErrorInfo{ - Code: "data-get-fail", - Detail: "Database get failed", - Raw: err, - } - return nil, nil, pl.SetLogError(event, input) - + return nil, nil, plh.HandleListError(input, event, err) } + meta.Count = int(count) meta.PageNumber = pagination.PageNumber meta.PageSize = pagination.PageSize diff --git a/internal/use-case/main-use-case/medical-action-src/case.go b/internal/use-case/main-use-case/medical-action-src/case.go index 059c15be..d3fb840b 100644 --- a/internal/use-case/main-use-case/medical-action-src/case.go +++ b/internal/use-case/main-use-case/medical-action-src/case.go @@ -87,9 +87,6 @@ func ReadList(input e.ReadListDto) (*d.Data, error) { return err } - if len(input.Includes) > 0 { - input.Preloads = pu.GetPreloads(input.Includes) - } if dataList, metaList, err = ReadListData(input, &event, tx); err != nil { return err } diff --git a/internal/use-case/main-use-case/medical-action-src/lib.go b/internal/use-case/main-use-case/medical-action-src/lib.go index 42637607..31492861 100644 --- a/internal/use-case/main-use-case/medical-action-src/lib.go +++ b/internal/use-case/main-use-case/medical-action-src/lib.go @@ -47,14 +47,9 @@ func ReadListData(input e.ReadListDto, event *pl.Event, dbx ...*gorm.DB) ([]e.Me tx = dg.I } - if len(input.Preloads) > 0 { - for _, preload := range input.Preloads { - tx = tx.Preload(preload) - } - } - tx = tx. Model(&e.MedicalActionSrc{}). + Scopes(gh.Preload(input.Includes)). Scopes(gh.Filter(input.FilterDto)). Count(&count). Scopes(gh.Paginate(input, &pagination)). @@ -64,15 +59,9 @@ func ReadListData(input e.ReadListDto, event *pl.Event, dbx ...*gorm.DB) ([]e.Me if err == gorm.ErrRecordNotFound { return nil, &meta, nil } - event.Status = "failed" - event.ErrInfo = pl.ErrorInfo{ - Code: "data-get-fail", - Detail: "Database get failed", - Raw: err, - } - return nil, nil, pl.SetLogError(event, input) - + return nil, nil, plh.HandleListError(input, event, err) } + meta.Count = int(count) meta.PageNumber = pagination.PageNumber meta.PageSize = pagination.PageSize diff --git a/internal/use-case/main-use-case/medication-item-dist/case.go b/internal/use-case/main-use-case/medication-item-dist/case.go index 550cc67c..ff54c775 100644 --- a/internal/use-case/main-use-case/medication-item-dist/case.go +++ b/internal/use-case/main-use-case/medication-item-dist/case.go @@ -91,9 +91,6 @@ func ReadList(input e.ReadListDto) (*d.Data, error) { return err } - if len(input.Includes) > 0 { - input.Preloads = pu.GetPreloads(input.Includes) - } if dataList, metaList, err = ReadListData(input, &event, tx); err != nil { return err } diff --git a/internal/use-case/main-use-case/medication-item-dist/lib.go b/internal/use-case/main-use-case/medication-item-dist/lib.go index dd732cd2..88638d2f 100644 --- a/internal/use-case/main-use-case/medication-item-dist/lib.go +++ b/internal/use-case/main-use-case/medication-item-dist/lib.go @@ -47,14 +47,9 @@ func ReadListData(input e.ReadListDto, event *pl.Event, dbx ...*gorm.DB) ([]e.Me tx = dg.I } - if len(input.Preloads) > 0 { - for _, preload := range input.Preloads { - tx = tx.Preload(preload) - } - } - tx = tx. Model(&e.MedicationItemDist{}). + Scopes(gh.Preload(input.Includes)). Scopes(gh.Filter(input.FilterDto)). Count(&count). Scopes(gh.Paginate(input, &pagination)). @@ -64,15 +59,9 @@ func ReadListData(input e.ReadListDto, event *pl.Event, dbx ...*gorm.DB) ([]e.Me if err == gorm.ErrRecordNotFound { return nil, &meta, nil } - event.Status = "failed" - event.ErrInfo = pl.ErrorInfo{ - Code: "data-get-fail", - Detail: "Database get failed", - Raw: err, - } - return nil, nil, pl.SetLogError(event, input) - + return nil, nil, plh.HandleListError(input, event, err) } + meta.Count = int(count) meta.PageNumber = pagination.PageNumber meta.PageSize = pagination.PageSize diff --git a/internal/use-case/main-use-case/medication-item/case.go b/internal/use-case/main-use-case/medication-item/case.go index 498df263..0e04b6b0 100644 --- a/internal/use-case/main-use-case/medication-item/case.go +++ b/internal/use-case/main-use-case/medication-item/case.go @@ -89,9 +89,6 @@ func ReadList(input e.ReadListDto) (*d.Data, error) { return err } - if len(input.Includes) > 0 { - input.Preloads = pu.GetPreloads(input.Includes) - } if dataList, metaList, err = ReadListData(input, &event, tx); err != nil { return err } diff --git a/internal/use-case/main-use-case/medication-item/lib.go b/internal/use-case/main-use-case/medication-item/lib.go index c54e9db5..f918878b 100644 --- a/internal/use-case/main-use-case/medication-item/lib.go +++ b/internal/use-case/main-use-case/medication-item/lib.go @@ -47,14 +47,9 @@ func ReadListData(input e.ReadListDto, event *pl.Event, dbx ...*gorm.DB) ([]e.Me tx = dg.I } - if len(input.Preloads) > 0 { - for _, preload := range input.Preloads { - tx = tx.Preload(preload) - } - } - tx = tx. Model(&e.MedicationItem{}). + Scopes(gh.Preload(input.Includes)). Scopes(gh.Filter(input.FilterDto)). Count(&count). Scopes(gh.Paginate(input, &pagination)). @@ -64,15 +59,9 @@ func ReadListData(input e.ReadListDto, event *pl.Event, dbx ...*gorm.DB) ([]e.Me if err == gorm.ErrRecordNotFound { return nil, &meta, nil } - event.Status = "failed" - event.ErrInfo = pl.ErrorInfo{ - Code: "data-get-fail", - Detail: "Database get failed", - Raw: err, - } - return nil, nil, pl.SetLogError(event, input) - + return nil, nil, plh.HandleListError(input, event, err) } + meta.Count = int(count) meta.PageNumber = pagination.PageNumber meta.PageSize = pagination.PageSize diff --git a/internal/use-case/main-use-case/medication/case.go b/internal/use-case/main-use-case/medication/case.go index 4662f4c3..652f2010 100644 --- a/internal/use-case/main-use-case/medication/case.go +++ b/internal/use-case/main-use-case/medication/case.go @@ -93,9 +93,6 @@ func ReadList(input e.ReadListDto) (*d.Data, error) { return err } - if len(input.Includes) > 0 { - input.Preloads = pu.GetPreloads(input.Includes) - } if dataList, metaList, err = ReadListData(input, &event, tx); err != nil { return err } diff --git a/internal/use-case/main-use-case/medication/lib.go b/internal/use-case/main-use-case/medication/lib.go index a420a677..b11e7f6a 100644 --- a/internal/use-case/main-use-case/medication/lib.go +++ b/internal/use-case/main-use-case/medication/lib.go @@ -47,14 +47,9 @@ func ReadListData(input e.ReadListDto, event *pl.Event, dbx ...*gorm.DB) ([]e.Me tx = dg.I } - if len(input.Preloads) > 0 { - for _, preload := range input.Preloads { - tx = tx.Preload(preload) - } - } - tx = tx. Model(&e.Medication{}). + Scopes(gh.Preload(input.Includes)). Scopes(gh.Filter(input.FilterDto)). Count(&count). Scopes(gh.Paginate(input, &pagination)). @@ -64,15 +59,9 @@ func ReadListData(input e.ReadListDto, event *pl.Event, dbx ...*gorm.DB) ([]e.Me if err == gorm.ErrRecordNotFound { return nil, &meta, nil } - event.Status = "failed" - event.ErrInfo = pl.ErrorInfo{ - Code: "data-get-fail", - Detail: "Database get failed", - Raw: err, - } - return nil, nil, pl.SetLogError(event, input) - + return nil, nil, plh.HandleListError(input, event, err) } + meta.Count = int(count) meta.PageNumber = pagination.PageNumber meta.PageSize = pagination.PageSize diff --git a/internal/use-case/main-use-case/medicine-group/case.go b/internal/use-case/main-use-case/medicine-group/case.go index f7d17e01..180c6e00 100644 --- a/internal/use-case/main-use-case/medicine-group/case.go +++ b/internal/use-case/main-use-case/medicine-group/case.go @@ -87,9 +87,6 @@ func ReadList(input e.ReadListDto) (*d.Data, error) { return err } - if len(input.Includes) > 0 { - input.Preloads = pu.GetPreloads(input.Includes) - } if dataList, metaList, err = ReadListData(input, &event, tx); err != nil { return err } diff --git a/internal/use-case/main-use-case/medicine-group/lib.go b/internal/use-case/main-use-case/medicine-group/lib.go index 56e9d58c..9c3214a9 100644 --- a/internal/use-case/main-use-case/medicine-group/lib.go +++ b/internal/use-case/main-use-case/medicine-group/lib.go @@ -47,14 +47,9 @@ func ReadListData(input e.ReadListDto, event *pl.Event, dbx ...*gorm.DB) ([]e.Me tx = dg.I } - if len(input.Preloads) > 0 { - for _, preload := range input.Preloads { - tx = tx.Preload(preload) - } - } - tx = tx. Model(&e.MedicineGroup{}). + Scopes(gh.Preload(input.Includes)). Scopes(gh.Filter(input.FilterDto)). Count(&count). Scopes(gh.Paginate(input, &pagination)). @@ -64,15 +59,9 @@ func ReadListData(input e.ReadListDto, event *pl.Event, dbx ...*gorm.DB) ([]e.Me if err == gorm.ErrRecordNotFound { return nil, &meta, nil } - event.Status = "failed" - event.ErrInfo = pl.ErrorInfo{ - Code: "data-get-fail", - Detail: "Database get failed", - Raw: err, - } - return nil, nil, pl.SetLogError(event, input) - + return nil, nil, plh.HandleListError(input, event, err) } + meta.Count = int(count) meta.PageNumber = pagination.PageNumber meta.PageSize = pagination.PageSize diff --git a/internal/use-case/main-use-case/medicine-method/case.go b/internal/use-case/main-use-case/medicine-method/case.go index a6ed76c7..012b77b0 100644 --- a/internal/use-case/main-use-case/medicine-method/case.go +++ b/internal/use-case/main-use-case/medicine-method/case.go @@ -87,9 +87,6 @@ func ReadList(input e.ReadListDto) (*d.Data, error) { return err } - if len(input.Includes) > 0 { - input.Preloads = pu.GetPreloads(input.Includes) - } if dataList, metaList, err = ReadListData(input, &event, tx); err != nil { return err } diff --git a/internal/use-case/main-use-case/medicine-method/lib.go b/internal/use-case/main-use-case/medicine-method/lib.go index 45d13da8..a9206cbe 100644 --- a/internal/use-case/main-use-case/medicine-method/lib.go +++ b/internal/use-case/main-use-case/medicine-method/lib.go @@ -47,14 +47,9 @@ func ReadListData(input e.ReadListDto, event *pl.Event, dbx ...*gorm.DB) ([]e.Me tx = dg.I } - if len(input.Preloads) > 0 { - for _, preload := range input.Preloads { - tx = tx.Preload(preload) - } - } - tx = tx. Model(&e.MedicineMethod{}). + Scopes(gh.Preload(input.Includes)). Scopes(gh.Filter(input.FilterDto)). Count(&count). Scopes(gh.Paginate(input, &pagination)). @@ -64,15 +59,9 @@ func ReadListData(input e.ReadListDto, event *pl.Event, dbx ...*gorm.DB) ([]e.Me if err == gorm.ErrRecordNotFound { return nil, &meta, nil } - event.Status = "failed" - event.ErrInfo = pl.ErrorInfo{ - Code: "data-get-fail", - Detail: "Database get failed", - Raw: err, - } - return nil, nil, pl.SetLogError(event, input) - + return nil, nil, plh.HandleListError(input, event, err) } + meta.Count = int(count) meta.PageNumber = pagination.PageNumber meta.PageSize = pagination.PageSize diff --git a/internal/use-case/main-use-case/medicine-mix-item/case.go b/internal/use-case/main-use-case/medicine-mix-item/case.go index 30932664..6dbb8331 100644 --- a/internal/use-case/main-use-case/medicine-mix-item/case.go +++ b/internal/use-case/main-use-case/medicine-mix-item/case.go @@ -87,9 +87,6 @@ func ReadList(input e.ReadListDto) (*d.Data, error) { return err } - if len(input.Includes) > 0 { - input.Preloads = pu.GetPreloads(input.Includes) - } if dataList, metaList, err = ReadListData(input, &event, tx); err != nil { return err } diff --git a/internal/use-case/main-use-case/medicine-mix-item/lib.go b/internal/use-case/main-use-case/medicine-mix-item/lib.go index 077b1346..8851cc5d 100644 --- a/internal/use-case/main-use-case/medicine-mix-item/lib.go +++ b/internal/use-case/main-use-case/medicine-mix-item/lib.go @@ -47,14 +47,9 @@ func ReadListData(input e.ReadListDto, event *pl.Event, dbx ...*gorm.DB) ([]e.Me tx = dg.I } - if len(input.Preloads) > 0 { - for _, preload := range input.Preloads { - tx = tx.Preload(preload) - } - } - tx = tx. Model(&e.MedicineMixItem{}). + Scopes(gh.Preload(input.Includes)). Scopes(gh.Filter(input.FilterDto)). Count(&count). Scopes(gh.Paginate(input, &pagination)). @@ -64,15 +59,9 @@ func ReadListData(input e.ReadListDto, event *pl.Event, dbx ...*gorm.DB) ([]e.Me if err == gorm.ErrRecordNotFound { return nil, &meta, nil } - event.Status = "failed" - event.ErrInfo = pl.ErrorInfo{ - Code: "data-get-fail", - Detail: "Database get failed", - Raw: err, - } - return nil, nil, pl.SetLogError(event, input) - + return nil, nil, plh.HandleListError(input, event, err) } + meta.Count = int(count) meta.PageNumber = pagination.PageNumber meta.PageSize = pagination.PageSize diff --git a/internal/use-case/main-use-case/medicine/case.go b/internal/use-case/main-use-case/medicine/case.go index 22e052ab..5855d33c 100644 --- a/internal/use-case/main-use-case/medicine/case.go +++ b/internal/use-case/main-use-case/medicine/case.go @@ -90,9 +90,6 @@ func ReadList(input e.ReadListDto) (*d.Data, error) { return err } - if len(input.Includes) > 0 { - input.Preloads = pu.GetPreloads(input.Includes) - } if dataList, metaList, err = ReadListData(input, &event, tx); err != nil { return err } diff --git a/internal/use-case/main-use-case/medicine/lib.go b/internal/use-case/main-use-case/medicine/lib.go index 452bfbd8..3b9d2fa1 100644 --- a/internal/use-case/main-use-case/medicine/lib.go +++ b/internal/use-case/main-use-case/medicine/lib.go @@ -47,14 +47,9 @@ func ReadListData(input e.ReadListDto, event *pl.Event, dbx ...*gorm.DB) ([]e.Me tx = dg.I } - if len(input.Preloads) > 0 { - for _, preload := range input.Preloads { - tx = tx.Preload(preload) - } - } - tx = tx. Model(&e.Medicine{}). + Scopes(gh.Preload(input.Includes)). Scopes(gh.Filter(input.FilterDto)). Count(&count). Scopes(gh.Paginate(input, &pagination)). @@ -64,15 +59,9 @@ func ReadListData(input e.ReadListDto, event *pl.Event, dbx ...*gorm.DB) ([]e.Me if err == gorm.ErrRecordNotFound { return nil, &meta, nil } - event.Status = "failed" - event.ErrInfo = pl.ErrorInfo{ - Code: "data-get-fail", - Detail: "Database get failed", - Raw: err, - } - return nil, nil, pl.SetLogError(event, input) - + return nil, nil, plh.HandleListError(input, event, err) } + meta.Count = int(count) meta.PageNumber = pagination.PageNumber meta.PageSize = pagination.PageSize diff --git a/internal/use-case/main-use-case/midwife/case.go b/internal/use-case/main-use-case/midwife/case.go index 908c0363..42047c6e 100644 --- a/internal/use-case/main-use-case/midwife/case.go +++ b/internal/use-case/main-use-case/midwife/case.go @@ -87,9 +87,6 @@ func ReadList(input e.ReadListDto) (*d.Data, error) { return err } - if len(input.Includes) > 0 { - input.Preloads = pu.GetPreloads(input.Includes) - } if dataList, metaList, err = ReadListData(input, &event, tx); err != nil { return err } diff --git a/internal/use-case/main-use-case/midwife/lib.go b/internal/use-case/main-use-case/midwife/lib.go index b7b366d7..5e247c34 100644 --- a/internal/use-case/main-use-case/midwife/lib.go +++ b/internal/use-case/main-use-case/midwife/lib.go @@ -47,14 +47,9 @@ func ReadListData(input e.ReadListDto, event *pl.Event, dbx ...*gorm.DB) ([]e.Mi tx = dg.I } - if len(input.Preloads) > 0 { - for _, preload := range input.Preloads { - tx = tx.Preload(preload) - } - } - tx = tx. Model(&e.Midwife{}). + Scopes(gh.Preload(input.Includes)). Scopes(gh.Filter(input.FilterDto)). Count(&count). Scopes(gh.Paginate(input, &pagination)). @@ -64,15 +59,9 @@ func ReadListData(input e.ReadListDto, event *pl.Event, dbx ...*gorm.DB) ([]e.Mi if err == gorm.ErrRecordNotFound { return nil, &meta, nil } - event.Status = "failed" - event.ErrInfo = pl.ErrorInfo{ - Code: "data-get-fail", - Detail: "Database get failed", - Raw: err, - } - return nil, nil, pl.SetLogError(event, input) - + return nil, nil, plh.HandleListError(input, event, err) } + meta.Count = int(count) meta.PageNumber = pagination.PageNumber meta.PageSize = pagination.PageSize diff --git a/internal/use-case/main-use-case/nurse/case.go b/internal/use-case/main-use-case/nurse/case.go index a683bfda..6201e15b 100644 --- a/internal/use-case/main-use-case/nurse/case.go +++ b/internal/use-case/main-use-case/nurse/case.go @@ -87,9 +87,6 @@ func ReadList(input e.ReadListDto) (*d.Data, error) { return err } - if len(input.Includes) > 0 { - input.Preloads = pu.GetPreloads(input.Includes) - } if dataList, metaList, err = ReadListData(input, &event, tx); err != nil { return err } diff --git a/internal/use-case/main-use-case/nurse/lib.go b/internal/use-case/main-use-case/nurse/lib.go index 3d4465d6..a59cc692 100644 --- a/internal/use-case/main-use-case/nurse/lib.go +++ b/internal/use-case/main-use-case/nurse/lib.go @@ -47,14 +47,9 @@ func ReadListData(input e.ReadListDto, event *pl.Event, dbx ...*gorm.DB) ([]e.Nu tx = dg.I } - if len(input.Preloads) > 0 { - for _, preload := range input.Preloads { - tx = tx.Preload(preload) - } - } - tx = tx. Model(&e.Nurse{}). + Scopes(gh.Preload(input.Includes)). Scopes(gh.Filter(input.FilterDto)). Count(&count). Scopes(gh.Paginate(input, &pagination)). @@ -64,15 +59,9 @@ func ReadListData(input e.ReadListDto, event *pl.Event, dbx ...*gorm.DB) ([]e.Nu if err == gorm.ErrRecordNotFound { return nil, &meta, nil } - event.Status = "failed" - event.ErrInfo = pl.ErrorInfo{ - Code: "data-get-fail", - Detail: "Database get failed", - Raw: err, - } - return nil, nil, pl.SetLogError(event, input) - + return nil, nil, plh.HandleListError(input, event, err) } + meta.Count = int(count) meta.PageNumber = pagination.PageNumber meta.PageSize = pagination.PageSize diff --git a/internal/use-case/main-use-case/nutritionist/case.go b/internal/use-case/main-use-case/nutritionist/case.go index cc5b2163..8be3a320 100644 --- a/internal/use-case/main-use-case/nutritionist/case.go +++ b/internal/use-case/main-use-case/nutritionist/case.go @@ -87,9 +87,6 @@ func ReadList(input e.ReadListDto) (*d.Data, error) { return err } - if len(input.Includes) > 0 { - input.Preloads = pu.GetPreloads(input.Includes) - } if dataList, metaList, err = ReadListData(input, &event, tx); err != nil { return err } diff --git a/internal/use-case/main-use-case/nutritionist/lib.go b/internal/use-case/main-use-case/nutritionist/lib.go index 89d96e94..1f7c72b3 100644 --- a/internal/use-case/main-use-case/nutritionist/lib.go +++ b/internal/use-case/main-use-case/nutritionist/lib.go @@ -47,14 +47,9 @@ func ReadListData(input e.ReadListDto, event *pl.Event, dbx ...*gorm.DB) ([]e.Nu tx = dg.I } - if len(input.Preloads) > 0 { - for _, preload := range input.Preloads { - tx = tx.Preload(preload) - } - } - tx = tx. Model(&e.Nutritionist{}). + Scopes(gh.Preload(input.Includes)). Scopes(gh.Filter(input.FilterDto)). Count(&count). Scopes(gh.Paginate(input, &pagination)). @@ -64,15 +59,9 @@ func ReadListData(input e.ReadListDto, event *pl.Event, dbx ...*gorm.DB) ([]e.Nu if err == gorm.ErrRecordNotFound { return nil, &meta, nil } - event.Status = "failed" - event.ErrInfo = pl.ErrorInfo{ - Code: "data-get-fail", - Detail: "Database get failed", - Raw: err, - } - return nil, nil, pl.SetLogError(event, input) - + return nil, nil, plh.HandleListError(input, event, err) } + meta.Count = int(count) meta.PageNumber = pagination.PageNumber meta.PageSize = pagination.PageSize diff --git a/internal/use-case/main-use-case/patient/case.go b/internal/use-case/main-use-case/patient/case.go index 590183e4..9736ee09 100644 --- a/internal/use-case/main-use-case/patient/case.go +++ b/internal/use-case/main-use-case/patient/case.go @@ -121,9 +121,6 @@ func ReadList(input e.ReadListDto) (*d.Data, error) { return err } - if len(input.Includes) > 0 { - input.Preloads = pu.GetPreloads(input.Includes) - } if dataList, metaList, err = ReadListData(input, &event, tx); err != nil { return err } diff --git a/internal/use-case/main-use-case/patient/lib.go b/internal/use-case/main-use-case/patient/lib.go index 4ead199c..e126ec0d 100644 --- a/internal/use-case/main-use-case/patient/lib.go +++ b/internal/use-case/main-use-case/patient/lib.go @@ -50,14 +50,9 @@ func ReadListData(input e.ReadListDto, event *pl.Event, dbx ...*gorm.DB) ([]e.Pa tx = dg.I } - if len(input.Preloads) > 0 { - for _, preload := range input.Preloads { - tx = tx.Preload(preload) - } - } - tx = tx. Model(&e.Patient{}). + Scopes(gh.Preload(input.Includes)). Scopes(gh.Filter(input.FilterDto)). Count(&count). Scopes(gh.Paginate(input, &pagination)). @@ -67,15 +62,9 @@ func ReadListData(input e.ReadListDto, event *pl.Event, dbx ...*gorm.DB) ([]e.Pa if err == gorm.ErrRecordNotFound { return nil, &meta, nil } - event.Status = "failed" - event.ErrInfo = pl.ErrorInfo{ - Code: "data-get-fail", - Detail: "Database get failed", - Raw: err, - } - return nil, nil, pl.SetLogError(event, input) - + return nil, nil, plh.HandleListError(input, event, err) } + meta.Count = int(count) meta.PageNumber = pagination.PageNumber meta.PageSize = pagination.PageSize diff --git a/internal/use-case/main-use-case/person/case.go b/internal/use-case/main-use-case/person/case.go index bb8ee7fb..1d9d94c8 100644 --- a/internal/use-case/main-use-case/person/case.go +++ b/internal/use-case/main-use-case/person/case.go @@ -87,9 +87,6 @@ func ReadList(input e.ReadListDto) (*d.Data, error) { return err } - if len(input.Includes) > 0 { - input.Preloads = pu.GetPreloads(input.Includes) - } if dataList, metaList, err = ReadListData(input, &event, tx); err != nil { return err } diff --git a/internal/use-case/main-use-case/person/lib.go b/internal/use-case/main-use-case/person/lib.go index f12c6fac..a49fdd00 100644 --- a/internal/use-case/main-use-case/person/lib.go +++ b/internal/use-case/main-use-case/person/lib.go @@ -51,14 +51,9 @@ func ReadListData(input e.ReadListDto, event *pl.Event, dbx ...*gorm.DB) ([]e.Pe tx = dg.I } - if len(input.Preloads) > 0 { - for _, preload := range input.Preloads { - tx = tx.Preload(preload) - } - } - tx = tx. Model(&e.Person{}). + Scopes(gh.Preload(input.Includes)). Scopes(gh.Filter(input.FilterDto)). Count(&count). Scopes(gh.Paginate(input, &pagination)). @@ -68,15 +63,9 @@ func ReadListData(input e.ReadListDto, event *pl.Event, dbx ...*gorm.DB) ([]e.Pe if err == gorm.ErrRecordNotFound { return nil, &meta, nil } - event.Status = "failed" - event.ErrInfo = pl.ErrorInfo{ - Code: "data-get-fail", - Detail: "Database get failed", - Raw: err, - } - return nil, nil, pl.SetLogError(event, input) - + return nil, nil, plh.HandleListError(input, event, err) } + meta.Count = int(count) meta.PageNumber = pagination.PageNumber meta.PageSize = pagination.PageSize diff --git a/internal/use-case/main-use-case/pharmacist/case.go b/internal/use-case/main-use-case/pharmacist/case.go index b8a9d063..132987be 100644 --- a/internal/use-case/main-use-case/pharmacist/case.go +++ b/internal/use-case/main-use-case/pharmacist/case.go @@ -87,9 +87,6 @@ func ReadList(input e.ReadListDto) (*d.Data, error) { return err } - if len(input.Includes) > 0 { - input.Preloads = pu.GetPreloads(input.Includes) - } if dataList, metaList, err = ReadListData(input, &event, tx); err != nil { return err } diff --git a/internal/use-case/main-use-case/pharmacist/lib.go b/internal/use-case/main-use-case/pharmacist/lib.go index 6e7358cb..365ba118 100644 --- a/internal/use-case/main-use-case/pharmacist/lib.go +++ b/internal/use-case/main-use-case/pharmacist/lib.go @@ -47,14 +47,9 @@ func ReadListData(input e.ReadListDto, event *pl.Event, dbx ...*gorm.DB) ([]e.Ph tx = dg.I } - if len(input.Preloads) > 0 { - for _, preload := range input.Preloads { - tx = tx.Preload(preload) - } - } - tx = tx. Model(&e.Pharmacist{}). + Scopes(gh.Preload(input.Includes)). Scopes(gh.Filter(input.FilterDto)). Count(&count). Scopes(gh.Paginate(input, &pagination)). @@ -64,15 +59,9 @@ func ReadListData(input e.ReadListDto, event *pl.Event, dbx ...*gorm.DB) ([]e.Ph if err == gorm.ErrRecordNotFound { return nil, &meta, nil } - event.Status = "failed" - event.ErrInfo = pl.ErrorInfo{ - Code: "data-get-fail", - Detail: "Database get failed", - Raw: err, - } - return nil, nil, pl.SetLogError(event, input) - + return nil, nil, plh.HandleListError(input, event, err) } + meta.Count = int(count) meta.PageNumber = pagination.PageNumber meta.PageSize = pagination.PageSize diff --git a/internal/use-case/main-use-case/pharmacy-company/case.go b/internal/use-case/main-use-case/pharmacy-company/case.go index 1ef9a7bf..cce54750 100644 --- a/internal/use-case/main-use-case/pharmacy-company/case.go +++ b/internal/use-case/main-use-case/pharmacy-company/case.go @@ -87,9 +87,6 @@ func ReadList(input e.ReadListDto) (*d.Data, error) { return err } - if len(input.Includes) > 0 { - input.Preloads = pu.GetPreloads(input.Includes) - } if dataList, metaList, err = ReadListData(input, &event, tx); err != nil { return err } diff --git a/internal/use-case/main-use-case/pharmacy-company/lib.go b/internal/use-case/main-use-case/pharmacy-company/lib.go index 1b3bfcc3..08b0ff64 100644 --- a/internal/use-case/main-use-case/pharmacy-company/lib.go +++ b/internal/use-case/main-use-case/pharmacy-company/lib.go @@ -47,14 +47,9 @@ func ReadListData(input e.ReadListDto, event *pl.Event, dbx ...*gorm.DB) ([]e.Ph tx = dg.I } - if len(input.Preloads) > 0 { - for _, preload := range input.Preloads { - tx = tx.Preload(preload) - } - } - tx = tx. Model(&e.PharmacyCompany{}). + Scopes(gh.Preload(input.Includes)). Scopes(gh.Filter(input.FilterDto)). Count(&count). Scopes(gh.Paginate(input, &pagination)). @@ -64,15 +59,9 @@ func ReadListData(input e.ReadListDto, event *pl.Event, dbx ...*gorm.DB) ([]e.Ph if err == gorm.ErrRecordNotFound { return nil, &meta, nil } - event.Status = "failed" - event.ErrInfo = pl.ErrorInfo{ - Code: "data-get-fail", - Detail: "Database get failed", - Raw: err, - } - return nil, nil, pl.SetLogError(event, input) - + return nil, nil, plh.HandleListError(input, event, err) } + meta.Count = int(count) meta.PageNumber = pagination.PageNumber meta.PageSize = pagination.PageSize diff --git a/internal/use-case/main-use-case/postal-region/case.go b/internal/use-case/main-use-case/postal-region/case.go index 1c175e42..513b0d49 100644 --- a/internal/use-case/main-use-case/postal-region/case.go +++ b/internal/use-case/main-use-case/postal-region/case.go @@ -87,9 +87,6 @@ func ReadList(input e.ReadListDto) (*d.Data, error) { return err } - if len(input.Includes) > 0 { - input.Preloads = pu.GetPreloads(input.Includes) - } if dataList, metaList, err = ReadListData(input, &event, tx); err != nil { return err } diff --git a/internal/use-case/main-use-case/postal-region/lib.go b/internal/use-case/main-use-case/postal-region/lib.go index c6d2e998..53070293 100644 --- a/internal/use-case/main-use-case/postal-region/lib.go +++ b/internal/use-case/main-use-case/postal-region/lib.go @@ -47,14 +47,9 @@ func ReadListData(input e.ReadListDto, event *pl.Event, dbx ...*gorm.DB) ([]e.Po tx = dg.I } - if len(input.Preloads) > 0 { - for _, preload := range input.Preloads { - tx = tx.Preload(preload) - } - } - tx = tx. Model(&e.PostalRegion{}). + Scopes(gh.Preload(input.Includes)). Scopes(gh.Filter(input.FilterDto)). Count(&count). Scopes(gh.Paginate(input, &pagination)). @@ -64,15 +59,9 @@ func ReadListData(input e.ReadListDto, event *pl.Event, dbx ...*gorm.DB) ([]e.Po if err == gorm.ErrRecordNotFound { return nil, &meta, nil } - event.Status = "failed" - event.ErrInfo = pl.ErrorInfo{ - Code: "data-get-fail", - Detail: "Database get failed", - Raw: err, - } - return nil, nil, pl.SetLogError(event, input) - + return nil, nil, plh.HandleListError(input, event, err) } + meta.Count = int(count) meta.PageNumber = pagination.PageNumber meta.PageSize = pagination.PageSize diff --git a/internal/use-case/main-use-case/practice-schedule/case.go b/internal/use-case/main-use-case/practice-schedule/case.go index bb2be8d0..47ae2a8e 100644 --- a/internal/use-case/main-use-case/practice-schedule/case.go +++ b/internal/use-case/main-use-case/practice-schedule/case.go @@ -87,9 +87,6 @@ func ReadList(input e.ReadListDto) (*d.Data, error) { return err } - if len(input.Includes) > 0 { - input.Preloads = pu.GetPreloads(input.Includes) - } if dataList, metaList, err = ReadListData(input, &event, tx); err != nil { return err } diff --git a/internal/use-case/main-use-case/practice-schedule/lib.go b/internal/use-case/main-use-case/practice-schedule/lib.go index 3dd0fd69..1f373ece 100644 --- a/internal/use-case/main-use-case/practice-schedule/lib.go +++ b/internal/use-case/main-use-case/practice-schedule/lib.go @@ -47,14 +47,9 @@ func ReadListData(input e.ReadListDto, event *pl.Event, dbx ...*gorm.DB) ([]e.Pr tx = dg.I } - if len(input.Preloads) > 0 { - for _, preload := range input.Preloads { - tx = tx.Preload(preload) - } - } - tx = tx. Model(&e.PracticeSchedule{}). + Scopes(gh.Preload(input.Includes)). Scopes(gh.Filter(input.FilterDto)). Count(&count). Scopes(gh.Paginate(input, &pagination)). @@ -64,15 +59,9 @@ func ReadListData(input e.ReadListDto, event *pl.Event, dbx ...*gorm.DB) ([]e.Pr if err == gorm.ErrRecordNotFound { return nil, &meta, nil } - event.Status = "failed" - event.ErrInfo = pl.ErrorInfo{ - Code: "data-get-fail", - Detail: "Database get failed", - Raw: err, - } - return nil, nil, pl.SetLogError(event, input) - + return nil, nil, plh.HandleListError(input, event, err) } + meta.Count = int(count) meta.PageNumber = pagination.PageNumber meta.PageSize = pagination.PageSize diff --git a/internal/use-case/main-use-case/prescription-item/case.go b/internal/use-case/main-use-case/prescription-item/case.go index ae4c15f6..f8111454 100644 --- a/internal/use-case/main-use-case/prescription-item/case.go +++ b/internal/use-case/main-use-case/prescription-item/case.go @@ -90,9 +90,6 @@ func ReadList(input e.ReadListDto) (*d.Data, error) { return err } - if len(input.Includes) > 0 { - input.Preloads = pu.GetPreloads(input.Includes) - } if dataList, metaList, err = ReadListData(input, &event, tx); err != nil { return err } diff --git a/internal/use-case/main-use-case/prescription-item/lib.go b/internal/use-case/main-use-case/prescription-item/lib.go index 83a8fca8..aa6f97bf 100644 --- a/internal/use-case/main-use-case/prescription-item/lib.go +++ b/internal/use-case/main-use-case/prescription-item/lib.go @@ -47,16 +47,9 @@ func ReadListData(input e.ReadListDto, event *pl.Event, dbx ...*gorm.DB) ([]e.Pr tx = dg.I } - tx = tx.Preload("MedicineMix").Preload("MedicineMix.MixItems") - - if len(input.Preloads) > 0 { - for _, preload := range input.Preloads { - tx = tx.Preload(preload) - } - } - tx = tx. Model(&e.PrescriptionItem{}). + Scopes(gh.Preload(input.Includes)). Scopes(gh.Filter(input.FilterDto)). Count(&count). Scopes(gh.Paginate(input, &pagination)). @@ -66,15 +59,9 @@ func ReadListData(input e.ReadListDto, event *pl.Event, dbx ...*gorm.DB) ([]e.Pr if err == gorm.ErrRecordNotFound { return nil, &meta, nil } - event.Status = "failed" - event.ErrInfo = pl.ErrorInfo{ - Code: "data-get-fail", - Detail: "Database get failed", - Raw: err, - } - return nil, nil, pl.SetLogError(event, input) - + return nil, nil, plh.HandleListError(input, event, err) } + meta.Count = int(count) meta.PageNumber = pagination.PageNumber meta.PageSize = pagination.PageSize diff --git a/internal/use-case/main-use-case/prescription/case.go b/internal/use-case/main-use-case/prescription/case.go index e7666dd2..fa68ec44 100644 --- a/internal/use-case/main-use-case/prescription/case.go +++ b/internal/use-case/main-use-case/prescription/case.go @@ -91,9 +91,6 @@ func ReadList(input e.ReadListDto) (*d.Data, error) { return err } - if len(input.Includes) > 0 { - input.Preloads = pu.GetPreloads(input.Includes) - } if dataList, metaList, err = ReadListData(input, &event, tx); err != nil { return err } diff --git a/internal/use-case/main-use-case/prescription/lib.go b/internal/use-case/main-use-case/prescription/lib.go index af559fb8..013952f8 100644 --- a/internal/use-case/main-use-case/prescription/lib.go +++ b/internal/use-case/main-use-case/prescription/lib.go @@ -47,14 +47,9 @@ func ReadListData(input e.ReadListDto, event *pl.Event, dbx ...*gorm.DB) ([]e.Pr tx = dg.I } - if len(input.Preloads) > 0 { - for _, preload := range input.Preloads { - tx = tx.Preload(preload) - } - } - tx = tx. Model(&e.Prescription{}). + Scopes(gh.Preload(input.Includes)). Scopes(gh.Filter(input.FilterDto)). Count(&count). Scopes(gh.Paginate(input, &pagination)). @@ -64,15 +59,9 @@ func ReadListData(input e.ReadListDto, event *pl.Event, dbx ...*gorm.DB) ([]e.Pr if err == gorm.ErrRecordNotFound { return nil, &meta, nil } - event.Status = "failed" - event.ErrInfo = pl.ErrorInfo{ - Code: "data-get-fail", - Detail: "Database get failed", - Raw: err, - } - return nil, nil, pl.SetLogError(event, input) - + return nil, nil, plh.HandleListError(input, event, err) } + meta.Count = int(count) meta.PageNumber = pagination.PageNumber meta.PageSize = pagination.PageSize diff --git a/internal/use-case/main-use-case/procedure-src/case.go b/internal/use-case/main-use-case/procedure-src/case.go index c41e47d6..1b91f6bb 100644 --- a/internal/use-case/main-use-case/procedure-src/case.go +++ b/internal/use-case/main-use-case/procedure-src/case.go @@ -87,9 +87,6 @@ func ReadList(input e.ReadListDto) (*d.Data, error) { return err } - if len(input.Includes) > 0 { - input.Preloads = pu.GetPreloads(input.Includes) - } if dataList, metaList, err = ReadListData(input, &event, tx); err != nil { return err } diff --git a/internal/use-case/main-use-case/procedure-src/lib.go b/internal/use-case/main-use-case/procedure-src/lib.go index dd71e652..5e0e9685 100644 --- a/internal/use-case/main-use-case/procedure-src/lib.go +++ b/internal/use-case/main-use-case/procedure-src/lib.go @@ -49,6 +49,7 @@ func ReadListData(input e.ReadListDto, event *pl.Event, dbx ...*gorm.DB) ([]e.Pr tx = tx. Model(&e.ProcedureSrc{}). + Scopes(gh.Preload(input.Includes)). Scopes(gh.Filter(input.FilterDto)). Count(&count). Scopes(gh.Paginate(input, &pagination)). @@ -58,15 +59,9 @@ func ReadListData(input e.ReadListDto, event *pl.Event, dbx ...*gorm.DB) ([]e.Pr if err == gorm.ErrRecordNotFound { return nil, &meta, nil } - event.Status = "failed" - event.ErrInfo = pl.ErrorInfo{ - Code: "data-get-fail", - Detail: "Database get failed", - Raw: err, - } - return nil, nil, pl.SetLogError(event, input) - + return nil, nil, plh.HandleListError(input, event, err) } + meta.Count = int(count) meta.PageNumber = pagination.PageNumber meta.PageSize = pagination.PageSize diff --git a/internal/use-case/main-use-case/province/case.go b/internal/use-case/main-use-case/province/case.go index 8c29ab2c..50d5e7ab 100644 --- a/internal/use-case/main-use-case/province/case.go +++ b/internal/use-case/main-use-case/province/case.go @@ -87,9 +87,6 @@ func ReadList(input e.ReadListDto) (*d.Data, error) { return err } - if len(input.Includes) > 0 { - input.Preloads = pu.GetPreloads(input.Includes) - } if dataList, metaList, err = ReadListData(input, &event, tx); err != nil { return err } diff --git a/internal/use-case/main-use-case/province/lib.go b/internal/use-case/main-use-case/province/lib.go index 7fd22953..84b06235 100644 --- a/internal/use-case/main-use-case/province/lib.go +++ b/internal/use-case/main-use-case/province/lib.go @@ -47,14 +47,9 @@ func ReadListData(input e.ReadListDto, event *pl.Event, dbx ...*gorm.DB) ([]e.Pr tx = dg.I } - if len(input.Preloads) > 0 { - for _, preload := range input.Preloads { - tx = tx.Preload(preload) - } - } - tx = tx. Model(&e.Province{}). + Scopes(gh.Preload(input.Includes)). Scopes(gh.Filter(input.FilterDto)). Count(&count). Scopes(gh.Paginate(input, &pagination)). @@ -64,15 +59,9 @@ func ReadListData(input e.ReadListDto, event *pl.Event, dbx ...*gorm.DB) ([]e.Pr if err == gorm.ErrRecordNotFound { return nil, &meta, nil } - event.Status = "failed" - event.ErrInfo = pl.ErrorInfo{ - Code: "data-get-fail", - Detail: "Database get failed", - Raw: err, - } - return nil, nil, pl.SetLogError(event, input) - + return nil, nil, plh.HandleListError(input, event, err) } + meta.Count = int(count) meta.PageNumber = pagination.PageNumber meta.PageSize = pagination.PageSize diff --git a/internal/use-case/main-use-case/regency/case.go b/internal/use-case/main-use-case/regency/case.go index c0ca1475..c6ed4b4f 100644 --- a/internal/use-case/main-use-case/regency/case.go +++ b/internal/use-case/main-use-case/regency/case.go @@ -87,9 +87,6 @@ func ReadList(input e.ReadListDto) (*d.Data, error) { return err } - if len(input.Includes) > 0 { - input.Preloads = pu.GetPreloads(input.Includes) - } if dataList, metaList, err = ReadListData(input, &event, tx); err != nil { return err } diff --git a/internal/use-case/main-use-case/regency/lib.go b/internal/use-case/main-use-case/regency/lib.go index 979ac109..e59dae52 100644 --- a/internal/use-case/main-use-case/regency/lib.go +++ b/internal/use-case/main-use-case/regency/lib.go @@ -47,14 +47,9 @@ func ReadListData(input e.ReadListDto, event *pl.Event, dbx ...*gorm.DB) ([]e.Re tx = dg.I } - if len(input.Preloads) > 0 { - for _, preload := range input.Preloads { - tx = tx.Preload(preload) - } - } - tx = tx. Model(&e.Regency{}). + Scopes(gh.Preload(input.Includes)). Scopes(gh.Filter(input.FilterDto)). Count(&count). Scopes(gh.Paginate(input, &pagination)). @@ -64,15 +59,9 @@ func ReadListData(input e.ReadListDto, event *pl.Event, dbx ...*gorm.DB) ([]e.Re if err == gorm.ErrRecordNotFound { return nil, &meta, nil } - event.Status = "failed" - event.ErrInfo = pl.ErrorInfo{ - Code: "data-get-fail", - Detail: "Database get failed", - Raw: err, - } - return nil, nil, pl.SetLogError(event, input) - + return nil, nil, plh.HandleListError(input, event, err) } + meta.Count = int(count) meta.PageNumber = pagination.PageNumber meta.PageSize = pagination.PageSize diff --git a/internal/use-case/main-use-case/room/case.go b/internal/use-case/main-use-case/room/case.go index 36bf3aa5..eeb1cce1 100644 --- a/internal/use-case/main-use-case/room/case.go +++ b/internal/use-case/main-use-case/room/case.go @@ -87,9 +87,6 @@ func ReadList(input e.ReadListDto) (*d.Data, error) { return err } - if len(input.Includes) > 0 { - input.Preloads = pu.GetPreloads(input.Includes) - } if dataList, metaList, err = ReadListData(input, &event, tx); err != nil { return err } diff --git a/internal/use-case/main-use-case/room/lib.go b/internal/use-case/main-use-case/room/lib.go index a37485e0..5e586248 100644 --- a/internal/use-case/main-use-case/room/lib.go +++ b/internal/use-case/main-use-case/room/lib.go @@ -47,14 +47,9 @@ func ReadListData(input e.ReadListDto, event *pl.Event, dbx ...*gorm.DB) ([]e.Ro tx = dg.I } - if len(input.Preloads) > 0 { - for _, preload := range input.Preloads { - tx = tx.Preload(preload) - } - } - tx = tx. Model(&e.Room{}). + Scopes(gh.Preload(input.Includes)). Scopes(gh.Filter(input.FilterDto)). Count(&count). Scopes(gh.Paginate(input, &pagination)). @@ -64,15 +59,9 @@ func ReadListData(input e.ReadListDto, event *pl.Event, dbx ...*gorm.DB) ([]e.Ro if err == gorm.ErrRecordNotFound { return nil, &meta, nil } - event.Status = "failed" - event.ErrInfo = pl.ErrorInfo{ - Code: "data-get-fail", - Detail: "Database get failed", - Raw: err, - } - return nil, nil, pl.SetLogError(event, input) - + return nil, nil, plh.HandleListError(input, event, err) } + meta.Count = int(count) meta.PageNumber = pagination.PageNumber meta.PageSize = pagination.PageSize diff --git a/internal/use-case/main-use-case/sbar/case.go b/internal/use-case/main-use-case/sbar/case.go index e7571e75..6c92f2b0 100644 --- a/internal/use-case/main-use-case/sbar/case.go +++ b/internal/use-case/main-use-case/sbar/case.go @@ -107,9 +107,6 @@ func ReadList(input e.ReadListDto) (*d.Data, error) { return err } - if len(input.Includes) > 0 { - input.Preloads = pu.GetPreloads(input.Includes) - } if dataList, metaList, err = ReadListData(input, &event, tx); err != nil { return err } diff --git a/internal/use-case/main-use-case/sbar/lib.go b/internal/use-case/main-use-case/sbar/lib.go index da6fc10a..6d7b57b7 100644 --- a/internal/use-case/main-use-case/sbar/lib.go +++ b/internal/use-case/main-use-case/sbar/lib.go @@ -47,14 +47,9 @@ func ReadListData(input e.ReadListDto, event *pl.Event, dbx ...*gorm.DB) ([]e.Sb tx = dg.I } - if len(input.Preloads) > 0 { - for _, preload := range input.Preloads { - tx = tx.Preload(preload) - } - } - tx = tx. Model(&e.Sbar{}). + Scopes(gh.Preload(input.Includes)). Scopes(gh.Filter(input.FilterDto)). Count(&count). Scopes(gh.Paginate(input, &pagination)). @@ -64,15 +59,9 @@ func ReadListData(input e.ReadListDto, event *pl.Event, dbx ...*gorm.DB) ([]e.Sb if err == gorm.ErrRecordNotFound { return nil, &meta, nil } - event.Status = "failed" - event.ErrInfo = pl.ErrorInfo{ - Code: "data-get-fail", - Detail: "Database get failed", - Raw: err, - } - return nil, nil, pl.SetLogError(event, input) - + return nil, nil, plh.HandleListError(input, event, err) } + meta.Count = int(count) meta.PageNumber = pagination.PageNumber meta.PageSize = pagination.PageSize diff --git a/internal/use-case/main-use-case/soapi/case.go b/internal/use-case/main-use-case/soapi/case.go index b589e946..fd06e140 100644 --- a/internal/use-case/main-use-case/soapi/case.go +++ b/internal/use-case/main-use-case/soapi/case.go @@ -107,9 +107,6 @@ func ReadList(input e.ReadListDto) (*d.Data, error) { return err } - if len(input.Includes) > 0 { - input.Preloads = pu.GetPreloads(input.Includes) - } if dataList, metaList, err = ReadListData(input, &event, tx); err != nil { return err } diff --git a/internal/use-case/main-use-case/soapi/lib.go b/internal/use-case/main-use-case/soapi/lib.go index 8f58b55a..7e551505 100644 --- a/internal/use-case/main-use-case/soapi/lib.go +++ b/internal/use-case/main-use-case/soapi/lib.go @@ -47,14 +47,9 @@ func ReadListData(input e.ReadListDto, event *pl.Event, dbx ...*gorm.DB) ([]e.So tx = dg.I } - if len(input.Preloads) > 0 { - for _, preload := range input.Preloads { - tx = tx.Preload(preload) - } - } - tx = tx. Model(&e.Soapi{}). + Scopes(gh.Preload(input.Includes)). Scopes(gh.Filter(input.FilterDto)). Count(&count). Scopes(gh.Paginate(input, &pagination)). @@ -64,15 +59,9 @@ func ReadListData(input e.ReadListDto, event *pl.Event, dbx ...*gorm.DB) ([]e.So if err == gorm.ErrRecordNotFound { return nil, &meta, nil } - event.Status = "failed" - event.ErrInfo = pl.ErrorInfo{ - Code: "data-get-fail", - Detail: "Database get failed", - Raw: err, - } - return nil, nil, pl.SetLogError(event, input) - + return nil, nil, plh.HandleListError(input, event, err) } + meta.Count = int(count) meta.PageNumber = pagination.PageNumber meta.PageSize = pagination.PageSize diff --git a/internal/use-case/main-use-case/specialist-intern/case.go b/internal/use-case/main-use-case/specialist-intern/case.go index 0a189e3d..f737b5ee 100644 --- a/internal/use-case/main-use-case/specialist-intern/case.go +++ b/internal/use-case/main-use-case/specialist-intern/case.go @@ -87,9 +87,6 @@ func ReadList(input e.ReadListDto) (*d.Data, error) { return err } - if len(input.Includes) > 0 { - input.Preloads = pu.GetPreloads(input.Includes) - } if dataList, metaList, err = ReadListData(input, &event, tx); err != nil { return err } diff --git a/internal/use-case/main-use-case/specialist-intern/lib.go b/internal/use-case/main-use-case/specialist-intern/lib.go index 7c2dadd9..03e8a67a 100644 --- a/internal/use-case/main-use-case/specialist-intern/lib.go +++ b/internal/use-case/main-use-case/specialist-intern/lib.go @@ -47,14 +47,9 @@ func ReadListData(input e.ReadListDto, event *pl.Event, dbx ...*gorm.DB) ([]e.Sp tx = dg.I } - if len(input.Preloads) > 0 { - for _, preload := range input.Preloads { - tx = tx.Preload(preload) - } - } - tx = tx. Model(&e.SpecialistIntern{}). + Scopes(gh.Preload(input.Includes)). Scopes(gh.Filter(input.FilterDto)). Count(&count). Scopes(gh.Paginate(input, &pagination)). @@ -64,15 +59,9 @@ func ReadListData(input e.ReadListDto, event *pl.Event, dbx ...*gorm.DB) ([]e.Sp if err == gorm.ErrRecordNotFound { return nil, &meta, nil } - event.Status = "failed" - event.ErrInfo = pl.ErrorInfo{ - Code: "data-get-fail", - Detail: "Database get failed", - Raw: err, - } - return nil, nil, pl.SetLogError(event, input) - + return nil, nil, plh.HandleListError(input, event, err) } + meta.Count = int(count) meta.PageNumber = pagination.PageNumber meta.PageSize = pagination.PageSize diff --git a/internal/use-case/main-use-case/specialist/case.go b/internal/use-case/main-use-case/specialist/case.go index 91e06eb3..229544be 100644 --- a/internal/use-case/main-use-case/specialist/case.go +++ b/internal/use-case/main-use-case/specialist/case.go @@ -87,9 +87,6 @@ func ReadList(input e.ReadListDto) (*d.Data, error) { return err } - if len(input.Includes) > 0 { - input.Preloads = pu.GetPreloads(input.Includes) - } if dataList, metaList, err = ReadListData(input, &event, tx); err != nil { return err } diff --git a/internal/use-case/main-use-case/specialist/lib.go b/internal/use-case/main-use-case/specialist/lib.go index 31829946..10f62ced 100644 --- a/internal/use-case/main-use-case/specialist/lib.go +++ b/internal/use-case/main-use-case/specialist/lib.go @@ -47,14 +47,9 @@ func ReadListData(input e.ReadListDto, event *pl.Event, dbx ...*gorm.DB) ([]e.Sp tx = dg.I } - if len(input.Preloads) > 0 { - for _, preload := range input.Preloads { - tx = tx.Preload(preload) - } - } - tx = tx. Model(&e.Specialist{}). + Scopes(gh.Preload(input.Includes)). Scopes(gh.Filter(input.FilterDto)). Count(&count). Scopes(gh.Paginate(input, &pagination)). @@ -64,15 +59,9 @@ func ReadListData(input e.ReadListDto, event *pl.Event, dbx ...*gorm.DB) ([]e.Sp if err == gorm.ErrRecordNotFound { return nil, &meta, nil } - event.Status = "failed" - event.ErrInfo = pl.ErrorInfo{ - Code: "data-get-fail", - Detail: "Database get failed", - Raw: err, - } - return nil, nil, pl.SetLogError(event, input) - + return nil, nil, plh.HandleListError(input, event, err) } + meta.Count = int(count) meta.PageNumber = pagination.PageNumber meta.PageSize = pagination.PageSize diff --git a/internal/use-case/main-use-case/subspecialist/case.go b/internal/use-case/main-use-case/subspecialist/case.go index 5e633047..50498b2a 100644 --- a/internal/use-case/main-use-case/subspecialist/case.go +++ b/internal/use-case/main-use-case/subspecialist/case.go @@ -87,9 +87,6 @@ func ReadList(input e.ReadListDto) (*d.Data, error) { return err } - if len(input.Includes) > 0 { - input.Preloads = pu.GetPreloads(input.Includes) - } if dataList, metaList, err = ReadListData(input, &event, tx); err != nil { return err } diff --git a/internal/use-case/main-use-case/subspecialist/lib.go b/internal/use-case/main-use-case/subspecialist/lib.go index 071c23c5..5843086f 100644 --- a/internal/use-case/main-use-case/subspecialist/lib.go +++ b/internal/use-case/main-use-case/subspecialist/lib.go @@ -47,14 +47,9 @@ func ReadListData(input e.ReadListDto, event *pl.Event, dbx ...*gorm.DB) ([]e.Su tx = dg.I } - if len(input.Preloads) > 0 { - for _, preload := range input.Preloads { - tx = tx.Preload(preload) - } - } - tx = tx. Model(&e.Subspecialist{}). + Scopes(gh.Preload(input.Includes)). Scopes(gh.Filter(input.FilterDto)). Count(&count). Scopes(gh.Paginate(input, &pagination)). @@ -64,15 +59,9 @@ func ReadListData(input e.ReadListDto, event *pl.Event, dbx ...*gorm.DB) ([]e.Su if err == gorm.ErrRecordNotFound { return nil, &meta, nil } - event.Status = "failed" - event.ErrInfo = pl.ErrorInfo{ - Code: "data-get-fail", - Detail: "Database get failed", - Raw: err, - } - return nil, nil, pl.SetLogError(event, input) - + return nil, nil, plh.HandleListError(input, event, err) } + meta.Count = int(count) meta.PageNumber = pagination.PageNumber meta.PageSize = pagination.PageSize diff --git a/internal/use-case/main-use-case/unit/case.go b/internal/use-case/main-use-case/unit/case.go index 2c07bed7..e11dbd21 100644 --- a/internal/use-case/main-use-case/unit/case.go +++ b/internal/use-case/main-use-case/unit/case.go @@ -87,9 +87,6 @@ func ReadList(input e.ReadListDto) (*d.Data, error) { return err } - if len(input.Includes) > 0 { - input.Preloads = pu.GetPreloads(input.Includes) - } if dataList, metaList, err = ReadListData(input, &event, tx); err != nil { return err } diff --git a/internal/use-case/main-use-case/unit/lib.go b/internal/use-case/main-use-case/unit/lib.go index 76511a35..c79c1373 100644 --- a/internal/use-case/main-use-case/unit/lib.go +++ b/internal/use-case/main-use-case/unit/lib.go @@ -47,15 +47,9 @@ func ReadListData(input e.ReadListDto, event *pl.Event, dbx ...*gorm.DB) ([]e.Un tx = dg.I } - if len(input.Preloads) > 0 { - for _, preload := range input.Preloads { - tx = tx.Preload(preload) - } - } - tx = tx. Model(&e.Unit{}). - Preload("Installation"). + Scopes(gh.Preload(input.Includes)). Scopes(gh.Filter(input.FilterDto)). Count(&count). Scopes(gh.Paginate(input, &pagination)). @@ -65,15 +59,9 @@ func ReadListData(input e.ReadListDto, event *pl.Event, dbx ...*gorm.DB) ([]e.Un if err == gorm.ErrRecordNotFound { return nil, &meta, nil } - event.Status = "failed" - event.ErrInfo = pl.ErrorInfo{ - Code: "data-get-fail", - Detail: "Database get failed", - Raw: err, - } - return nil, nil, pl.SetLogError(event, input) - + return nil, nil, plh.HandleListError(input, event, err) } + meta.Count = int(count) meta.PageNumber = pagination.PageNumber meta.PageSize = pagination.PageSize diff --git a/internal/use-case/main-use-case/uom/case.go b/internal/use-case/main-use-case/uom/case.go index 66b932c0..29c4516b 100644 --- a/internal/use-case/main-use-case/uom/case.go +++ b/internal/use-case/main-use-case/uom/case.go @@ -87,9 +87,6 @@ func ReadList(input e.ReadListDto) (*d.Data, error) { return err } - if len(input.Includes) > 0 { - input.Preloads = pu.GetPreloads(input.Includes) - } if dataList, metaList, err = ReadListData(input, &event, tx); err != nil { return err } diff --git a/internal/use-case/main-use-case/uom/lib.go b/internal/use-case/main-use-case/uom/lib.go index 6e8d0f1b..05c22be1 100644 --- a/internal/use-case/main-use-case/uom/lib.go +++ b/internal/use-case/main-use-case/uom/lib.go @@ -47,14 +47,9 @@ func ReadListData(input e.ReadListDto, event *pl.Event, dbx ...*gorm.DB) ([]e.Uo tx = dg.I } - if len(input.Preloads) > 0 { - for _, preload := range input.Preloads { - tx = tx.Preload(preload) - } - } - tx = tx. Model(&e.Uom{}). + Scopes(gh.Preload(input.Includes)). Scopes(gh.Filter(input.FilterDto)). Count(&count). Scopes(gh.Paginate(input, &pagination)). @@ -64,15 +59,9 @@ func ReadListData(input e.ReadListDto, event *pl.Event, dbx ...*gorm.DB) ([]e.Uo if err == gorm.ErrRecordNotFound { return nil, &meta, nil } - event.Status = "failed" - event.ErrInfo = pl.ErrorInfo{ - Code: "data-get-fail", - Detail: "Database get failed", - Raw: err, - } - return nil, nil, pl.SetLogError(event, input) - + return nil, nil, plh.HandleListError(input, event, err) } + meta.Count = int(count) meta.PageNumber = pagination.PageNumber meta.PageSize = pagination.PageSize diff --git a/internal/use-case/main-use-case/village/case.go b/internal/use-case/main-use-case/village/case.go index 375cf605..787fdb12 100644 --- a/internal/use-case/main-use-case/village/case.go +++ b/internal/use-case/main-use-case/village/case.go @@ -87,9 +87,6 @@ func ReadList(input e.ReadListDto) (*d.Data, error) { return err } - if len(input.Includes) > 0 { - input.Preloads = pu.GetPreloads(input.Includes) - } if dataList, metaList, err = ReadListData(input, &event, tx); err != nil { return err } diff --git a/internal/use-case/main-use-case/village/lib.go b/internal/use-case/main-use-case/village/lib.go index 4ef4596c..21ca8e6c 100644 --- a/internal/use-case/main-use-case/village/lib.go +++ b/internal/use-case/main-use-case/village/lib.go @@ -47,14 +47,9 @@ func ReadListData(input e.ReadListDto, event *pl.Event, dbx ...*gorm.DB) ([]e.Vi tx = dg.I } - if len(input.Preloads) > 0 { - for _, preload := range input.Preloads { - tx = tx.Preload(preload) - } - } - tx = tx. Model(&e.Village{}). + Scopes(gh.Preload(input.Includes)). Scopes(gh.Filter(input.FilterDto)). Count(&count). Scopes(gh.Paginate(input, &pagination)). @@ -64,15 +59,9 @@ func ReadListData(input e.ReadListDto, event *pl.Event, dbx ...*gorm.DB) ([]e.Vi if err == gorm.ErrRecordNotFound { return nil, &meta, nil } - event.Status = "failed" - event.ErrInfo = pl.ErrorInfo{ - Code: "data-get-fail", - Detail: "Database get failed", - Raw: err, - } - return nil, nil, pl.SetLogError(event, input) - + return nil, nil, plh.HandleListError(input, event, err) } + meta.Count = int(count) meta.PageNumber = pagination.PageNumber meta.PageSize = pagination.PageSize diff --git a/pkg/lib-helper/lib-helper.go b/pkg/lib-helper/lib-helper.go index f9f865a5..fcced797 100644 --- a/pkg/lib-helper/lib-helper.go +++ b/pkg/lib-helper/lib-helper.go @@ -2,6 +2,7 @@ package libhelper import ( "fmt" + "regexp" pl "simrs-vx/pkg/logger" "strings" "unicode" @@ -113,3 +114,54 @@ func HandleCreateError(input any, event *pl.Event, err error) error { return pl.SetLogError(event, input) } } + +func HandleListError(input any, event *pl.Event, err error) error { + if err == nil { + return nil + } + + e, ok := err.(*pgconn.PgError) + if !ok { + // fallback if it's not a pg error + event.Status = "failed" + event.ErrInfo = pl.ErrorInfo{ + Code: "data-list-fail", + Detail: fmt.Sprintf("database list failed: %s", err.Error()), + Raw: err, + } + return pl.SetLogError(event, input) + } + + re := regexp.MustCompile(`^([^:]+):\s*unsupported relations for schema\s+(\S+)`) + if matches := re.FindStringSubmatch(e.Message); len(matches) == 3 { + relation := strings.TrimSpace(matches[1]) + schema := strings.TrimSpace(matches[2]) + + event.Status = "failed" + event.ErrInfo = pl.ErrorInfo{ + Code: "invalid-relation", + Detail: fmt.Sprintf("Invalid relation '%s' for schema '%s' — check the relation name.", relation, schema), + Raw: e, + } + return pl.SetLogError(event, input) + } + + if strings.Contains(e.Message, "unsupported relations for schema") { + event.Status = "failed" + event.ErrInfo = pl.ErrorInfo{ + Code: "invalid-relation", + Detail: fmt.Sprintf("Unsupported relation detected: %s", e.Message), + Raw: e, + } + return pl.SetLogError(event, input) + } + + // Generic pg error fallback + event.Status = "failed" + event.ErrInfo = pl.ErrorInfo{ + Code: "pg-error", + Detail: fmt.Sprintf("PostgreSQL error: %s", e.Message), + Raw: e, + } + return pl.SetLogError(event, input) +}