fix conflict auth

internal/use-case/main-use-case/authentication/case.go

@@ -18,14 +18,9 @@ import (
 	pl "simrs-vx/pkg/logger"
 	p "simrs-vx/pkg/password"
 
-	ed "simrs-vx/internal/domain/main-entities/doctor"
-	ee "simrs-vx/internal/domain/main-entities/employee"
-	"simrs-vx/internal/domain/main-entities/intern"
-	em "simrs-vx/internal/domain/main-entities/midwife"
-	en "simrs-vx/internal/domain/main-entities/nurse"
+	eap "simrs-vx/internal/domain/main-entities/auth-partner"
 	eu "simrs-vx/internal/domain/main-entities/user"
 	euf "simrs-vx/internal/domain/main-entities/user-fes"
-
 	erc "simrs-vx/internal/domain/references/common"
 )
 
@@ -85,152 +80,12 @@ func GenToken(input eu.LoginDto) (*d.Data, error) {
 
 	// Data and output population
 	atClaims := jwt.MapClaims{}
-	atClaims["user_id"] = user.Id
-	atClaims["user_name"] = user.Name
-	atClaims["user_contractPosition_code"] = user.ContractPosition_Code
-	atClaims["uuid"] = aUuid
-	atClaims["exp"] = atExpires
-
-	// Create output
-	outputData := d.II{
-		"user_id":                    strconv.Itoa(int(user.Id)),
-		"user_name":                  user.Name,
-		"user_contractPosition_code": user.ContractPosition_Code,
-	}
-
-	// extra
-	role := []string{}
-	switch user.ContractPosition_Code {
-	case erg.CSCEmp:
-		// 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: pl.GenMessage("auth-noEmployee")}}
-		}
-		atClaims["employee_id"] = employee.Id
-		outputData["employee_id"] = employee.Id
-		role = append(role, "emp-"+string(*employee.Position_Code))
-
-		//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 {
-			atClaims["employee_position_code"] = *employee.Position_Code
-			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: pl.GenMessage("auth-noDoctor")}}
-				}
-				atClaims["doctor_code"] = doctor.Code
-				outputData["doctor_code"] = doctor.Code
-
-				// specialist
-				if doctor.Specialist_Code != nil {
-					atClaims["specialist_code"] = doctor.Specialist_Code
-					outputData["specialist_code"] = doctor.Specialist_Code
-				}
-				if doctor.Subspecialist_Code != nil {
-					atClaims["subspecialist_code"] = doctor.Subspecialist_Code
-					outputData["subspecialist_code"] = doctor.Subspecialist_Code
-				}
-			case erg.EPCNur:
-				empData := en.Nurse{}
-				dg.I.Where("\"Employee_Id\" = ?", employee.Id).First(&empData)
-				if empData.Id == 0 {
-					return nil, d.FieldErrors{"authentication": d.FieldError{Code: "auth-noNurse", Message: pl.GenMessage("auth-noNurse")}}
-				}
-				atClaims["nurse_code"] = empData.Code
-				outputData["nurse_code"] = empData.Code
-			case erg.EPCMwi:
-				empData := em.Midwife{}
-				dg.I.Where("\"Employee_Id\" = ?", employee.Id).First(&empData)
-				if empData.Id == 0 {
-					return nil, d.FieldErrors{"authentication": d.FieldError{Code: "auth-noMidwife", Message: pl.GenMessage("auth-noMidwife")}}
-				}
-				atClaims["midwife_code"] = empData.Code
-				outputData["midwife_code"] = empData.Code
-			case erg.EPCPha:
-				empData := ep.Pharmacist{}
-				dg.I.Where("\"Employee_Id\" = ?", employee.Id).First(&empData)
-				if empData.Id == 0 {
-					return nil, d.FieldErrors{"authentication": d.FieldError{Code: "auth-noPharmacist", Message: pl.GenMessage("auth-noPharmacist")}}
-				}
-				atClaims["pharmacist_code"] = empData.Code
-				outputData["pharmacist_code"] = empData.Code
-			}
-
-			errorGetPosition := d.FieldErrors{"authentication": d.FieldError{Code: "auth-getData-failed", Message: pl.GenMessage("auth-getData-failed")}}
-
-			// division position
-			divisionPositions, err := getDivisionPosition(employee.Id, &event)
-			if err != nil {
-				return nil, errorGetPosition
-			}
-
-			// installation position
-			installationPositions, err := getInstallationPosition(employee.Id, &event)
-			if err != nil {
-				return nil, errorGetPosition
-			}
-
-			// unit position
-			unitPositions, err := getUnitPosition(employee.Id, &event)
-			if err != nil {
-				return nil, errorGetPosition
-			}
-
-			// specialist position
-			specialistPositions, err := getSpecialistPosition(employee.Id, &event)
-			if err != nil {
-				return nil, errorGetPosition
-			}
-
-			// subspecialist position
-			subspecialistPositions, err := getSubspecialistPosition(employee.Id, &event)
-			if err != nil {
-				return nil, errorGetPosition
-			}
-
-			role = append(role, divisionPositions...)
-			role = append(role, installationPositions...)
-			role = append(role, unitPositions...)
-			role = append(role, specialistPositions...)
-			role = append(role, subspecialistPositions...)
-			// atClaims["division_positions"] = divsionPositions
-			// outputData["division_positions"] = divsionPositions
-		}
-	case erg.CSCInt:
-		intern := intern.Intern{}
-		dg.I.Where("\"User_Id\" = ?", user.Id).First(&intern)
-		role = append(role, "int-"+string(*intern.Position_Code))
-	case erg.CSCSys:
-		role = append(role, "system")
-	}
-	atClaims["roles"] = role
-	outputData["roles"] = role
-
-	// Generate jwt
-	at := jwt.NewWithClaims(jwt.SigningMethodHS256, atClaims)
-	ats, err := at.SignedString([]byte(atSecretKey))
-	if err != nil {
-		return nil, d.FieldErrors{"user": d.FieldError{Code: "token-sign-err", Message: pl.GenMessage("token-sign-err")}}
-	}
-	outputData["accessToken"] = ats
-
-	// Save to redis
-	now := time.Now()
-	atx := time.Unix(atExpires, 0) //converting Unix to UTC(to Time object)
-	err = ms.I.Set(aUuid, strconv.Itoa(int(user.Id)), atx.Sub(now)).Err()
-	if err != nil {
-		panic(fmt.Sprintf(l.I.Msg("redis-store-fail"), err.Error()))
+	outputData := d.II{}
+	if err := populateRoles(user, input, atClaims, outputData, event); err != nil {
+		return nil, err
 	}
 
+	// Only manual login
 	tn := time.Now()
 	user.LoginAttemptCount = 0
 	user.LastSuccessLogin = &tn

internal/use-case/main-use-case/authentication/helper.go

@@ -21,6 +21,7 @@ import (
 	"simrs-vx/internal/domain/main-entities/intern"
 	em "simrs-vx/internal/domain/main-entities/midwife"
 	en "simrs-vx/internal/domain/main-entities/nurse"
+	ep "simrs-vx/internal/domain/main-entities/pharmacist"
 	esp "simrs-vx/internal/domain/main-entities/specialist-position"
 	essp "simrs-vx/internal/domain/main-entities/subspecialist-position"
 	eup "simrs-vx/internal/domain/main-entities/unit-position"
@@ -249,6 +250,14 @@ func populateRoles(user *eu.User, input eu.LoginDto, atClaims jwt.MapClaims, out
 				}
 				atClaims["midwife_code"] = empData.Code
 				outputData["midwife_code"] = empData.Code
+			case erg.EPCPha:
+				empData := ep.Pharmacist{}
+				dg.I.Where("\"Employee_Id\" = ?", employee.Id).First(&empData)
+				if empData.Id == 0 {
+					return d.FieldErrors{"authentication": d.FieldError{Code: "auth-noPharmacist", Message: pl.GenMessage("auth-noPharmacist")}}
+				}
+				atClaims["pharmacist_code"] = empData.Code
+				outputData["pharmacist_code"] = empData.Code
 			}
 
 			errorGetPosition := d.FieldErrors{"authentication": d.FieldError{Code: "auth-getData-failed", Message: pl.GenMessage("auth-getData-failed")}}