feat/user: auth reworking

2025-10-19 18:10:20 +07:00
parent 4040c22d50
commit 0f407e5df3
2 changed files with 61 additions and 41 deletions
@@ -19,6 +19,7 @@ import (

 	ed "simrs-vx/internal/domain/main-entities/doctor"
 	ee "simrs-vx/internal/domain/main-entities/employee"
+	en "simrs-vx/internal/domain/main-entities/nurse"
 	erc "simrs-vx/internal/domain/references/common"
 	erg "simrs-vx/internal/domain/references/organization"

@@ -77,11 +78,6 @@ func GenToken(input eu.LoginDto) (*d.Data, error) {
 		return nil, d.FieldErrors{"authentication": d.FieldError{Code: "auth-login-unverified", Message: el.GenMessage("auth-login-unverified")}}
 	}

-	userDivisionPositions, err := getDivisionPosition(user.Id)
-	if err != nil {
-		return nil, d.FieldErrors{"authentication": d.FieldError{Code: "auth-getData-failed", Message: el.GenMessage("auth-getData-failed")}}
-	}
-
 	// Access token prep
 	id, err := uuid.NewRandom()
 	if err != nil {
@@ -100,7 +96,6 @@ func GenToken(input eu.LoginDto) (*d.Data, error) {
 	atClaims["user_id"] = user.Id
 	atClaims["user_name"] = user.Name
 	atClaims["user_contractPosition_code"] = user.ContractPosition_Code
-	atClaims["division_positions"] = userDivisionPositions
 	atClaims["uuid"] = aUuid
 	atClaims["exp"] = atExpires

@@ -118,21 +113,56 @@ func GenToken(input eu.LoginDto) (*d.Data, error) {
 		// employee
 		employee := ee.Employee{}
 		dg.I.Where("\"User_Id\" = ?", user.Id).First(&employee)
+		if employee.Id == 0 {
+			return nil, d.FieldErrors{"authentication": d.FieldError{Code: "auth-noEmployee", Message: el.GenMessage("auth-noEmployee")}}
+		}
+		atClaims["employee_id"] = employee.Id
+		outputData["employee_id"] = employee.Id
 		role = append(role, "emp-"+string(*employee.Position_Code))
-		atClaims["employee_division_code"] = employee.Division_Code
-		outputData["employee_division_code"] = employee.Division_Code
-		// doctor
-		if employee.Id > 0 && employee.Position_Code != nil && *employee.Position_Code == erg.EPCDoc {
-			doctor := ed.Doctor{}
-			dg.I.Where("\"Employee_Id\" = ?", employee.Id).First(&doctor)
-			if doctor.Specialist_Id != nil {
-				atClaims["specialist_id"] = doctor.Specialist_Id
-				outputData["specialist_id"] = doctor.Specialist_Id
+
+		if employee.Division_Code != nil {
+			atClaims["employee_division_code"] = employee.Division_Code
+			outputData["employee_division_code"] = employee.Division_Code
+		}
+
+		// employee position
+		if employee.Id > 0 && employee.Position_Code != nil {
+			switch *employee.Position_Code {
+			case erg.EPCDoc:
+				doctor := ed.Doctor{}
+				dg.I.Where("\"Employee_Id\" = ?", employee.Id).First(&doctor)
+				if doctor.Id == 0 {
+					return nil, d.FieldErrors{"authentication": d.FieldError{Code: "auth-noDoctor", Message: el.GenMessage("auth-noDoctor")}}
+				}
+				atClaims["doctor_id"] = doctor.Id
+				outputData["doctor_id"] = doctor.Id
+
+				// specialist
+				if doctor.Specialist_Id != nil {
+					atClaims["specialist_id"] = doctor.Specialist_Id
+					outputData["specialist_id"] = doctor.Specialist_Id
+				}
+				if doctor.Subspecialist_Id != nil {
+					atClaims["subspecialist_id"] = doctor.Subspecialist_Id
+					outputData["subspecialist_id"] = doctor.Subspecialist_Id
+				}
+			case erg.EPCNur:
+				nurse := en.Nurse{}
+				dg.I.Where("\"Employee_Id\" = ?", employee.Id).First(&nurse)
+				if nurse.Id == 0 {
+					return nil, d.FieldErrors{"authentication": d.FieldError{Code: "auth-noNurse", Message: el.GenMessage("auth-noNurse")}}
+				}
+				atClaims["nurse_id"] = nurse.Id
+				outputData["nurse_id"] = nurse.Id
 			}
-			if doctor.Subspecialist_Id != nil {
-				atClaims["subspecialist_id"] = doctor.Subspecialist_Id
-				outputData["subspecialist_id"] = doctor.Subspecialist_Id
+			// division position
+			divsionPositions, err := getDivisionPosition(employee.Id)
+			if err != nil {
+				return nil, d.FieldErrors{"authentication": d.FieldError{Code: "auth-getData-failed", Message: el.GenMessage("auth-getData-failed")}}
 			}
+			role = append(role, divsionPositions...)
+			// atClaims["division_positions"] = divsionPositions
+			// outputData["division_positions"] = divsionPositions
 		}
 	case erg.CSCInt:
 		intern := intern.Intern{}