Merge dev into feat/user

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

@@ -1,22 +1,21 @@
 package user
 
 import (
+	ecore "simrs-vx/internal/domain/base-entities/core"
 	"time"
 
-	ecore "simrs-vx/internal/domain/base-entities/core"
 	ep "simrs-vx/internal/domain/main-entities/person"
 	epa "simrs-vx/internal/domain/main-entities/person-address"
 	epc "simrs-vx/internal/domain/main-entities/person-contact"
 
 	erc "simrs-vx/internal/domain/references/common"
-	ero "simrs-vx/internal/domain/references/organization"
+	erg "simrs-vx/internal/domain/references/organization"
 )
 
 type CreateDto struct {
 	Name                  string                   `json:"name" validate:"maxLength=25"`
 	Password              string                   `json:"password" validate:"maxLength=255"`
 	Status_Code           erc.UserStatusCode       `json:"status_code" validate:"maxLength=10"`
-	ContractPosition_Code ero.ContractPositionCode `json:"contractPosition_code" validate:"maxLength=20"`
 	Person_Id             *uint                    `json:"-"`
 	Person                *ep.UpdateDto            `json:"person"`
 	PersonAddresses       []epa.UpdateDto          `json:"personAddresses"`
@@ -28,6 +27,7 @@ type CreateDto struct {
 	Infra_Id              *uint16                  `json:"infra_id"`
 	Specialist_Id         *uint16                  `json:"specialist_id"`
 	Subspecialist_Id      *uint16                  `json:"subspecialist_id"`
+	ContractPosition_Code erg.ContractPositionCode `json:"contractPosition_code" gorm:"not null;size:20"`
 }
 
 type ReadListDto struct {
@@ -89,7 +89,7 @@ type EmployeUpdateDto struct {
 	Person_Id     *uint                      `json:"-"`
 	Division_Code *string                    `json:"division_code"`
 	Number        *string                    `json:"number" validate:"maxLength=20"`
-	Position_Code ero.EmployeePosisitionCode `json:"status_code" validate:"maxLength=10"`
+	Position_Code erg.EmployeePosisitionCode `json:"status_code" validate:"maxLength=10"`
 	Status_Code   erc.ActiveStatusCode       `json:"status_code" validate:"maxLength=10"`
 }
 

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

@@ -5,17 +5,16 @@ import (
 
 	ecore "simrs-vx/internal/domain/base-entities/core"
 	erc "simrs-vx/internal/domain/references/common"
-	ero "simrs-vx/internal/domain/references/organization"
+	erg "simrs-vx/internal/domain/references/organization"
 )
 
 type User struct {
-	ecore.Main                          // adjust this according to the needs
-	Name             string             `json:"name" gorm:"unique;not null;size:25"`
-	Password         string             `json:"password" gorm:"not null;size:255"`
-	Status_Code      erc.UserStatusCode `json:"status_code" gorm:"not null;size:10"`
-	FailedLoginCount uint8              `json:"failedLoginCount" gorm:"type:smallint"`
-	// Position_Code     ero.EmployeePosisitionCode `json:"position_code" gorm:"not null;size:20"`
-	ContractPosition_Code ero.ContractPositionCode `json:"contractPosition_Code" gorm:"not null;size:20"`
+	ecore.Main                                     // adjust this according to the needs
+	Name                  string                   `json:"name" gorm:"unique;not null;size:25"`
+	Password              string                   `json:"password" gorm:"not null;size:255"`
+	Status_Code           erc.UserStatusCode       `json:"status_code" gorm:"not null;size:10"`
+	ContractPosition_Code erg.ContractPositionCode `json:"contractPosition_code" gorm:"not null;size:20"`
+	FailedLoginCount      uint8                    `json:"failedLoginCount" gorm:"type:smallint"`
 	LoginAttemptCount     int                      `json:"-"`
 	LastSuccessLogin      *time.Time               `json:"lastSuccessLogin,omitempty"`
 	LastAllowdLogin       *time.Time               `json:"lastAllowdLogin,omitempty"`

internal/domain/references/organization/organization.go

@@ -1,26 +1,33 @@
 package organization
 
 type (
-	UserPosisitionCode string
-	ItemGroupCode      string
-	InfraGroupCode     string
-	UnitTypeCode       string
-	DoctorFeeTypeCode  string
+	ContractPositionCode   string
+	EmployeePosisitionCode string
+	InternPosisitionCode   string
+	ItemGroupCode          string
+	InfraGroupCode         string
+	UnitTypeCode           string
+	DoctorFeeTypeCode      string
 )
 
 const (
-	UPCReg UserPosisitionCode = "registration"      // Admisi/Pendaftaran
-	UPCNur UserPosisitionCode = "nurse"             // Perawat
-	UPCDoc UserPosisitionCode = "doctor"            // Dokter
-	UPCNut UserPosisitionCode = "nutritionist"      // Ahli gizi
-	UPCMwi UserPosisitionCode = "mid-wife"          // Bidan
-	UPCLab UserPosisitionCode = "laborant"          // Laboran
-	UPCPha UserPosisitionCode = "pharmacy"          // Farmasi
-	UPCPay UserPosisitionCode = "payment"           // Pembayaran
-	UPCHur UserPosisitionCode = "human-resource"    // Sumber Daya Manusia
-	UPCGea UserPosisitionCode = "general-affair"    // Bagian Umum
-	UPCInt UserPosisitionCode = "specialist-intern" // PPDS
-	UPCMan UserPosisitionCode = "management"        // Manajemen
+	CSCEmp ContractPositionCode = "employee" // Pegawai
+	CSCSpi 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
+
+	IPCSpecialist = "specialist-intern"
+	IPCNurse      = "nurse-intern"
 
 	ITGCInfra    ItemGroupCode = "infra"
 	ITGCMedicine ItemGroupCode = "medicine"