adjustment detail division

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

@@ -2,8 +2,11 @@ package division
 
 import (
 	e "simrs-vx/internal/domain/main-entities/division"
+	edp "simrs-vx/internal/domain/main-entities/division-position"
 	"strconv"
 
+	udp "simrs-vx/internal/use-case/main-use-case/division-position"
+
 	dg "github.com/karincake/apem/db-gorm-pg"
 	d "github.com/karincake/dodol"
 
@@ -61,7 +64,7 @@ func Create(input e.CreateDto) (*d.Data, error) {
 			"structure": "single-data",
 			"status":    "created",
 		},
-		Data: data.ToResponse(),
+		Data: data.ToResponse(nil),
 	}, nil
 }
 
@@ -121,6 +124,7 @@ func ReadList(input e.ReadListDto) (*d.Data, error) {
 func ReadDetail(input e.ReadDetailDto) (*d.Data, error) {
 	var data *e.Division
 	var err error
+	var dataDP []e.ResponseDivisionPosition
 
 	event := pl.Event{
 		Feature: "ReadDetail",
@@ -142,6 +146,40 @@ func ReadDetail(input e.ReadDetailDto) (*d.Data, error) {
 			return err
 		}
 
+		// get data divisionPositions
+		dataDivisionPosition, err := udp.ReadList(edp.ReadListDto{
+			FilterDto: edp.FilterDto{
+				Division_Id: &input.Id,
+			},
+			Includes: "employee,employee.User",
+		})
+		if err != nil {
+			return err
+		}
+
+		list, _ := dataDivisionPosition.Data.([]edp.ResponseDto)
+		if len(list) > 0 {
+			for _, dp := range list {
+				dataDP = append(dataDP, e.ResponseDivisionPosition{
+					SmallMain:   dp.SmallMain,
+					Division_Id: &dp.Id,
+					Code:        dp.Code,
+					Name:        dp.Name,
+					HeadStatus:  dp.HeadStatus,
+					Employee_Id: dp.Employee_Id,
+					Employee: e.ResponseDivisionEmployee{
+						Main:        dp.Employee.Main,
+						User_Id:     dp.Employee.User_Id,
+						User:        dp.Employee.User,
+						Person_Id:   dp.Employee.Person_Id,
+						Person:      dp.Employee.Person,
+						Number:      dp.Employee.Number,
+						Status_Code: dp.Employee.Status_Code,
+					},
+				})
+			}
+		}
+
 		mwRunner.setMwType(pu.MWTPost)
 		// Run post-middleware
 		if err := mwRunner.RunReadDetailMiddleware(readDetailPostMw, &input, data); err != nil {
@@ -161,7 +199,7 @@ func ReadDetail(input e.ReadDetailDto) (*d.Data, error) {
 			"structure": "single-data",
 			"status":    "fetched",
 		},
-		Data: data.ToResponse(),
+		Data: data.ToResponse(dataDP),
 	}, nil
 }
 
@@ -216,7 +254,7 @@ func Update(input e.UpdateDto) (*d.Data, error) {
 			"structure": "single-data",
 			"status":    "updated",
 		},
-		Data: data.ToResponse(),
+		Data: data.ToResponse(nil),
 	}, nil
 
 }
@@ -270,7 +308,7 @@ func Delete(input e.DeleteDto) (*d.Data, error) {
 			"structure": "single-data",
 			"status":    "deleted",
 		},
-		Data: data.ToResponse(),
+		Data: data.ToResponse(nil),
 	}, nil
 
 }

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

@@ -91,7 +91,9 @@ func ReadDetailData(input e.ReadDetailDto, event *pl.Event, dbx ...*gorm.DB) (*e
 		tx = dg.I
 	}
 
-	if err := tx.First(&data, input.Id).Error; err != nil {
+	if err := tx.
+		Scopes(gh.Preload(input.Includes)).
+		First(&data, input.Id).Error; err != nil {
 		if processedErr := pu.HandleReadError(err, event, source, input.Id, data); processedErr != nil {
 			return nil, processedErr
 		}