조직현황 구조변경. 총괄센터삼안 실 조직 삽입확인

backend/internal/handler/auth_handler.go

@@ -782,8 +782,8 @@ func (h *AuthHandler) Signup(c *fiber.Ctx) error {
 		"department":      req.Department,
 		"affiliationType": req.AffiliationType,
 		"companyCode":     companyCode,
-		// grade는 기존 스키마 필수 키이므로 기본값을 설정
-		"grade": "member",
+		"grade":           "",
+		"role":            domain.RoleUser,
 	}
 
 	// Sync all custom login IDs based on tenant schemas
@@ -7275,6 +7275,11 @@ func (h *AuthHandler) mapKratosTraitsToLocalUser(identityID string, traits map[s
 	if department := extractTraitString(traits, "department"); department != "" {
 		localUser.Department = department
 	}
+	if grade := extractTraitString(traits, "grade"); grade != "" {
+		if _, isRole := domain.NormalizeRoleAlias(grade); !isRole {
+			localUser.Grade = grade
+		}
+	}
 	if position := extractTraitString(traits, "position"); position != "" {
 		localUser.Position = position
 	}
@@ -7302,13 +7307,12 @@ func (h *AuthHandler) mapKratosTraitsToLocalUser(identityID string, traits map[s
 		localUser.RelyingPartyID = &relyingPartyID
 	}
 
-	role := extractTraitString(traits, "grade")
-	if role == "" {
-		role = extractTraitString(traits, "role")
-	}
-	role = domain.NormalizeRole(role)
-	if role == "" {
-		role = domain.RoleUser
+	role, ok := domain.NormalizeRoleAlias(extractTraitString(traits, "role"))
+	if !ok {
+		role, ok = domain.NormalizeRoleAlias(extractTraitString(traits, "grade"))
+		if !ok {
+			role = domain.RoleUser
+		}
 	}
 	localUser.Role = role
 	if localUser.Status == "" {