fix pagination and search

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

@@ -11,12 +11,19 @@ type CreateDto struct {
 }
 
 type ReadListDto struct {
-	Code       string `json:"code"`
-	Name       string `json:"name"`
-	IndName    string `json:"indName"`
+	FilterDto
+	Includes   string   `json:"includes"`
+	Preloads   []string `json:"-"`
+	Search     string   `json:"search"`
 	Pagination ecore.Pagination
 }
 
+type FilterDto struct {
+	Code    string `json:"code"`
+	Name    string `json:"name"`
+	IndName string `json:"indName"`
+}
+
 type ReadDetailDto struct {
 	Id   uint16  `json:"id"`
 	Code *string `json:"code"`

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

@@ -17,6 +17,7 @@ type ReadListDto struct {
 	FilterDto
 	Includes   string   `json:"includes"`
 	Preloads   []string `json:"-"`
+	Search     string   `json:"search"`
 	Pagination ecore.Pagination
 }
 

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

@@ -10,12 +10,18 @@ type CreateDto struct {
 }
 
 type ReadListDto struct {
-	Code       string `json:"code"`
-	Name       string `json:"name"`
-	Search     string `json:"search"`
+	FilterDto
+	Includes   string   `json:"includes"`
+	Preloads   []string `json:"-"`
+	Search     string   `json:"search"`
 	Pagination ecore.Pagination
 }
 
+type FilterDto struct {
+	Code string `json:"code"`
+	Name string `json:"name"`
+}
+
 type ReadDetailDto struct {
 	Id   uint16  `json:"id"`
 	Code *string `json:"code"`

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

@@ -17,6 +17,7 @@ type ReadListDto struct {
 	FilterDto
 	Includes   string   `json:"includes"`
 	Preloads   []string `json:"-"`
+	Search     string   `json:"search"`
 	Pagination ecore.Pagination
 }
 

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

@@ -19,6 +19,7 @@ type ReadListDto struct {
 	FilterDto
 	Includes   string   `json:"includes"`
 	Preloads   []string `json:"-"`
+	Search     string   `json:"search"`
 	Pagination ecore.Pagination
 }
 

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

@@ -10,12 +10,18 @@ type CreateDto struct {
 }
 
 type ReadListDto struct {
-	Code       string `json:"code"`
-	Name       string `json:"name"`
+	FilterDto
+	Includes   string `json:"includes"`
+	Preloads   []string
 	Search     string `json:"search"`
 	Pagination ecore.Pagination
 }
 
+type FilterDto struct {
+	Code string `json:"code"`
+	Name string `json:"name"`
+}
+
 type ReadDetailDto struct {
 	Id   uint16 `json:"id"`
 	Code string `json:"code"`

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

@@ -13,10 +13,17 @@ type CreateDto struct {
 }
 
 type ReadListDto struct {
+	FilterDto
+	Includes   string   `json:"includes"`
+	Preloads   []string `json:"-"`
+	Search     string   `json:"search"`
+	Pagination ecore.Pagination
+}
+
+type FilterDto struct {
 	Code       string                `json:"code"`
 	Name       string                `json:"name"`
 	Scope_Code *ere.CheckupScopeCode `json:"scope-code"`
-	Pagination ecore.Pagination
 }
 
 type ReadDetailDto struct {

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

@@ -10,11 +10,18 @@ type CreateDto struct {
 }
 
 type ReadListDto struct {
-	Code       string `json:"code"`
-	Name       string `json:"name"`
+	FilterDto
+	Includes   string   `json:"includes"`
+	Preloads   []string `json:"-"`
+	Search     string   `json:"search"`
 	Pagination ecore.Pagination
 }
 
+type FilterDto struct {
+	Code string `json:"code"`
+	Name string `json:"name"`
+}
+
 type ReadDetailDto struct {
 	Id   uint16  `json:"id"`
 	Code *string `json:"code"`

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

@@ -10,11 +10,18 @@ type CreateDto struct {
 }
 
 type ReadListDto struct {
-	Code       string `json:"code"`
-	Name       string `json:"name"`
+	FilterDto
+	Includes   string   `json:"includes"`
+	Preloads   []string `json:"-"`
+	Search     string   `json:"search"`
 	Pagination ecore.Pagination
 }
 
+type FilterDto struct {
+	Code string `json:"code"`
+	Name string `json:"name"`
+}
+
 type ReadDetailDto struct {
 	Id   uint16  `json:"id"`
 	Code *string `json:"code"`

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

@@ -11,10 +11,17 @@ type CreateDto struct {
 }
 
 type ReadListDto struct {
+	FilterDto
+	Includes   string   `json:"includes"`
+	Preloads   []string `json:"-"`
+	Search     string   `json:"search"`
+	Pagination ecore.Pagination
+}
+
+type FilterDto struct {
 	Code         string `json:"code"`
 	Name         string `json:"name"`
 	Regency_Code string `json:"regency-code"`
-	Pagination   ecore.Pagination
 }
 
 type ReadDetailDto struct {

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

@@ -11,13 +11,19 @@ type CreateDto struct {
 }
 
 type ReadListDto struct {
-	Code       string `json:"code"`
-	Name       string `json:"name"`
-	IndName    string `json:"indName"`
-	Search     string `json:"search"`
+	FilterDto
+	Includes   string   `json:"includes"`
+	Preloads   []string `json:"-"`
+	Search     string   `json:"search"`
 	Pagination ecore.Pagination
 }
 
+type FilterDto struct {
+	Code    string `json:"code"`
+	Name    string `json:"name"`
+	IndName string `json:"indName"`
+}
+
 type ReadDetailDto struct {
 	Id   uint16  `json:"id"`
 	Code *string `json:"code"`

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{}).

pkg/lib-helper/lib-helper.go

@@ -8,10 +8,12 @@ import (
 	"gorm.io/gorm"
 )
 
-func SearchCodeOrName(search string, tx *gorm.DB) {
+func SearchCodeOrName(search string, tx *gorm.DB) *gorm.DB {
 	if search != "" {
-		tx.Where("\"Code\" ILIKE ? OR \"Name\" ILIKE ?", "%"+search+"%", "%"+search+"%")
+		tx = tx.Where("\"Code\" ILIKE ? OR \"Name\" ILIKE ?", "%"+search+"%", "%"+search+"%")
 	}
+
+	return tx
 }
 
 func HandleCreateError(input any, event *pl.Event, err error) error {