Merge branch 'migration-vanilia' of https://github.com/dikstub-rssa/simrs-be into feat/functional-position-100

internal/domain/main-entities/unit-position/base/entity.go

@@ -2,15 +2,17 @@ package base
 
 import (
 	ecore "simrs-vx/internal/domain/base-entities/core"
+	ee "simrs-vx/internal/domain/main-entities/employee"
 )
 
 type Basic struct {
-	ecore.SmallMain         // adjust this according to the needs
-	Unit_Id         *uint16 `json:"unit_id" gorm:"not null"`
-	Code            string  `json:"code" gorm:"unique;size:10;not null"`
-	Name            string  `json:"name" gorm:"size:30;not null"`
-	HeadStatus      bool    `json:"headStatus"`
-	Employee_Id     *uint   `json:"employee_id"`
+	ecore.SmallMain              // adjust this according to the needs
+	Unit_Id         *uint16      `json:"unit_id" gorm:"not null"`
+	Code            string       `json:"code" gorm:"unique;size:10;not null"`
+	Name            string       `json:"name" gorm:"size:30;not null"`
+	HeadStatus      bool         `json:"headStatus"`
+	Employee_Id     *uint        `json:"employee_id"`
+	Employee        *ee.Employee `json:"employee,omitempty" gorm:"foreignKey:Employee_Id;references:Id"`
 }
 
 func (Basic) TableName() string {

internal/domain/main-entities/unit-position/entity.go

@@ -1,13 +1,11 @@
 package unit_position
 
 import (
-	ee "simrs-vx/internal/domain/main-entities/employee"
 	eu "simrs-vx/internal/domain/main-entities/unit"
 	eub "simrs-vx/internal/domain/main-entities/unit-position/base"
 )
 
 type UnitPosition struct {
 	eub.Basic
-	Unit     *eu.Unit     `json:"unit,omitempty" gorm:"foreignKey:Unit_Id;references:Id"`
-	Employee *ee.Employee `json:"employee,omitempty" gorm:"foreignKey:Employee_Id;references:Id"`
+	Unit *eu.Unit `json:"unit,omitempty" gorm:"foreignKey:Unit_Id;references:Id"`
 }