#3052 - adding role management for global badges. adding group admin support for global badges

Author: rmmayo

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

@@ -425,7 +425,7 @@ class AccessSettingsStorageService {
     }
 
     UserRole addGlobalBadgeAdminUserRoleForUser(String userId, String globalBadgeId, RoleName roleName, String adminGroupId = null) {
-        log.debug('Creating quiz id user-role for ID [{}] and role [{}] on quiz [{}]', userId, roleName, globalBadgeId, adminGroupId)
+        log.debug('Creating global badge id user-role for ID [{}] and role [{}] on global badge [{}]', userId, roleName, globalBadgeId, adminGroupId)
         String userIdLower = userId?.toLowerCase()
         User user = userRepository.findByUserId(userIdLower)
         if (user) {

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

@@ -83,7 +83,7 @@ class GlobalBadgeRoleService {
         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.addGlobalBadgeAdminUserRoleForUser(userId, badgeResult.badgeId, RoleName.ROLE_GLOBAL_BADGE_ADMIN)
+        accessSettingsStorageService.addGlobalBadgeAdminUserRoleForUser(userId, badgeResult.badgeId, RoleName.ROLE_GLOBAL_BADGE_ADMIN, adminGroupId)
 
         UserAttrs userAttrs = userAttrsRepo.findByUserIdIgnoreCase(userId)
         String userIdForDisplay = userAttrs?.userIdForDisplay ?: userId

service/src/main/java/skills/services/adminGroup/AdminGroupRoleService.groovy

@@ -28,6 +28,7 @@ import skills.controller.result.model.GlobalBadgeResult
 import skills.controller.result.model.ProjectResult
 import skills.controller.result.model.UserRoleRes
 import skills.services.AccessSettingsStorageService
+import skills.services.GlobalBadgeRoleService
 import skills.services.GlobalBadgesService
 import skills.services.admin.ProjAdminService
 import skills.services.admin.UserCommunityService
@@ -70,6 +71,9 @@ class AdminGroupRoleService {
     @Autowired
     GlobalBadgesService globalBadgesService
 
+    @Autowired
+    GlobalBadgeRoleService globalBadgeRoleService
+
     @Autowired
     UserNameService userNameService
 
@@ -118,6 +122,10 @@ class AdminGroupRoleService {
             projectIds.each { projectId ->
                 accessSettingsStorageService.addUserRole(userId, projectId, RoleName.ROLE_PROJECT_ADMIN, true, adminGroupDef.adminGroupId)
             }
+            List<String> globalBadgeIds = userRoleRepo.findGlobalBadgeIdsByAdminGroupId(adminGroupDef.adminGroupId)
+            globalBadgeIds.each { globalBadgeId ->
+                globalBadgeRoleService.addGlobalBadgeAdminRole(userId, globalBadgeId, RoleName.ROLE_GLOBAL_BADGE_ADMIN, adminGroupDef.adminGroupId)
+            }
         }
 
         UserAttrs userAttrs = userAttrsRepo.findByUserIdIgnoreCase(userId)

service/src/main/java/skills/services/adminGroup/AdminGroupService.groovy

@@ -226,6 +226,9 @@ class AdminGroupService {
         userRoleRepository.findQuizIdsByAdminGroupId(adminGroupId).each { quizId ->
             adminGroupRoleService.removeQuizFromAdminGroup(adminGroupId, quizId)
         }
+        userRoleRepository.findGlobalBadgeIdsByAdminGroupId(adminGroupId).each { badgeId ->
+            adminGroupRoleService.removeGlobalBadgeFromAdminGroup(adminGroupId, badgeId)
+        }
         adminGroupDefRepo.deleteByAdminGroupIdIgnoreCase(adminGroupDef.adminGroupId)
         log.debug("Deleted admin group with id [{}].", adminGroupId)
 

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

@@ -92,6 +92,9 @@ interface UserRoleRepo extends CrudRepository<UserRole, Integer> {
     @Nullable
     List<UserRole> findAllByQuizIdIgnoreCase(String quizId)
 
+    @Nullable
+    List<UserRole> findAllByGlobalBadgeIdIgnoreCase(String globalBadgeId)
+
     @Query('''SELECT count(ur.id)
         from UserRole ur, UserAttrs ua 
         where