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

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

@@ -10,14 +10,14 @@ import (
 )
 
 type Employee struct {
-	ecore.Main                                // adjust this according to the needs
-	User_Id       *uint                       `json:"user_id"`
-	User          *eu.User                    `json:"user,omitempty" gorm:"foreignKey:User_Id;references:Id"`
-	Person_Id     *uint                       `json:"person_id"`
-	Person        *ep.Person                  `json:"person,omitempty" gorm:"foreignKey:Person_Id;references:Id"`
-	Position_Code *erg.EmployeePosisitionCode `json:"position_code" gorm:"size:20"`
-	Division_Code *string                     `json:"division_code"`
-	Division      *ed.Division                `json:"division,omitempty" gorm:"foreignKey:Division_Code;references:Code"`
-	Number        *string                     `json:"number" gorm:"size:20"`
-	Status_Code   erc.ActiveStatusCode        `json:"status_code" gorm:"not null;size:10"`
+	ecore.Main                              // adjust this according to the needs
+	User_Id       *uint                     `json:"user_id"`
+	User          *eu.User                  `json:"user,omitempty" gorm:"foreignKey:User_Id;references:Id"`
+	Person_Id     *uint                     `json:"person_id"`
+	Person        *ep.Person                `json:"person,omitempty" gorm:"foreignKey:Person_Id;references:Id"`
+	Position_Code *erg.EmployeePositionCode `json:"position_code" gorm:"size:20"`
+	Division_Code *string                   `json:"division_code"`
+	Division      *ed.Division              `json:"division,omitempty" gorm:"foreignKey:Division_Code;references:Code"`
+	Number        *string                   `json:"number" gorm:"size:20"`
+	Status_Code   erc.ActiveStatusCode      `json:"status_code" gorm:"not null;size:10"`
 }

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

@@ -84,13 +84,13 @@ func (d *User) ToResponse() ResponseDto {
 }
 
 type EmployeUpdateDto struct {
-	Id            uint                       `json:"id"`
-	User_Id       *uint                      `json:"-"`
-	Person_Id     *uint                      `json:"-"`
-	Division_Code *string                    `json:"division_code"`
-	Number        *string                    `json:"number" validate:"maxLength=20"`
-	Position_Code erg.EmployeePosisitionCode `json:"position_code" validate:"maxLength=20"`
-	Status_Code   erc.ActiveStatusCode       `json:"status_code" validate:"maxLength=10"`
+	Id            uint                     `json:"id"`
+	User_Id       *uint                    `json:"-"`
+	Person_Id     *uint                    `json:"-"`
+	Division_Code *string                  `json:"division_code"`
+	Number        *string                  `json:"number" validate:"maxLength=20"`
+	Position_Code erg.EmployeePositionCode `json:"position_code" validate:"maxLength=20"`
+	Status_Code   erc.ActiveStatusCode     `json:"status_code" validate:"maxLength=10"`
 }
 
 func ToResponseList(data []User) []ResponseDto {

internal/domain/references/organization/organization.go

@@ -1,30 +1,30 @@
 package organization
 
 type (
-	ContractPositionCode   string
-	EmployeePosisitionCode string
-	InternPosisitionCode   string
-	ItemGroupCode          string
-	InfraGroupCode         string
-	UnitTypeCode           string
-	DoctorFeeTypeCode      string
+	ContractPositionCode string
+	EmployeePositionCode string
+	InternPosisitionCode string
+	ItemGroupCode        string
+	InfraGroupCode       string
+	UnitTypeCode         string
+	DoctorFeeTypeCode    string
 )
 
 const (
 	CSCEmp ContractPositionCode = "employee" // Pegawai
 	CSCInt ContractPositionCode = "intern"   // PPDS
 
-	EPCReg EmployeePosisitionCode = "registration"   // Admisi/Pendaftaran
-	EPCNur EmployeePosisitionCode = "nurse"          // Perawat
-	EPCDoc EmployeePosisitionCode = "doctor"         // Dokter
-	EPCNut EmployeePosisitionCode = "nutritionist"   // Ahli gizi
-	EPCMwi EmployeePosisitionCode = "mid-wife"       // Bidan
-	EPCLab EmployeePosisitionCode = "laborant"       // Laboran
-	EPCPha EmployeePosisitionCode = "pharmacy"       // Farmasi
-	EPCPay EmployeePosisitionCode = "payment"        // Pembayaran
-	EPCHur EmployeePosisitionCode = "human-resource" // Sumber Daya Manusia
-	EPCGea EmployeePosisitionCode = "general-affair" // Bagian Umum
-	EPCMan EmployeePosisitionCode = "management"     // Manajemen
+	EPCReg EmployeePositionCode = "registration"   // Admisi/Pendaftaran
+	EPCNur EmployeePositionCode = "nurse"          // Perawat
+	EPCDoc EmployeePositionCode = "doctor"         // Dokter
+	EPCNut EmployeePositionCode = "nutritionist"   // Ahli gizi
+	EPCMwi EmployeePositionCode = "mid-wife"       // Bidan
+	EPCLab EmployeePositionCode = "laborant"       // Laboran
+	EPCPha EmployeePositionCode = "pharmacy"       // Farmasi
+	EPCPay EmployeePositionCode = "payment"        // Pembayaran
+	EPCHur EmployeePositionCode = "human-resource" // Sumber Daya Manusia
+	EPCGea EmployeePositionCode = "general-affair" // Bagian Umum
+	EPCMan EmployeePositionCode = "management"     // Manajemen
 
 	IPCSpecialist = "specialist-intern"
 	IPCNurse      = "nurse-intern"