feat/order-things: adjust table structure

internal/domain/main-entities/procedure-room-order-item/base/entity.go

@@ -0,0 +1,12 @@
+package procedureroomorder
+
+import (
+	ecore "simrs-vx/internal/domain/base-entities/core"
+)
+
+type ProcedureRoomOrderItem struct {
+	ecore.BigMain
+	ProcedureRoomOrder_Id uint64 `json:"procedureRoomOrder_id"`
+	ProcedureRoom_Code    string `json:"procedureRoom_code" gorm:"size:20"`
+	Note                  string `json:"note" gorm:"size:255"`
+}

internal/domain/main-entities/procedure-room-order-item/entity.go

@@ -1,14 +1,13 @@
 package procedureroomorder
 
 import (
-	ecore "simrs-vx/internal/domain/base-entities/core"
 	epr "simrs-vx/internal/domain/main-entities/procedure-room"
+	epro "simrs-vx/internal/domain/main-entities/procedure-room-order"
+	eb "simrs-vx/internal/domain/main-entities/procedure-room-order-item/base"
 )
 
 type ProcedureRoomOrderItem struct {
-	ecore.BigMain
-	ProcedureRoomOrder_Id uint64             `json:"procedureRoomOrder_id"`
-	ProcedureRoom_Code    string             `json:"procedureRoom_code" gorm:"size:20"`
-	ProcedureRoom         *epr.ProcedureRoom `json:"procedureRoom,omitempty" gorm:"foreignKey:ProcedureRoom_Code;references:Code"`
-	Note                  string             `json:"note" gorm:"size:255"`
+	eb.ProcedureRoomOrderItem
+	ProcedureRoomOrder *epro.ProcedureRoomOrder `json:"procedureRoomOrder,omitempty" gorm:"foreignKey:ProcedureRoomOrder_Id;references:Id"`
+	ProcedureRoom      *epr.ProcedureRoom       `json:"procedureRoom,omitempty" gorm:"foreignKey:ProcedureRoom_Code;references:Code"`
 }

internal/domain/main-entities/procedure-room-order/dto.go

@@ -9,9 +9,9 @@ import (
 )
 
 type CreateDto struct {
-	Encounter_Id         uint64 `json:"encounter_id" validate:"required"`
-	Infra_Code           string `json:"infra_code" validate:"required"`
-	MaterialPackage_Code string `json:"materialPackage_code" validate:"required"`
+	Encounter_Id uint64 `json:"encounter_id" validate:"required"`
+	// Infra_Code           string `json:"infra_code" validate:"required"`
+	MaterialPackage_Code *string `json:"materialPackage_code"`
 }
 
 type ReadListDto struct {
@@ -48,7 +48,7 @@ type ResponseDto struct {
 	Encounter_Id         uint64               `json:"encounter_id"`
 	Encounter            *ec.Encounter        `json:"encounter,omitempty"`
 	Infra_Code           string               `json:"procedure"`
-	MaterialPackage_Code string               `json:"materialPackage_code"`
+	MaterialPackage_Code *string              `json:"materialPackage_code"`
 	Status_Code          erc.DataStatusCode   `json:"status_code"`
 	ProcedureRoom        *epr.ProcedureRoom   `json:"procedureRoom,omitempty"`
 	MaterialPackage      *emp.MaterialPackage `json:"materialPackage,omitempty"`
@@ -56,8 +56,8 @@ type ResponseDto struct {
 
 func (d ProcedureRoomOrder) ToResponse() ResponseDto {
 	resp := ResponseDto{
-		Encounter_Id:         d.Encounter_Id,
-		Infra_Code:           d.Infra_Code,
+		Encounter_Id: d.Encounter_Id,
+		// Infra_Code:           d.Infra_Code,
 		MaterialPackage_Code: d.MaterialPackage_Code,
 		Status_Code:          d.Status_Code,
 	}

internal/domain/main-entities/procedure-room-order/entity.go

@@ -5,15 +5,16 @@ import (
 
 	ecore "simrs-vx/internal/domain/base-entities/core"
 	emp "simrs-vx/internal/domain/main-entities/material-package"
-	epr "simrs-vx/internal/domain/main-entities/procedure-room"
+	eproi "simrs-vx/internal/domain/main-entities/procedure-room-order-item/base"
 )
 
 type ProcedureRoomOrder struct {
 	ecore.BigMain
-	Encounter_Id         uint64               `json:"encounter_id"`
-	Infra_Code           string               `json:"infra_code" gorm:"size:20"`
-	ProcedureRoom        *epr.ProcedureRoom   `json:"procedureRoom,omitempty" gorm:"foreignKey:Infra_Code;references:Code"`
-	MaterialPackage_Code string               `json:"materialPackage_code" gorm:"size:20"`
-	MaterialPackage      *emp.MaterialPackage `json:"materialPackage,omitempty" gorm:"foreignKey:MaterialPackage_Code;references:Code"`
-	Status_Code          erc.DataStatusCode   `json:"status_code" gorm:"size:20"`
+	Encounter_Id uint64 `json:"encounter_id"`
+	// Infra_Code           string               `json:"infra_code" gorm:"size:20"`
+	// ProcedureRoom        *epr.ProcedureRoom   `json:"procedureRoom,omitempty" gorm:"foreignKey:Infra_Code;references:Code"`
+	MaterialPackage_Code *string                        `json:"materialPackage_code" gorm:"size:20"`
+	MaterialPackage      *emp.MaterialPackage           `json:"materialPackage,omitempty" gorm:"foreignKey:MaterialPackage_Code;references:Code"`
+	Status_Code          erc.DataStatusCode             `json:"status_code" gorm:"size:20"`
+	Items                []eproi.ProcedureRoomOrderItem `json:"items,omitempty" gorm:"foreignKey:ProcedureRoomOrder_Id;references:Id"`
 }

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

@@ -25,7 +25,7 @@ type ReadListDto struct {
 
 type FilterDto struct {
 	Infra_Code         *string `json:"infra-code"`
-	Type_Code          string  `json:"type_code"`
+	Type_Code          string  `json:"type-code"`
 	Unit_Code          *string `json:"unit-code"`
 	Specialist_Code    *string `json:"specialist-code"`
 	Subspecialist_Code *string `json:"subspecialist-code"`