diff --git a/src/main/java/cz/muni/ics/kypo/userandgroup/controller/UsersRestController.java b/src/main/java/cz/muni/ics/kypo/userandgroup/controller/UsersRestController.java
index 124ae8ce38bd330a981221531100827789508291..9cea23fd21351cbe103e070d6b0c608117b7dde3 100644
--- a/src/main/java/cz/muni/ics/kypo/userandgroup/controller/UsersRestController.java
+++ b/src/main/java/cz/muni/ics/kypo/userandgroup/controller/UsersRestController.java
@@ -11,7 +11,6 @@ import cz.muni.ics.kypo.userandgroup.domain.User;
import cz.muni.ics.kypo.userandgroup.dto.PageResultResource;
import cz.muni.ics.kypo.userandgroup.dto.UsersImportDTO;
import cz.muni.ics.kypo.userandgroup.dto.group.GroupDTO;
-import cz.muni.ics.kypo.userandgroup.dto.group.NewGroupDTO;
import cz.muni.ics.kypo.userandgroup.dto.role.RoleDTO;
import cz.muni.ics.kypo.userandgroup.dto.user.*;
import cz.muni.ics.kypo.userandgroup.exceptions.BadRequestException;
diff --git a/src/main/java/cz/muni/ics/kypo/userandgroup/facade/IDMGroupFacade.java b/src/main/java/cz/muni/ics/kypo/userandgroup/facade/IDMGroupFacade.java
index 7ddaff5dc8ad63218b5f6dac67d72d3a6a7925fc..d2e8ad203ae0e2837a1bda7d773a9c329bfdcc64 100644
--- a/src/main/java/cz/muni/ics/kypo/userandgroup/facade/IDMGroupFacade.java
+++ b/src/main/java/cz/muni/ics/kypo/userandgroup/facade/IDMGroupFacade.java
@@ -67,12 +67,6 @@ public class IDMGroupFacade {
groupService.updateIDMGroup(groupToUpdate);
}
- public void addUser(Long groupId, Long userId) {
- IDMGroup groupToUpdate = groupService.getGroupById(groupId);
- User userToBeAdded = userService.getUserById(userId);
- groupService.addUserToGroup(groupToUpdate, userToBeAdded);
- }
-
@IsAdmin
@TransactionalWO
public void addUsersToGroup(Long groupId, AddUsersToGroupDTO addUsers) {
diff --git a/src/main/java/cz/muni/ics/kypo/userandgroup/service/RoleService.java b/src/main/java/cz/muni/ics/kypo/userandgroup/service/RoleService.java
index a0dc19e4a1024987bdae0f0b16f47ab696a3bc78..4003e7bc4e6a8b348954e1dced7cccbfae925d19 100644
--- a/src/main/java/cz/muni/ics/kypo/userandgroup/service/RoleService.java
+++ b/src/main/java/cz/muni/ics/kypo/userandgroup/service/RoleService.java
@@ -11,11 +11,7 @@ import org.springframework.data.domain.Page;
import org.springframework.data.domain.Pageable;
import org.springframework.stereotype.Service;
-import java.util.ArrayList;
-import java.util.HashSet;
-import java.util.List;
import java.util.Set;
-import java.util.stream.Collectors;
@Service
public class RoleService {
@@ -58,17 +54,4 @@ public class RoleService {
public Set<Role> getAllRolesOfMicroservice(String nameOfMicroservice) {
return roleRepository.getAllRolesByMicroserviceName(nameOfMicroservice);
}
-
- public Set<Role> getAllRolesByRoleTypes(Set<String> roleTypes) {
- Set<Role> resultRoles = roleRepository.getAllByRoleTypeIn(roleTypes);
- Set<String> resultRoleTypes = resultRoles.stream()
- .map(Role::getRoleType)
- .collect(Collectors.toSet());
- for (String roleType : roleTypes) {
- if (!resultRoleTypes.contains(roleType)) {
- throw new EntityNotFoundException(new EntityErrorDetail(Role.class, "roleType", roleType.getClass(), roleType, "Role '" + roleType + "' not found."));
- }
- }
- return resultRoles;
- }
}
diff --git a/src/main/java/cz/muni/ics/kypo/userandgroup/service/SecurityService.java b/src/main/java/cz/muni/ics/kypo/userandgroup/service/SecurityService.java
index da06218fe9702b0fc1c23c69906a7c9c2a1146cb..d816f257b9f721dcca5df43b582cf6fc835c4cd9 100644
--- a/src/main/java/cz/muni/ics/kypo/userandgroup/service/SecurityService.java
+++ b/src/main/java/cz/muni/ics/kypo/userandgroup/service/SecurityService.java
@@ -2,11 +2,9 @@ package cz.muni.ics.kypo.userandgroup.service;
import cz.muni.ics.kypo.userandgroup.domain.IDMGroup;
import cz.muni.ics.kypo.userandgroup.domain.User;
-import cz.muni.ics.kypo.userandgroup.enums.RoleType;
import cz.muni.ics.kypo.userandgroup.repository.IDMGroupRepository;
import cz.muni.ics.kypo.userandgroup.repository.UserRepository;
import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.security.core.GrantedAuthority;
import org.springframework.security.core.context.SecurityContextHolder;
import org.springframework.security.oauth2.server.resource.authentication.JwtAuthenticationToken;
import org.springframework.stereotype.Service;
diff --git a/src/main/java/cz/muni/ics/kypo/userandgroup/service/UserService.java b/src/main/java/cz/muni/ics/kypo/userandgroup/service/UserService.java
index bf517660b07f4d2cd1fe6228a2820661222c0a7c..9f2179584fdcf93486e1467a20cfaa033e06c093 100644
--- a/src/main/java/cz/muni/ics/kypo/userandgroup/service/UserService.java
+++ b/src/main/java/cz/muni/ics/kypo/userandgroup/service/UserService.java
@@ -5,9 +5,7 @@ import cz.muni.ics.kypo.userandgroup.domain.IDMGroup;
import cz.muni.ics.kypo.userandgroup.domain.QUser;
import cz.muni.ics.kypo.userandgroup.domain.Role;
import cz.muni.ics.kypo.userandgroup.domain.User;
-import cz.muni.ics.kypo.userandgroup.dto.user.InitialOIDCUserDto;
import cz.muni.ics.kypo.userandgroup.enums.dto.ImplicitGroupNames;
-import cz.muni.ics.kypo.userandgroup.exceptions.EntityConflictException;
import cz.muni.ics.kypo.userandgroup.exceptions.EntityErrorDetail;
import cz.muni.ics.kypo.userandgroup.exceptions.EntityNotFoundException;
import cz.muni.ics.kypo.userandgroup.exceptions.FileNotFoundException;
@@ -17,14 +15,11 @@ import cz.muni.ics.kypo.userandgroup.repository.UserRepository;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.dao.DataAccessException;
-import org.springframework.dao.DataIntegrityViolationException;
import org.springframework.data.domain.Page;
import org.springframework.data.domain.Pageable;
import org.springframework.stereotype.Service;
import java.io.IOException;
-import java.sql.SQLException;
import java.util.List;
import java.util.Optional;
import java.util.Set;
diff --git a/src/test/java/cz/muni/ics/kypo/userandgroup/controller/GroupsRestControllerTest.java b/src/test/java/cz/muni/ics/kypo/userandgroup/controller/GroupsRestControllerTest.java
index 0c9bb219424dbb7a98eb4e7497b74e87e3b1bd78..72f2e2a7b302f684575f9cd2ae330f3a8df07808 100644
--- a/src/test/java/cz/muni/ics/kypo/userandgroup/controller/GroupsRestControllerTest.java
+++ b/src/test/java/cz/muni/ics/kypo/userandgroup/controller/GroupsRestControllerTest.java
@@ -387,25 +387,6 @@ public class GroupsRestControllerTest {
return groupDTO;
}
- private NewGroupDTO getNewGroupDTO() {
- NewGroupDTO newGroupDTO = new NewGroupDTO();
- newGroupDTO.setName("GroupOne");
- newGroupDTO.setDescription("Group One");
- newGroupDTO.setGroupIdsOfImportedUsers(List.of(1L));
- newGroupDTO.setUsers(Set.of(getUserForGroupsDTO()));
-
- return newGroupDTO;
- }
-
- private UserForGroupsDTO getUserForGroupsDTO() {
- UserForGroupsDTO userDTO = new UserForGroupsDTO();
- userDTO.setId(1L);
- userDTO.setMail("kypo@mail.cz");
- userDTO.setFullName("KYPO LOCAL ADMIN");
- userDTO.setSub("kypo");
- return userDTO;
- }
-
private RoleDTO getAdminRoleDTO() {
RoleDTO adminRole = new RoleDTO();
adminRole.setId(1L);
diff --git a/src/test/java/cz/muni/ics/kypo/userandgroup/facade/IDMGroupFacadeTest.java b/src/test/java/cz/muni/ics/kypo/userandgroup/facade/IDMGroupFacadeTest.java
index 3e2046c60974c21313e0a0576febf7989147f955..db50f488c7cd936447172378761e280a17cc68fc 100644
--- a/src/test/java/cz/muni/ics/kypo/userandgroup/facade/IDMGroupFacadeTest.java
+++ b/src/test/java/cz/muni/ics/kypo/userandgroup/facade/IDMGroupFacadeTest.java
@@ -176,15 +176,6 @@ public class IDMGroupFacadeTest {
then(groupService).should().updateIDMGroup(group1);
}
- @Test
- public void addUser() {
- given(groupService.getGroupById(group2.getId())).willReturn(group2);
- given(userService.getUserById(user1.getId())).willReturn(user1);
-
- groupFacade.addUser(group2.getId(), user1.getId());
- then(groupService).should().addUserToGroup(group2, user1);
- }
-
@Test
public void addUsersToGroup() {
AddUsersToGroupDTO addUsersToGroupDTO = new AddUsersToGroupDTO();
diff --git a/src/test/java/cz/muni/ics/kypo/userandgroup/integration/UsersIntegrationTests.java b/src/test/java/cz/muni/ics/kypo/userandgroup/integration/UsersIntegrationTests.java
index 57db3d0e197f292f33acdae2e37b3d38c517ab4a..b25856bd39e9dc530cf80bd8164b9c8029db3f9d 100644
--- a/src/test/java/cz/muni/ics/kypo/userandgroup/integration/UsersIntegrationTests.java
+++ b/src/test/java/cz/muni/ics/kypo/userandgroup/integration/UsersIntegrationTests.java
@@ -176,23 +176,6 @@ public class UsersIntegrationTests {
assertEquals("Access is denied", ObjectConverter.getInitialExceptionMessage(exception));
}
-// @Test
-// public void getUsersWithGivenIdsWithAdminRole() throws Exception {
-// userRepository.saveAllAndFlush(Set.of(user1, user2, user3, user4));
-// TestAuthorityGranter.mockSpringSecurityContextForGetUserInfo(RoleType.ROLE_USER_AND_GROUP_ADMINISTRATOR, user3);
-// MockHttpServletResponse response = mvc.perform(get("/users/ids")
-// .param("ids", StringUtils.join(Set.of(user2.getId(), user4.getId()), ","))
-// .contentType(MediaType.APPLICATION_JSON))
-// .andExpect(status().isOk())
-// .andReturn().getResponse();
-// List<UserDTO> responseUsersDTOs = convertJsonBytesToObject(convertJsonBytesToObject(response.getContentAsString()),
-// new TypeReference<PageResultResource<UserDTO>>() {
-// }).getContent();
-// assertFalse(responseUsersDTOs.contains(convertToUserDTO(user1, Set.of(roleTrainee, roleOrganizer, roleGuest))));
-// assertTrue(responseUsersDTOs.contains(convertToUserDTO(user2, Set.of(roleTrainee, roleOrganizer, roleGuest))));
-// assertTrue(responseUsersDTOs.contains(convertToUserDTO(user4, Set.of(roleOrganizer))));
-// }
-
@Test
public void getUsersWithGivenIdsWithUserRole() throws Exception {
TestAuthorityGranter.mockSpringSecurityContextForGet(RoleType.ROLE_USER_AND_GROUP_USER);
@@ -213,19 +196,6 @@ public class UsersIntegrationTests {
.andExpect(status().isInternalServerError());
}
-// @Test
-// public void getUsersWithGivenIdsNotInDB() throws Exception {
-// userRepository.saveAll(Set.of(user1, user2, user3, user4));
-// MockHttpServletResponse response = mvc.perform(get("/users/ids")
-// .param("ids", StringUtils.join(Set.of(100, 200), ","))
-// .contentType(MediaType.APPLICATION_JSON))
-// .andExpect(status().isOk())
-// .andReturn().getResponse();
-// assertEquals(0, convertJsonBytesToObject(convertJsonBytesToObject(response.getContentAsString()),
-// new TypeReference<PageResultResource<UserDTO>>() {
-// }).getContent().size());
-// }
-
@Test
public void getUsersWithGivenIdsEmptyListOfIds() throws Exception {
userRepository.saveAll(Set.of());
@@ -339,15 +309,6 @@ public class UsersIntegrationTests {
assertTrue(responseUsersDTOs.contains(modelMapper.map(user4, UserForGroupsDTO.class)));
}
-// @Test
-// public void getUserWithAdministratorRole() throws Exception {
-// MockHttpServletResponse response = mvc.perform(get("/users/{id}", user1.getId())
-// .contentType(MediaType.APPLICATION_JSON))
-// .andExpect(status().isOk())
-// .andReturn().getResponse();
-// assertEquals(convertToUserDTO(user1, Set.of(roleTrainee, roleOrganizer, roleGuest)), convertJsonBytesToObject(response.getContentAsString(), UserDTO.class));
-// }
-
@Test
public void getUserWithUserRole() throws Exception {
TestAuthorityGranter.mockSpringSecurityContextForGet(RoleType.ROLE_USER_AND_GROUP_USER);
@@ -364,18 +325,6 @@ public class UsersIntegrationTests {
.andExpect(status().isInternalServerError());
}
-// @Test
-// public void getUserNotFound() throws Exception {
-// MockHttpServletResponse response = mvc.perform(get("/users/{id}", 100L)
-// .contentType(MediaType.APPLICATION_JSON))
-// .andExpect(status().isNotFound())
-// .andReturn().getResponse();
-// ApiEntityError error = convertJsonBytesToObject(response.getContentAsString(), ApiEntityError.class);
-// assertEquals(HttpStatus.NOT_FOUND, error.getStatus());
-// assertEntityDetailError(error.getEntityErrorDetail(), User.class, "id", "100", "Entity User (id: 100) not found.");
-//
-// }
-
@Test
public void getAllUsersNotInGivenGroup() throws Exception {
MockHttpServletResponse response = mvc.perform(get("/users/not-in-groups/{groupId}", group2.getId())
diff --git a/src/test/java/cz/muni/ics/kypo/userandgroup/service/MicroserviceServiceTest.java b/src/test/java/cz/muni/ics/kypo/userandgroup/service/MicroserviceServiceTest.java
index b3c86817f66939a5d7799693cbb0a8b1caf25692..ebbc084574b11702c70c6935a5a98b90074915c4 100644
--- a/src/test/java/cz/muni/ics/kypo/userandgroup/service/MicroserviceServiceTest.java
+++ b/src/test/java/cz/muni/ics/kypo/userandgroup/service/MicroserviceServiceTest.java
@@ -88,21 +88,6 @@ public class MicroserviceServiceTest {
assertThrows(EntityNotFoundException.class, () -> microserviceService.getMicroserviceByName(name));
}
- public void existsByName() {
- String name = "kypo-microservice";
- given(microserviceRepository.existsByName(name)).willReturn(true);
- boolean exists = microserviceService.existsByName(name);
- assertTrue(exists);
- }
-
- public void doesNotExistsByName() {
- String name = "kypo-microservice";
- given(microserviceRepository.existsByName(name)).willReturn(false);
- boolean exists = microserviceService.existsByName(name);
- assertFalse(exists);
- }
-
-
@Test
public void getMicroservices() {
Pageable pageable = PageRequest.of(0, 10);