Merge branch 'dev' of github.com:dikstub-rssa/simrs-be into migration

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

@@ -43,6 +43,7 @@ type ReadDetailDto struct {
 	Employee_Id *uint   `json:"employee_id"`
 	IHS_Number  *string `json:"ihs_number"`
 	SIP_Number  *string `json:"sip_number"`
+	Includes    string  `json:"includes"`
 }
 
 type UpdateDto struct {

internal/domain/main-entities/mcu-order-sub-item/base/entity.go

@@ -0,0 +1,15 @@
+package mcuordersubitem
+
+import (
+	ecore "simrs-vx/internal/domain/base-entities/core"
+
+	erc "simrs-vx/internal/domain/references/common"
+)
+
+type McuOrderSubItem struct {
+	ecore.Main                         // adjust this according to the needs
+	McuSubSrc_Code  *string            `json:"mcuSubSrc_code" gorm:"uniqueIndex:idx_order_sub_src"`
+	McuOrderItem_Id *uint              `json:"mcuOrderItem_id" gorm:"uniqueIndex:idx_order_sub_src"`
+	Result          *string            `json:"result"`
+	Status_Code     erc.DataStatusCode `json:"status_code"`
+}

internal/domain/main-entities/mcu-order-sub-item/entity.go

@@ -5,17 +5,15 @@ import (
 	emoi "simrs-vx/internal/domain/main-entities/mcu-order-item"
 	emss "simrs-vx/internal/domain/main-entities/mcu-sub-src"
 
+	emosi "simrs-vx/internal/domain/main-entities/mcu-order-sub-item/base"
 	erc "simrs-vx/internal/domain/references/common"
 )
 
 type McuOrderSubItem struct {
-	ecore.Main                         // adjust this according to the needs
-	McuSubSrc_Code  *string            `json:"mcuSubSrc_code" gorm:"uniqueIndex:idx_order_sub_src"`
-	McuSubSrc       *emss.McuSubSrc    `json:"mcuSubSrc,omitempty" gorm:"foreignKey:McuSubSrc_Code;references:Code"`
-	McuOrderItem_Id *uint              `json:"mcuOrderItem_id" gorm:"uniqueIndex:idx_order_sub_src"`
-	McuOrderItem    *emoi.McuOrderItem `json:"mcuOrderItem,omitempty" gorm:"foreignKey:McuOrderItem_Id;references:Id"`
-	Result          *string            `json:"result"`
-	Status_Code     erc.DataStatusCode `json:"status_code"`
+	ecore.Main                      // adjust this according to the needs
+	McuSubSrc    *emss.McuSubSrc    `json:"mcuSubSrc,omitempty" gorm:"foreignKey:McuSubSrc_Code;references:Code"`
+	McuOrderItem *emoi.McuOrderItem `json:"mcuOrderItem,omitempty" gorm:"foreignKey:McuOrderItem_Id;references:Id"`
+	emosi.McuOrderSubItem
 }
 
 func (d McuOrderSubItem) IsCompleted() bool {

internal/interface/main-handler/doctor/handler.go

@@ -38,6 +38,7 @@ func (obj myBase) GetDetail(w http.ResponseWriter, r *http.Request) {
 		return
 	}
 	dto := e.ReadDetailDto{}
+	sf.UrlQueryParam(&dto, *r.URL)
 	dto.Code = &code
 	res, err := u.ReadDetail(dto)
 	rw.DataResponse(w, res, err)

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

@@ -1,6 +1,7 @@
 package doctor
 
 import (
+	"fmt"
 	e "simrs-vx/internal/domain/main-entities/doctor"
 
 	plh "simrs-vx/pkg/lib-helper"
@@ -90,7 +91,8 @@ func ReadDetailData(input e.ReadDetailDto, event *pl.Event, dbx ...*gorm.DB) (*e
 	if input.Code != nil {
 		tx = tx.Where("\"Code\" = ?", input.Code)
 	}
-	if err := tx.First(&data).Error; err != nil {
+	fmt.Println(input.Includes)
+	if err := tx.Scopes(gh.Preload(input.Includes)).First(&data).Error; err != nil {
 		if processedErr := pu.HandleReadError(err, event, source, input.Id, data); processedErr != nil {
 			return nil, processedErr
 		}