Merge pull request #64 from dikstub-rssa/fix/anything-moko

Fix/anything moko

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",

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

go.sum

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

internal/domain/main-entities/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
 }
 

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
 }
 

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
 }
 

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
 }
 

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
 }
 

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
 }
 

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
 }
 

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
 }
 

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
 }
 

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
 }
 

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"`
 }

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
 }
 

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
 }
 

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
 }
 

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
 }
 

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
 }
 

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
 }
 

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"`
 }

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
 }
 

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
 }
 

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
 }
 

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
 }
 

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
 }
 

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
 }
 

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
 }

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
 }
 

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
 }
 

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
 }
 

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
 }
 

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
 }
 

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
 }
 

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
 }
 

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
 }
 

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
 }
 

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
 }
 

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
 }
 

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
 }
 

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
 }
 

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
 }
 

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
 }
 

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
 }
 

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
 }
 

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
 }
 

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
 }
 

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
 }
 

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
 }
 

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
 }
 

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
 }
 

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
 }
 

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
 }
 

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
 }
 

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
 }
 

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
 }
 

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
 }
 

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
 }
 

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
 }
 

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
 }
 

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
 }
 

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
 }
 

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
 }
 

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
 }
 

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
 }
 

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
 }
 

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
 }
 

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
 }
 

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
 		}

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

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
 		}

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

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
 		}

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

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
 		}

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

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

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
 		}

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

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
 		}

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

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
 		}

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

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
 		}

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

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
 		}

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

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
 		}

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

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
 		}

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

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
 		}

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

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
 		}

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

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
 		}

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

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
 		}

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

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
 		}