filtering wip

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

@@ -16,6 +16,12 @@ type CreateDto struct {
 }
 
 type ReadListDto struct {
+	FilterDto
+	Includes string   `json:"includes"`
+	Preloads []string `json:"-"`
+}
+
+type FilterDto struct {
 	Code     string  `json:"code"`
 	Name     string  `json:"name"`
 	Uom_Code string  `json:"uom_code"`

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

@@ -12,6 +12,12 @@ type CreateDto struct {
 }
 
 type ReadListDto struct {
+	FilterDto
+	Includes string   `json:"includes"`
+	Preloads []string `json:"-"`
+}
+
+type FilterDto struct {
 	Division_Id *uint16 `json:"division_id"`
 	Code        string  `json:"code"`
 	Name        string  `json:"name"`

internal/domain/main-entities/doctor-fee/dto.go

@@ -15,6 +15,12 @@ type CreateDto struct {
 }
 
 type ReadListDto struct {
+	FilterDto
+	Includes string   `json:"includes"`
+	Preloads []string `json:"-"`
+}
+
+type FilterDto struct {
 	Doctor_Id    *uint                  `json:"doctor_id"`
 	FeeType_Code *ero.DoctorFeeTypeCode `json:"feeType_code"`
 	Price        *float64               `json:"price"`

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

@@ -14,6 +14,12 @@ type CreateDto struct {
 }
 
 type ReadListDto struct {
+	FilterDto
+	Includes string   `json:"includes"`
+	Preloads []string `json:"-"`
+}
+
+type FilterDto struct {
 	Employee_Id *uint   `json:"employee_id"`
 	IHS_Number  *string `json:"ihs_number"`
 	SIP_Number  *string `json:"sip_number"`

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

@@ -64,7 +64,9 @@ type MetaDto struct {
 type ResponseDto struct {
 	ecore.Main
 	User_Id       *uint                      `json:"user_id"`
+	User          *eu.User                   `json:"user,omitempty"`
 	Person_Id     *uint                      `json:"person_id"`
+	Person        *ep.Person                 `json:"person,omitempty"`
 	Position_Code ero.EmployeePosisitionCode `json:"position_code"`
 	Division_Code *string                    `json:"division_code"`
 	Division      *ed.Division               `json:"division,omitempty"`
@@ -75,6 +77,7 @@ type ResponseDto struct {
 func (d Employee) ToResponse() ResponseDto {
 	resp := ResponseDto{
 		User_Id:       d.User_Id,
+		User:          d.User,
 		Person_Id:     d.Person_Id,
 		Position_Code: d.Position_Code,
 		Division_Code: d.Division_Code,

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

@@ -16,6 +16,12 @@ type CreateDto struct {
 }
 
 type ReadListDto struct {
+	FilterDto
+	Includes string   `json:"includes"`
+	Preloads []string `json:"-"`
+}
+
+type FilterDto struct {
 	Code            string             `json:"code"`
 	Name            string             `json:"name"`
 	InfraGroup_Code ero.InfraGroupCode `json:"infraGroup_code"`

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

@@ -14,6 +14,12 @@ type CreateDto struct {
 }
 
 type ReadListDto struct {
+	FilterDto
+	Includes string   `json:"includes"`
+	Preloads []string `json:"-"`
+}
+
+type FilterDto struct {
 	Code         string  `json:"code"`
 	Name         string  `json:"name"`
 	Regency_Code *string `json:"regency_code"`

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

@@ -13,6 +13,12 @@ type CreateDto struct {
 }
 
 type ReadListDto struct {
+	FilterDto
+	Includes string   `json:"includes"`
+	Preloads []string `json:"-"`
+}
+
+type FilterDto struct {
 	Item_Id               *uint   `json:"item_id"`
 	Price                 float64 `json:"price"`
 	InsuranceCompany_Code *string `json:"insuranceCompany_code"`
@@ -21,7 +27,6 @@ type ReadListDto struct {
 	PageSize     int `json:"page_size"`
 	NoPagination int `json:"no_pagination"`
 }
-
 type ReadDetailDto struct {
 	Id      uint16 `json:"id"`
 	Item_Id *uint  `json:"item_id"`

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

@@ -16,6 +16,12 @@ type CreateDto struct {
 }
 
 type ReadListDto struct {
+	FilterDto
+	Includes string   `json:"includes"`
+	Preloads []string `json:"-"`
+}
+
+type FilterDto struct {
 	Code           string            `json:"code"`
 	Name           string            `json:"name"`
 	ItemGroup_Code ero.ItemGroupCode `json:"itemGroup_code"`

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

@@ -17,6 +17,12 @@ type CreateDto struct {
 }
 
 type ReadListDto struct {
+	FilterDto
+	Includes string   `json:"includes"`
+	Preloads []string `json:"-"`
+}
+
+type FilterDto struct {
 	Code     string  `json:"code"`
 	Name     string  `json:"name"`
 	Uom_Code string  `json:"uom_code"`

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

@@ -90,6 +90,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/device/lib.go

@@ -51,9 +51,15 @@ 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.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/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/division-position/lib.go

@@ -51,10 +51,16 @@ 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.Filter(input)).
+		Scopes(gh.Filter(input.FilterDto)).
 		Count(&count).
 		Scopes(gh.Paginate(input, &pagination)).
 		Order("\"CreatedAt\" DESC")

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

@@ -51,9 +51,15 @@ 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.Filter(input)).
+		Scopes(gh.Filter(input.FilterDto)).
 		Count(&count).
 		Scopes(gh.Paginate(input, &pagination)).
 		Order("\"CreatedAt\" DESC")

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

@@ -51,9 +51,15 @@ 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.Filter(input)).
+		Scopes(gh.Filter(input.FilterDto)).
 		Count(&count).
 		Scopes(gh.Paginate(input, &pagination)).
 		Order("\"CreatedAt\" DESC")

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

@@ -105,6 +105,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/infra/lib.go

@@ -51,9 +51,15 @@ 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.Infra{}).
-		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/insurance-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/insurance-company/lib.go

@@ -51,9 +51,15 @@ 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.Filter(input)).
+		Scopes(gh.Filter(input.FilterDto)).
 		Count(&count).
 		Scopes(gh.Paginate(input, &pagination)).
 		Order("\"CreatedAt\" DESC")

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

@@ -51,9 +51,15 @@ 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.Filter(input)).
+		Scopes(gh.Filter(input.FilterDto)).
 		Count(&count).
 		Scopes(gh.Paginate(input, &pagination)).
 		Order("\"CreatedAt\" DESC")

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

@@ -51,9 +51,15 @@ 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.Filter(input)).
+		Scopes(gh.Filter(input.FilterDto)).
 		Count(&count).
 		Scopes(gh.Paginate(input, &pagination)).
 		Order("\"CreatedAt\" DESC")

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

@@ -90,6 +90,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/material/lib.go

@@ -51,9 +51,15 @@ 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.Filter(input)).
+		Scopes(gh.Filter(input.FilterDto)).
 		Count(&count).
 		Scopes(gh.Paginate(input, &pagination)).
 		Order("\"CreatedAt\" DESC")