Removed isAdmin() from this service implementation.

Author: ocielliottc

server/src/main/java/com/objectcomputing/checkins/services/skills/combineskills/CombineSkillServicesImpl.java

@@ -1,5 +1,7 @@
 package com.objectcomputing.checkins.services.skills.combineskills;
 
+import com.objectcomputing.checkins.services.permissions.Permission;
+import com.objectcomputing.checkins.services.permissions.RequiredPermission;
 import com.objectcomputing.checkins.services.member_skill.MemberSkill;
 import com.objectcomputing.checkins.services.member_skill.MemberSkillServices;
 import com.objectcomputing.checkins.services.memberprofile.currentuser.CurrentUserServices;
@@ -32,10 +34,8 @@ public CombineSkillServicesImpl(SkillServices skillServices,
         this.currentUserServices = currentUserServices;
     }
 
+    @RequiredPermission(Permission.CAN_EDIT_SKILLS)
     public Skill combine(@NotNull @Valid CombineSkillsDTO skillDTO) {
-        final boolean isAdmin = currentUserServices.isAdmin();
-        permissionsValidation.validatePermissions(!isAdmin);
-
         Set<Skill> existingSkills = skillServices.findByValue(skillDTO.getName(), null);
         for (Skill existingSkill : existingSkills) {
             if (existingSkill.getName().equals(skillDTO.getName())) {

server/src/test/java/com/objectcomputing/checkins/services/skills/combineskills/CombineSkillsControllerTest.java

@@ -28,7 +28,6 @@
 
 import static com.objectcomputing.checkins.services.role.RoleType.Constants.ADMIN_ROLE;
 import static com.objectcomputing.checkins.services.role.RoleType.Constants.MEMBER_ROLE;
-import static com.objectcomputing.checkins.services.validate.PermissionsValidation.NOT_AUTHORIZED_MSG;
 import static org.junit.jupiter.api.Assertions.assertEquals;
 import static org.junit.jupiter.api.Assertions.assertNotNull;
 import static org.junit.jupiter.api.Assertions.assertThrows;
@@ -135,7 +134,7 @@ void testPOSTCombine2SkillsIntoOneNonAdmin() {
         String href = Objects.requireNonNull(body).get("_links").get("self").get("href").asText();
 
         assertEquals(request.getPath(), href);
-        assertEquals(NOT_AUTHORIZED_MSG, error);
+        assertEquals("Forbidden", error);
 
     }
 
@@ -305,4 +304,4 @@ void testPOSTCombine2SkillsIntoOneCheckMemberSkills() {
 
     }
 
-}
+}