Merge branch 'migration' into feat/order-things

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

@@ -49,7 +49,7 @@ type ResponseDto struct {
 	MaterialPackage      *emp.MaterialPackage `json:"materialPackage,omitempty"`
 	Material_Code        string               `json:"material_code"`
 	Material             *em.Material         `json:"material,omitempty"`
-	Count                uint16               `json:"count"`
+	Count                *uint16              `json:"count"`
 }
 
 func (d MaterialPackageItem) ToResponse() ResponseDto {

internal/domain/main-entities/material-package-item/entity.go

@@ -12,5 +12,5 @@ type MaterialPackageItem struct {
 	MaterialPackage      *emp.MaterialPackage `json:"materialPackage" gorm:"foreignKey:MaterialPackage_Code;references:Code"`
 	Material_Code        string               `json:"code" gorm:"size:20;not null"`
 	Material             *em.Material         `json:"material" gorm:"foreignKey:Material_Code;references:Code"`
-	Count                uint16               `json:"count" gorm:"not null"`
+	Count                *uint16              `json:"count"`
 }

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

@@ -6,9 +6,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"`
+	ProcedureRoomOrder_Id uint64 `json:"procedureRoomOrder_id"`
+	ProcedureRoom_Code    string `json:"procedureRoom_code"`
+	Note                  string `json:"note"`
 }
 
 type ReadListDto struct {
@@ -22,7 +22,8 @@ type FilterDto struct {
 }
 
 type ReadDetailDto struct {
-	Id uint64 `json:"id"`
+	Id       uint64 `json:"id"`
+	Includes string `json:"includes"`
 }
 
 type UpdateDto struct {

internal/interface/migration/main-entities.go

@@ -84,6 +84,7 @@ import (
 	prescriptionitem "simrs-vx/internal/domain/main-entities/prescription-item"
 	procedureroom "simrs-vx/internal/domain/main-entities/procedure-room"
 	procedureroomorder "simrs-vx/internal/domain/main-entities/procedure-room-order"
+	procedureroomorderitem "simrs-vx/internal/domain/main-entities/procedure-room-order-item"
 	proceduresrc "simrs-vx/internal/domain/main-entities/procedure-src"
 	province "simrs-vx/internal/domain/main-entities/province"
 	regency "simrs-vx/internal/domain/main-entities/regency"
@@ -207,6 +208,7 @@ func getMainEntities() []any {
 		&postalregion.PostalRegion{},
 		&internalreference.InternalReference{},
 		&procedureroomorder.ProcedureRoomOrder{},
+		&procedureroomorderitem.ProcedureRoomOrderItem{},
 
 		&vclaimsephist.VclaimSepHist{},
 		&vclaimsepprint.VclaimSepPrint{},