fix pagination and search

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

@@ -53,7 +53,7 @@ func ReadListData(input e.ReadListDto, event *pl.Event, dbx ...*gorm.DB) ([]e.De
 		}
 	}
 
-	plh.SearchCodeOrName(input.Search, tx)
+	tx = plh.SearchCodeOrName(input.Search, tx)
 
 	tx = tx.
 		Model(&e.Device{}).

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

@@ -87,6 +87,9 @@ 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,9 +47,17 @@ 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 = plh.SearchCodeOrName(input.Search, tx)
+
 	tx = tx.
 		Model(&e.DiagnoseSrc{}).
-		Scopes(gh.Filter(input)).
+		Scopes(gh.Filter(input.FilterDto)).
 		Count(&count).
 		Scopes(gh.Paginate(input, &pagination)).
 		Order("\"CreatedAt\" DESC")

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

@@ -53,6 +53,8 @@ func ReadListData(input e.ReadListDto, event *pl.Event, dbx ...*gorm.DB) ([]e.Di
 		}
 	}
 
+	tx = plh.SearchCodeOrName(input.Search, tx)
+
 	tx = tx.
 		Model(&e.DivisionPosition{}).
 		Preload("Division").

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

@@ -53,7 +53,7 @@ func ReadListData(input e.ReadListDto, event *pl.Event, dbx ...*gorm.DB) ([]e.Di
 		}
 	}
 
-	plh.SearchCodeOrName(input.Search, tx)
+	tx = plh.SearchCodeOrName(input.Search, tx)
 
 	if input.OnlyHaveChildren {
 		tx = tx.Where(`

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

@@ -87,6 +87,9 @@ 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/ethnic/lib.go

@@ -47,11 +47,11 @@ func ReadListData(input e.ReadListDto, event *pl.Event, dbx ...*gorm.DB) ([]e.Et
 		tx = dg.I
 	}
 
-	plh.SearchCodeOrName(input.Search, tx)
+	tx = plh.SearchCodeOrName(input.Search, tx)
 
 	tx = tx.
 		Model(&e.Ethnic{}).
-		Scopes(gh.Filter(input)).
+		Scopes(gh.Filter(input.FilterDto)).
 		Count(&count).
 		Scopes(gh.Paginate(input, &pagination)).
 		Order("\"CreatedAt\" DESC")

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

@@ -53,7 +53,7 @@ func ReadListData(input e.ReadListDto, event *pl.Event, dbx ...*gorm.DB) ([]e.In
 		}
 	}
 
-	plh.SearchCodeOrName(input.Search, tx)
+	tx = plh.SearchCodeOrName(input.Search, tx)
 
 	if input.OnlyHaveChildren {
 		tx = tx.Where(`

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

@@ -53,7 +53,7 @@ func ReadListData(input e.ReadListDto, event *pl.Event, dbx ...*gorm.DB) ([]e.In
 		}
 	}
 
-	plh.SearchCodeOrName(input.Search, tx)
+	tx = plh.SearchCodeOrName(input.Search, tx)
 
 	tx = tx.
 		Model(&e.Installation{}).

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

@@ -53,6 +53,8 @@ func ReadListData(input e.ReadListDto, event *pl.Event, dbx ...*gorm.DB) ([]e.In
 		}
 	}
 
+	tx = plh.SearchCodeOrName(input.Search, tx)
+
 	tx = tx.
 		Model(&e.InsuranceCompany{}).
 		Scopes(gh.Filter(input.FilterDto)).

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

@@ -53,6 +53,8 @@ func ReadListData(input e.ReadListDto, event *pl.Event, dbx ...*gorm.DB) ([]e.It
 		}
 	}
 
+	tx = plh.SearchCodeOrName(input.Search, tx)
+
 	tx = tx.
 		Model(&e.Item{}).
 		Scopes(gh.Filter(input.FilterDto)).

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

@@ -87,6 +87,9 @@ 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/language/lib.go

@@ -51,7 +51,7 @@ func ReadListData(input e.ReadListDto, event *pl.Event, dbx ...*gorm.DB) ([]e.La
 
 	tx = tx.
 		Model(&e.Language{}).
-		Scopes(gh.Filter(input)).
+		Scopes(gh.Filter(input.FilterDto)).
 		Count(&count).
 		Scopes(gh.Paginate(input, &pagination)).
 		Order("\"CreatedAt\" DESC")

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

@@ -87,6 +87,9 @@ 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/mcu-src-category/lib.go

@@ -47,9 +47,17 @@ 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 = plh.SearchCodeOrName(input.Search, tx)
+
 	tx = tx.
 		Model(&e.McuSrcCategory{}).
-		Scopes(gh.Filter(input)).
+		Scopes(gh.Filter(input.FilterDto)).
 		Count(&count).
 		Scopes(gh.Paginate(input, &pagination)).
 		Order("\"CreatedAt\" DESC")

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

@@ -53,7 +53,7 @@ func ReadListData(input e.ReadListDto, event *pl.Event, dbx ...*gorm.DB) ([]e.Mc
 		}
 	}
 
-	plh.SearchCodeOrName(input.Search, tx)
+	tx = plh.SearchCodeOrName(input.Search, tx)
 
 	tx = tx.
 		Model(&e.McuSrc{}).

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

@@ -53,7 +53,7 @@ func ReadListData(input e.ReadListDto, event *pl.Event, dbx ...*gorm.DB) ([]e.Mc
 		}
 	}
 
-	plh.SearchCodeOrName(input.Search, tx)
+	tx = plh.SearchCodeOrName(input.Search, tx)
 
 	tx = tx.
 		Model(&e.McuSubSrc{}).

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

@@ -53,7 +53,7 @@ func ReadListData(input e.ReadListDto, event *pl.Event, dbx ...*gorm.DB) ([]e.Me
 		}
 	}
 
