#3052 - removing supervisor role - WIP

Author: rmmayo

service/src/main/java/skills/services/GlobalBadgeRoleService.groovy

@@ -27,7 +27,6 @@ import skills.controller.result.model.BadgeResult
 import skills.controller.result.model.UserRoleRes
 import skills.services.admin.BadgeAdminService
 import skills.services.admin.UserCommunityService
-import skills.services.quiz.QuizRoleService
 import skills.services.userActions.DashboardAction
 import skills.services.userActions.DashboardItem
 import skills.services.userActions.UserActionInfo
@@ -48,9 +47,6 @@ class GlobalBadgeRoleService {
     @Autowired
     UserInfoService userInfoService
 
-    @Autowired
-    QuizRoleService quizRoleService
-
     @Autowired
     BadgeAdminService badgeAdminService
 
@@ -84,8 +80,8 @@ class GlobalBadgeRoleService {
         if (currentUser?.toLowerCase() == userId?.toLowerCase()) {
             throw new SkillException("Cannot add roles to myself. userId=[${userId}]", ErrorCode.AccessDenied)
         }
-        Boolean addingAsLocalAdmin = adminGroupId == null && roleName == RoleName.ROLE_QUIZ_ADMIN;
-        if (addingAsLocalAdmin && userRoleRepo.isUserQuizGroupAdmin(userId, badgeId)) {
+        Boolean addingAsLocalAdmin = adminGroupId == null && roleName == RoleName.ROLE_GLOBAL_BADGE_ADMIN;
+        if (addingAsLocalAdmin && userRoleRepo.isUserGlobalBadgeAdmin(userId, badgeId)) {
             throw new SkillException("User is already part of an Admin Group and cannot be added as a local admin. userId=[${userId}]", ErrorCode.AccessDenied)
         }
         accessSettingsStorageService.addGlobalAdminUserRoleForUser(userId, badgeResult.badgeId, RoleName.ROLE_GLOBAL_BADGE_ADMIN)
@@ -94,10 +90,10 @@ class GlobalBadgeRoleService {
         String userIdForDisplay = userAttrs?.userIdForDisplay ?: userId
         userActionsHistoryService.saveUserAction(new UserActionInfo(
                 action: DashboardAction.Create, item: DashboardItem.UserRole,
-                itemId: userIdForDisplay, badgeId: badgeResult.badgeId,
+                itemId: userIdForDisplay,
                 actionAttributes: [
                         userRole: roleName,
-                        quizName: badgeResult.name,
+                        badgeName: badgeResult.name,
                         badgeId: badgeResult.badgeId,
                 ]
         ))

service/src/main/java/skills/storage/repos/UserRoleRepo.groovy

@@ -61,6 +61,10 @@ interface UserRoleRepo extends CrudRepository<UserRole, Integer> {
     @Query(value = '''SELECT DISTINCT 'true' FROM user_roles ur WHERE ur.user_id = ?1 and ur.role_name in ('ROLE_ADMIN_GROUP_MEMBER','ROLE_ADMIN_GROUP_OWNER') and ur.admin_group_id = ?2 ''', nativeQuery = true)
     Boolean isUserGroupAdminMemberOrOwner(String userId, String adminGroupId)
 
+    @Nullable
+    @Query('''SELECT DISTINCT 'true' from UserRole ur where ur.userId = ?1 and ur.roleName = 'ROLE_GLOBAL_BADGE_ADMIN' and ur.globalBadgeId = ?2''')
+    Boolean isUserGlobalBadgeAdmin(String userId, String projectId)
+
     void deleteByQuizIdAndAdminGroupIdAndRoleName(String quizId, String adminGroupId, RoleName roleName)
 
     void deleteByProjectIdAndAdminGroupIdAndRoleName(String quizId, String adminGroupId, RoleName roleName)