Merge branch 'migration' of https://github.com/dikstub-rssa/simrs-be into feat/chemo-plan

# Conflicts:
#	cmd/main-migration/migrations/atlas.sum
#	internal/domain/main-entities/chemo-plan/entity.go
#	internal/use-case/main-use-case/chemo-protocol/helper.go

internal/domain/main-entities/chemo-plan/entity.go

@@ -1,6 +1,7 @@
 package chemo_plan
 
 import (
+	ee "simrs-vx/internal/domain/main-entities/encounter"
 	"time"
 
 	ecore "simrs-vx/internal/domain/base-entities/core"
@@ -10,12 +11,14 @@ import (
 
 type ChemoPlan struct {
 	ecore.Main
-	Parent_Id       *uint                    `json:"parent_id"` // chemo.Id
-	Protocol_Id     *uint                    `json:"protocol_id"`
-	SeriesNumber    *uint16                  `json:"seriesNumber"` // series ke -
-	CycleNumber     *uint                    `json:"cycleNumber"`  // cycle ke -
-	PlanDate        *time.Time               `json:"planDate"`
-	RealizationDate *time.Time               `json:"realizationDate"`
-	Notes           *string                  `json:"notes"`
-	Status          *ere.StatusProtocolChemo `json:"status"`
+	Parent_Id       *uint                   `json:"parent_id"` // chemo.Id
+	Protocol_Id     *uint                   `json:"protocol_id"`
+	SeriesNumber    *uint16                 `json:"seriesNumber"` // series ke -
+	CycleNumber     *uint                   `json:"cycleNumber"`  // cycle ke -
+	PlanDate        *time.Time              `json:"planDate"`
+	RealizationDate *time.Time              `json:"realizationDate"`
+	Notes           *string                 `json:"notes"`
+	Status          ere.StatusProtocolChemo `json:"status"`
+	Encounter_Id    *uint                   `json:"encounter_id"`
+	Encounter       *ee.Encounter           `json:"encounter,omitempty" gorm:"foreignKey:Encounter_Id;references:Id"`
 }

internal/domain/main-entities/chemo/entity.go

@@ -1,6 +1,7 @@
 package chemo
 
 import (
+	ere "simrs-vx/internal/domain/references/encounter"
 	"time"
 
 	ecore "simrs-vx/internal/domain/base-entities/core"
@@ -27,4 +28,5 @@ type Chemo struct {
 	Doctor_Code        *string              `json:"doctor_code"`
 	Doctor             *ed.Doctor           `json:"doctor" gorm:"foreignKey:Doctor_Code;references:Code"`
 	NextChemoDate      *time.Time           `json:"nextChemoDate"`
+	Class_Code         ere.ChemoClassCode   `json:"class_code"`
 }

internal/use-case/main-use-case/chemo-protocol/helper.go

@@ -5,15 +5,17 @@ Any functions that are used internally by the use-case
 package chemo_protocol
 
 import (
-	ec "simrs-vx/internal/domain/main-entities/chemo"
-	e "simrs-vx/internal/domain/main-entities/chemo-protocol"
-	erc "simrs-vx/internal/domain/references/common"
-	ere "simrs-vx/internal/domain/references/encounter"
 	pl "simrs-vx/pkg/logger"
 	pu "simrs-vx/pkg/use-case-helper"
 
 	dg "github.com/karincake/apem/db-gorm-pg"
 	gh "github.com/karincake/getuk"
+
+	erc "simrs-vx/internal/domain/references/common"
+	ere "simrs-vx/internal/domain/references/encounter"
+
+	ec "simrs-vx/internal/domain/main-entities/chemo"
+	e "simrs-vx/internal/domain/main-entities/chemo-protocol"
 )
 
 func setData[T *e.CreateDto | *e.UpdateDto](input T, data *e.ChemoProtocol) {