-	plh.SearchCodeOrName(input.Search, tx)
+	tx = plh.SearchCodeOrName(input.Search, tx)
 
 	tx = tx.
 		Model(&e.MedicalActionSrc{}).

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

@@ -87,6 +87,9 @@ 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/medicine-group/lib.go

@@ -47,9 +47,17 @@ 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 = plh.SearchCodeOrName(input.Search, tx)
+
 	tx = tx.
 		Model(&e.MedicineGroup{}).
-		Scopes(gh.Filter(input)).
+		Scopes(gh.Filter(input.FilterDto)).
 		Count(&count).
 		Scopes(gh.Paginate(input, &pagination)).
 		Order("\"CreatedAt\" DESC")

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

@@ -87,6 +87,9 @@ 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/medicine-method/lib.go

@@ -47,9 +47,17 @@ 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 = plh.SearchCodeOrName(input.Search, tx)
+
 	tx = tx.
 		Model(&e.MedicineMethod{}).
-		Scopes(gh.Filter(input)).
+		Scopes(gh.Filter(input.FilterDto)).
 		Count(&count).
 		Scopes(gh.Paginate(input, &pagination)).
 		Order("\"CreatedAt\" DESC")

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

@@ -53,9 +53,9 @@ func ReadListData(input e.ReadListDto, event *pl.Event, dbx ...*gorm.DB) ([]e.Me
 		}
 	}
 
-	plh.SearchCodeOrName(input.Search, tx)
+	tx = plh.SearchCodeOrName(input.Search, tx)
 
-	tx = tx.
+	tx = tx.Debug().
 		Model(&e.Medicine{}).
 		Scopes(gh.Filter(input.FilterDto)).
 		Count(&count).

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

@@ -87,6 +87,9 @@ 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/pharmacy-company/lib.go

@@ -47,9 +47,17 @@ 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 = plh.SearchCodeOrName(input.Search, tx)
+
 	tx = tx.
 		Model(&e.PharmacyCompany{}).
-		Scopes(gh.Filter(input)).
+		Scopes(gh.Filter(input.FilterDto)).
 		Count(&count).
 		Scopes(gh.Paginate(input, &pagination)).
 		Order("\"CreatedAt\" DESC")

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

@@ -87,6 +87,9 @@ 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/procedure-src/lib.go

@@ -47,11 +47,11 @@ func ReadListData(input e.ReadListDto, event *pl.Event, dbx ...*gorm.DB) ([]e.Pr
 		tx = dg.I
 	}
 
-	plh.SearchCodeOrName(input.Search, tx)
+	tx = plh.SearchCodeOrName(input.Search, tx)
 
 	tx = tx.
 		Model(&e.ProcedureSrc{}).
-		Scopes(gh.Filter(input)).
+		Scopes(gh.Filter(input.FilterDto)).
 		Count(&count).
 		Scopes(gh.Paginate(input, &pagination)).
 		Order("\"CreatedAt\" DESC")

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

@@ -53,9 +53,9 @@ func ReadListData(input e.ReadListDto, event *pl.Event, dbx ...*gorm.DB) ([]e.Pr
 		}
 	}
 
-	plh.SearchCodeOrName(input.Search, tx)
+	tx = plh.SearchCodeOrName(input.Search, tx)
 
-	tx = tx.
+	tx = tx.Debug().
 		Model(&e.Province{}).
 		Scopes(gh.Filter(input.FilterDto)).
 		Count(&count).

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

@@ -53,7 +53,7 @@ func ReadListData(input e.ReadListDto, event *pl.Event, dbx ...*gorm.DB) ([]e.Re
 		}
 	}
 
-	plh.SearchCodeOrName(input.Search, tx)
+	tx = plh.SearchCodeOrName(input.Search, tx)
 
 	tx = tx.
 		Model(&e.Regency{}).

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

@@ -53,7 +53,7 @@ func ReadListData(input e.ReadListDto, event *pl.Event, dbx ...*gorm.DB) ([]e.Sp
 		}
 	}
 
-	plh.SearchCodeOrName(input.Search, tx)
+	tx = plh.SearchCodeOrName(input.Search, tx)
 
 	tx = tx.
 		Model(&e.Specialist{}).

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

@@ -53,7 +53,7 @@ func ReadListData(input e.ReadListDto, event *pl.Event, dbx ...*gorm.DB) ([]e.Su
 		}
 	}
 
-	plh.SearchCodeOrName(input.Search, tx)
+	tx = plh.SearchCodeOrName(input.Search, tx)
 
 	tx = tx.
 		Model(&e.Subspecialist{}).

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

@@ -53,7 +53,7 @@ func ReadListData(input e.ReadListDto, event *pl.Event, dbx ...*gorm.DB) ([]e.Un
 		}
 	}
 
-	plh.SearchCodeOrName(input.Search, tx)
+	tx = plh.SearchCodeOrName(input.Search, tx)
 
 	tx = tx.
 		Model(&e.Unit{}).

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

@@ -53,7 +53,7 @@ func ReadListData(input e.ReadListDto, event *pl.Event, dbx ...*gorm.DB) ([]e.Uo
 		}
 	}
 
-	plh.SearchCodeOrName(input.Search, tx)
+	tx = plh.SearchCodeOrName(input.Search, tx)
 
 	tx = tx.
 		Model(&e.Uom{}).

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

@@ -53,7 +53,7 @@ func ReadListData(input e.ReadListDto, event *pl.Event, dbx ...*gorm.DB) ([]e.Vi
 		}
 	}
 
-	plh.SearchCodeOrName(input.Search, tx)
+	tx = plh.SearchCodeOrName(input.Search, tx)
 
 	tx = tx.
 		Model(&e.Village{}).