fix (area): fix pagination area data source

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

@@ -12,10 +12,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 {
 	Regency_Code string `json:"regency-code"`
 	Code         string `json:"code"`
 	Name         string `json:"name"`
-	Pagination   ecore.Pagination
 }
 
 type ReadDetailDto struct {

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

@@ -2,6 +2,7 @@ package province
 
 import (
 	ecore "simrs-vx/internal/domain/base-entities/core"
+	er "simrs-vx/internal/domain/main-entities/regency"
 )
 
 type CreateDto struct {
@@ -10,11 +11,18 @@ type CreateDto struct {
 }
 
 type ReadListDto struct {
-	Code       string `json:"code"`
+	FilterDto
-	Name       string `json:"name"`
+	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   int16   `json:"id"`
 	Code *string `json:"code"`
@@ -36,17 +44,14 @@ type MetaDto struct {
 }
 
 type ResponseDto struct {
-	Id   int16  `json:"id"`
+	Id        int16         `json:"id"`
-	Code string `json:"code"`
+	Code      string        `json:"code"`
-	Name string `json:"name"`
+	Name      string        `json:"name"`
+	Regencies []*er.Regency `json:"regencies,omitempty"`
 }
 
 func (d Province) ToResponse() ResponseDto {
-	resp := ResponseDto{
+	resp := ResponseDto(d)
-		Id:   d.Id,
-		Code: d.Code,
-		Name: d.Name,
-	}
 	return resp
 }
 

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

@@ -12,10 +12,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 {
 	Province_Code string `json:"province-code"`
 	Code          string `json:"code"`
 	Name          string `json:"name"`
-	Pagination    ecore.Pagination
 }
 
 type ReadDetailDto struct {

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

@@ -10,12 +10,18 @@ type CreateDto struct {
 }
 
 type ReadListDto struct {
-	Code       string `json:"code"`
+	FilterDto
-	Name       string `json:"name"`
+	Includes   string   `json:"includes"`
-	Search     string `json:"search"`
+	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/village/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 {
 	District_Code string `json:"district-code"`
 	Code          string `json:"code"`
 	Name          string `json:"name"`
-	Pagination    ecore.Pagination
 }
 
 type ReadDetailDto struct {

internal/use-case/main-use-case/district/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/district/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)
+		}
+	}
+
+	plh.SearchCodeOrName(input.Search, tx)
+
 	tx = tx.
 		Model(&e.District{}).
-		Scopes(gh.Filter(input)).
+		Scopes(gh.Filter(input.FilterDto)).
 		Count(&count).
 		Scopes(gh.Paginate(input, &pagination))
 

internal/use-case/main-use-case/province/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/province/lib.go

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

internal/use-case/main-use-case/regency/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/regency/lib.go

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

internal/use-case/main-use-case/uom/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/uom/lib.go

@@ -47,11 +47,17 @@ 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)
+		}
+	}
+
 	plh.SearchCodeOrName(input.Search, tx)
 
 	tx = tx.
 		Model(&e.Uom{}).
-		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/village/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/village/lib.go

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