From 84d3e30b7b672aca8faee09763cd5decef7306d4 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Dominik=20Pil=C3=A1r?= <xpilar3@fi.muni.cz>
Date: Tue, 23 Feb 2021 11:44:03 +0100
Subject: [PATCH] Rename methods in user management service api.
---
.../facade/TrainingDefinitionFacade.java | 18 ++++++++++-------
.../facade/TrainingInstanceFacade.java | 15 ++++++++------
.../adaptive/facade/TrainingRunFacade.java | 11 ++++++----
.../adaptive/service/SecurityService.java | 14 ++++++-------
.../adaptive/service/UserService.java | 20 -------------------
.../service/api/UserManagementServiceApi.java | 11 +++++-----
.../training/TrainingDefinitionService.java | 4 ++--
.../training/TrainingInstanceService.java | 5 ++---
.../service/training/TrainingRunService.java | 7 +++----
9 files changed, 45 insertions(+), 60 deletions(-)
diff --git a/src/main/java/cz/muni/ics/kypo/training/adaptive/facade/TrainingDefinitionFacade.java b/src/main/java/cz/muni/ics/kypo/training/adaptive/facade/TrainingDefinitionFacade.java
index 8daa63b2..2bbb7f45 100644
--- a/src/main/java/cz/muni/ics/kypo/training/adaptive/facade/TrainingDefinitionFacade.java
+++ b/src/main/java/cz/muni/ics/kypo/training/adaptive/facade/TrainingDefinitionFacade.java
@@ -23,6 +23,7 @@ import cz.muni.ics.kypo.training.adaptive.mapping.mapstruct.PhaseMapper;
import cz.muni.ics.kypo.training.adaptive.mapping.mapstruct.TrainingDefinitionMapper;
import cz.muni.ics.kypo.training.adaptive.service.SecurityService;
import cz.muni.ics.kypo.training.adaptive.service.UserService;
+import cz.muni.ics.kypo.training.adaptive.service.api.UserManagementServiceApi;
import cz.muni.ics.kypo.training.adaptive.service.training.TrainingDefinitionService;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.data.domain.Page;
@@ -49,6 +50,7 @@ public class TrainingDefinitionFacade {
private TrainingDefinitionService trainingDefinitionService;
private UserService userService;
+ private UserManagementServiceApi userManagementServiceApi;
private SecurityService securityService;
private TrainingDefinitionMapper trainingDefinitionMapper;
private PhaseMapper phaseMapper;
@@ -65,11 +67,13 @@ public class TrainingDefinitionFacade {
@Autowired
public TrainingDefinitionFacade(TrainingDefinitionService trainingDefinitionService,
UserService userService,
+ UserManagementServiceApi userManagementServiceApi,
SecurityService securityService,
TrainingDefinitionMapper trainingDefMapper,
PhaseMapper phaseMapper) {
this.trainingDefinitionService = trainingDefinitionService;
this.userService = userService;
+ this.userManagementServiceApi = userManagementServiceApi;
this.securityService = securityService;
this.trainingDefinitionMapper = trainingDefMapper;
this.phaseMapper = phaseMapper;
@@ -110,7 +114,7 @@ public class TrainingDefinitionFacade {
if (securityService.hasRole(RoleTypeSecurity.ROLE_ADAPTIVE_TRAINING_ADMINISTRATOR)) {
return mapToDtoAndAddArchivingInfo(trainingDefinitionService.findAll(predicate, pageable));
} else {
- Long loggedInUserId = userService.getLoggedInUserRefId();
+ Long loggedInUserId = userManagementServiceApi.getLoggedInUserRefId();
return mapToDtoAndAddArchivingInfo(trainingDefinitionService.findAll(predicate, pageable, loggedInUserId));
}
}
@@ -133,7 +137,7 @@ public class TrainingDefinitionFacade {
@IsOrganizerOrAdmin
@TransactionalRO
public PageResultResource<TrainingDefinitionInfoDTO> findAllForOrganizers(TDState state, Pageable pageable) {
- Long loggedInUserId = userService.getLoggedInUserRefId();
+ Long loggedInUserId = userManagementServiceApi.getLoggedInUserRefId();
if (state == TDState.RELEASED) {
return trainingDefinitionMapper.mapToPageResultResourceInfoDTO(
trainingDefinitionService.findAllForOrganizers(TDState.RELEASED, pageable));
@@ -224,7 +228,7 @@ public class TrainingDefinitionFacade {
@IsDesignerOrAdmin
@TransactionalRO
public PageResultResource<UserRefDTO> getUsersWithGivenRole(RoleType roleType, Pageable pageable, String givenName, String familyName) {
- return userService.getUsersByGivenRole(roleType, pageable, givenName, familyName);
+ return userManagementServiceApi.getUserRefsByRole(roleType, pageable, givenName, familyName);
}
/**
@@ -261,7 +265,7 @@ public class TrainingDefinitionFacade {
@IsDesignerOrOrganizerOrAdmin
public PageResultResource<UserRefDTO> getAuthors(Long trainingDefinitionId, Pageable pageable, String givenName, String familyName) {
TrainingDefinition trainingDefinition = trainingDefinitionService.findById(trainingDefinitionId);
- return userService.getUsersRefDTOByGivenUserIds(trainingDefinition.getAuthors().stream()
+ return userManagementServiceApi.getUserRefDTOsByUserIds(trainingDefinition.getAuthors().stream()
.map(UserRef::getUserRefId)
.collect(Collectors.toSet()),
pageable, givenName, familyName);
@@ -283,7 +287,7 @@ public class TrainingDefinitionFacade {
Set<Long> excludedUsers = trainingDefinition.getAuthors().stream()
.map(UserRef::getUserRefId)
.collect(Collectors.toSet());
- return userService.getUsersByGivenRoleAndNotWithGivenIds(RoleType.ROLE_TRAINING_DESIGNER, excludedUsers, pageable, givenName, familyName);
+ return userManagementServiceApi.getUserRefsByRoleAndNotWithIds(RoleType.ROLE_TRAINING_DESIGNER, excludedUsers, pageable, givenName, familyName);
}
/**
@@ -297,7 +301,7 @@ public class TrainingDefinitionFacade {
@TransactionalWO
public void editAuthors(Long trainingDefinitionId, Set<Long> authorsAddition, Set<Long> authorsRemoval) {
TrainingDefinition trainingDefinition = trainingDefinitionService.findById(trainingDefinitionId);
- Long loggedInUserRefId = userService.getLoggedInUserRefId();
+ Long loggedInUserRefId = userManagementServiceApi.getLoggedInUserRefId();
if (authorsRemoval != null && !authorsRemoval.isEmpty()) {
authorsRemoval.remove(loggedInUserRefId);
trainingDefinition.removeAuthorsByUserRefIds(authorsRemoval);
@@ -311,7 +315,7 @@ public class TrainingDefinitionFacade {
PageResultResource<UserRefDTO> authors;
int page = 0;
do {
- authors = userService.getUsersRefDTOByGivenUserIds(userRefIds, PageRequest.of(page, 999), null, null);
+ authors = userManagementServiceApi.getUserRefDTOsByUserIds(userRefIds, PageRequest.of(page, 999), null, null);
Set<Long> actualAuthorsIds = trainingDefinition.getAuthors().stream()
.map(UserRef::getUserRefId)
.collect(Collectors.toSet());
diff --git a/src/main/java/cz/muni/ics/kypo/training/adaptive/facade/TrainingInstanceFacade.java b/src/main/java/cz/muni/ics/kypo/training/adaptive/facade/TrainingInstanceFacade.java
index cb12dfb0..9064ff46 100644
--- a/src/main/java/cz/muni/ics/kypo/training/adaptive/facade/TrainingInstanceFacade.java
+++ b/src/main/java/cz/muni/ics/kypo/training/adaptive/facade/TrainingInstanceFacade.java
@@ -50,6 +50,7 @@ public class TrainingInstanceFacade {
private TrainingDefinitionService trainingDefinitionService;
private TrainingRunService trainingRunService;
private UserService userService;
+ private UserManagementServiceApi userManagementServiceApi;
private SecurityService securityService;
private SandboxServiceApi sandboxServiceApi;
private ElasticsearchServiceApi elasticsearchServiceApi;
@@ -74,6 +75,7 @@ public class TrainingInstanceFacade {
TrainingDefinitionService trainingDefinitionService,
TrainingRunService trainingRunService,
UserService userService,
+ UserManagementServiceApi userManagementServiceApi,
ElasticsearchServiceApi elasticsearchServiceApi,
SandboxServiceApi sandboxServiceApi,
SecurityService securityService,
@@ -83,6 +85,7 @@ public class TrainingInstanceFacade {
this.trainingDefinitionService = trainingDefinitionService;
this.trainingRunService = trainingRunService;
this.userService = userService;
+ this.userManagementServiceApi = userManagementServiceApi;
this.elasticsearchServiceApi = elasticsearchServiceApi;
this.sandboxServiceApi = sandboxServiceApi;
this.securityService = securityService;
@@ -116,7 +119,7 @@ public class TrainingInstanceFacade {
if (securityService.hasRole(RoleTypeSecurity.ROLE_ADAPTIVE_TRAINING_ADMINISTRATOR)) {
return trainingInstanceMapper.mapToPageResultResourceBasicView(trainingInstanceService.findAll(predicate, pageable));
}
- return trainingInstanceMapper.mapToPageResultResourceBasicView(trainingInstanceService.findAll(predicate, pageable, userService.getLoggedInUserRefId()));
+ return trainingInstanceMapper.mapToPageResultResourceBasicView(trainingInstanceService.findAll(predicate, pageable, userManagementServiceApi.getLoggedInUserRefId()));
}
/**
@@ -160,7 +163,7 @@ public class TrainingInstanceFacade {
PageResultResource<UserRefDTO> organizers;
int page = 0;
do {
- organizers = userService.getUsersRefDTOByGivenUserIds(userRefIdsOfOrganizers, PageRequest.of(page, 999), null, null);
+ organizers = userManagementServiceApi.getUserRefDTOsByUserIds(userRefIdsOfOrganizers, PageRequest.of(page, 999), null, null);
Set<Long> actualOrganizersIds = trainingInstance.getOrganizers().stream()
.map(UserRef::getUserRefId)
.collect(Collectors.toSet());
@@ -289,7 +292,7 @@ public class TrainingInstanceFacade {
private void addParticipantsToTrainingRunDTOs(List<TrainingRunDTO> trainingRunDTOS) {
trainingRunDTOS.forEach(trainingRunDTO ->
- trainingRunDTO.setParticipantRef(userService.getUserRefDTOByUserRefId(trainingRunDTO.getParticipantRef().getUserRefId())));
+ trainingRunDTO.setParticipantRef(userManagementServiceApi.getUserRefDTOByUserRefId(trainingRunDTO.getParticipantRef().getUserRefId())));
}
/**
@@ -327,7 +330,7 @@ public class TrainingInstanceFacade {
@TransactionalRO
public PageResultResource<UserRefDTO> getOrganizersOfTrainingInstance(Long trainingInstanceId, Pageable pageable, String givenName, String familyName) {
TrainingInstance trainingInstance = trainingInstanceService.findById(trainingInstanceId);
- return userService.getUsersRefDTOByGivenUserIds(trainingInstance.getOrganizers().stream()
+ return userManagementServiceApi.getUserRefDTOsByUserIds(trainingInstance.getOrganizers().stream()
.map(UserRef::getUserRefId)
.collect(Collectors.toSet()), pageable, givenName, familyName);
}
@@ -349,7 +352,7 @@ public class TrainingInstanceFacade {
Set<Long> excludedOrganizers = trainingInstance.getOrganizers().stream()
.map(UserRef::getUserRefId)
.collect(Collectors.toSet());
- return userService.getUsersByGivenRoleAndNotWithGivenIds(RoleType.ROLE_TRAINING_ORGANIZER, excludedOrganizers, pageable, givenName, familyName);
+ return userManagementServiceApi.getUserRefsByRoleAndNotWithIds(RoleType.ROLE_TRAINING_ORGANIZER, excludedOrganizers, pageable, givenName, familyName);
}
/**
@@ -364,7 +367,7 @@ public class TrainingInstanceFacade {
@TransactionalWO
public void editOrganizers(Long trainingInstanceId, Set<Long> organizersAddition, Set<Long> organizersRemoval) {
TrainingInstance trainingInstance = trainingInstanceService.findById(trainingInstanceId);
- Long loggedInUserRefId = userService.getLoggedInUserRefId();
+ Long loggedInUserRefId = userManagementServiceApi.getLoggedInUserRefId();
if (organizersRemoval != null && !organizersRemoval.isEmpty()) {
organizersRemoval.remove(loggedInUserRefId);
trainingInstance.removeOrganizersByUserRefIds(organizersRemoval);
diff --git a/src/main/java/cz/muni/ics/kypo/training/adaptive/facade/TrainingRunFacade.java b/src/main/java/cz/muni/ics/kypo/training/adaptive/facade/TrainingRunFacade.java
index b2999644..980b96fb 100644
--- a/src/main/java/cz/muni/ics/kypo/training/adaptive/facade/TrainingRunFacade.java
+++ b/src/main/java/cz/muni/ics/kypo/training/adaptive/facade/TrainingRunFacade.java
@@ -58,6 +58,7 @@ public class TrainingRunFacade {
private TrainingRunService trainingRunService;
private UserService userService;
+ private UserManagementServiceApi userManagementServiceApi;
private TrainingRunMapper trainingRunMapper;
private PhaseMapper phaseMapper;
@@ -73,10 +74,12 @@ public class TrainingRunFacade {
@Autowired
public TrainingRunFacade(TrainingRunService trainingRunService,
UserService userService,
+ UserManagementServiceApi userManagementServiceApi,
TrainingRunMapper trainingRunMapper,
PhaseMapper phaseMapper) {
this.trainingRunService = trainingRunService;
this.userService = userService;
+ this.userManagementServiceApi = userManagementServiceApi;
this.trainingRunMapper = trainingRunMapper;
this.phaseMapper = phaseMapper;
}
@@ -95,7 +98,7 @@ public class TrainingRunFacade {
TrainingRunByIdDTO trainingRunByIdDTO = trainingRunMapper.mapToFindByIdDTO(trainingRun);
trainingRunByIdDTO.setDefinitionId(trainingRun.getTrainingInstance().getTrainingDefinition().getId());
trainingRunByIdDTO.setInstanceId(trainingRun.getTrainingInstance().getId());
- trainingRunByIdDTO.setParticipantRef(userService.getUserRefDTOByUserRefId(trainingRunByIdDTO.getParticipantRef().getUserRefId()));
+ trainingRunByIdDTO.setParticipantRef(userManagementServiceApi.getUserRefDTOByUserRefId(trainingRunByIdDTO.getParticipantRef().getUserRefId()));
return trainingRunByIdDTO;
}
@@ -177,7 +180,7 @@ public class TrainingRunFacade {
public AccessTrainingRunDTO accessTrainingRun(String accessToken) {
TrainingInstance trainingInstance = trainingRunService.getTrainingInstanceForParticularAccessToken(accessToken);
// checking if the user is not accessing to his existing training run (resume action)
- Long participantRefId = userService.getLoggedInUserRefId();
+ Long participantRefId = userManagementServiceApi.getLoggedInUserRefId();
Optional<TrainingRun> accessedTrainingRun = trainingRunService.findRunningTrainingRunOfUser(accessToken, participantRefId);
if (accessedTrainingRun.isPresent()) {
return convertToAccessTrainingRunDTO(trainingRunService.resumeTrainingRun(accessedTrainingRun.get().getId()));
@@ -353,12 +356,12 @@ public class TrainingRunFacade {
@TransactionalRO
public UserRefDTO getParticipant(Long trainingRunId) {
TrainingRun trainingRun = trainingRunService.findById(trainingRunId);
- return userService.getUserRefDTOByUserRefId(trainingRun.getParticipantRef().getUserRefId());
+ return userManagementServiceApi.getUserRefDTOByUserRefId(trainingRun.getParticipantRef().getUserRefId());
}
private void addParticipantsToTrainingRunDTOs(List<TrainingRunDTO> trainingRunDTOS) {
trainingRunDTOS.forEach(trainingRunDTO ->
- trainingRunDTO.setParticipantRef(userService.getUserRefDTOByUserRefId(trainingRunDTO.getParticipantRef().getUserRefId())));
+ trainingRunDTO.setParticipantRef(userManagementServiceApi.getUserRefDTOByUserRefId(trainingRunDTO.getParticipantRef().getUserRefId())));
}
private PageResultResource<AccessedTrainingRunDTO> convertToAccessedRunDTO(Page<TrainingRun> trainingRuns, String sortByTitle) {
diff --git a/src/main/java/cz/muni/ics/kypo/training/adaptive/service/SecurityService.java b/src/main/java/cz/muni/ics/kypo/training/adaptive/service/SecurityService.java
index f9ef5b3b..5f66ba7a 100644
--- a/src/main/java/cz/muni/ics/kypo/training/adaptive/service/SecurityService.java
+++ b/src/main/java/cz/muni/ics/kypo/training/adaptive/service/SecurityService.java
@@ -1,11 +1,9 @@
package cz.muni.ics.kypo.training.adaptive.service;
import cz.muni.ics.kypo.training.adaptive.annotations.transactions.TransactionalRO;
-import cz.muni.ics.kypo.training.adaptive.domain.UserRef;
import cz.muni.ics.kypo.training.adaptive.domain.training.TrainingDefinition;
import cz.muni.ics.kypo.training.adaptive.domain.training.TrainingInstance;
import cz.muni.ics.kypo.training.adaptive.domain.training.TrainingRun;
-import cz.muni.ics.kypo.training.adaptive.dto.UserRefDTO;
import cz.muni.ics.kypo.training.adaptive.enums.RoleTypeSecurity;
import cz.muni.ics.kypo.training.adaptive.exceptions.*;
import cz.muni.ics.kypo.training.adaptive.repository.training.TrainingDefinitionRepository;
@@ -60,7 +58,7 @@ public class SecurityService {
TrainingRun trainingRun = trainingRunRepository.findById(trainingRunId)
.orElseThrow(() -> new EntityNotFoundException(new EntityErrorDetail(TrainingRun.class, "id", trainingRunId.getClass(),
trainingRunId, "The necessary permissions are required for a resource.")));
- return trainingRun.getParticipantRef().getUserRefId().equals(userManagementServiceApi.getUserRefIdFromUserAndGroup());
+ return trainingRun.getParticipantRef().getUserRefId().equals(userManagementServiceApi.getLoggedInUserRefId());
}
/**
@@ -74,7 +72,7 @@ public class SecurityService {
.orElseThrow(() -> new EntityNotFoundException(new EntityErrorDetail(TrainingInstance.class, "id", instanceId.getClass(),
instanceId, "The necessary permissions are required for a resource.")));
return trainingInstance.getOrganizers().stream()
- .anyMatch(o -> o.getUserRefId().equals(userManagementServiceApi.getUserRefIdFromUserAndGroup()));
+ .anyMatch(o -> o.getUserRefId().equals(userManagementServiceApi.getLoggedInUserRefId()));
}
/**
@@ -88,7 +86,7 @@ public class SecurityService {
.orElseThrow(() -> new EntityNotFoundException(new EntityErrorDetail(TrainingRun.class, "id", trainingRunId.getClass(),
trainingRunId, "The necessary permissions are required for a resource.")));
return trainingRun.getTrainingInstance().getOrganizers().stream()
- .anyMatch(o -> o.getUserRefId().equals(userManagementServiceApi.getUserRefIdFromUserAndGroup()));
+ .anyMatch(o -> o.getUserRefId().equals(userManagementServiceApi.getLoggedInUserRefId()));
}
/**
@@ -101,7 +99,7 @@ public class SecurityService {
TrainingDefinition trainingDefinition = trainingDefinitionRepository.findById(definitionId)
.orElseThrow(() -> new ForbiddenException("The necessary permissions are required for a resource."));
return trainingDefinition.getAuthors().stream()
- .anyMatch(a -> a.getUserRefId().equals(userManagementServiceApi.getUserRefIdFromUserAndGroup()));
+ .anyMatch(a -> a.getUserRefId().equals(userManagementServiceApi.getLoggedInUserRefId()));
}
/**
@@ -114,7 +112,7 @@ public class SecurityService {
TrainingDefinition trainingDefinition = trainingDefinitionRepository.findByPhaseId(phaseId)
.orElseThrow(() -> new ForbiddenException("The necessary permissions are required for a resource."));
return trainingDefinition.getAuthors().stream()
- .anyMatch(a -> a.getUserRefId().equals(userManagementServiceApi.getUserRefIdFromUserAndGroup()));
+ .anyMatch(a -> a.getUserRefId().equals(userManagementServiceApi.getLoggedInUserRefId()));
}
/**
@@ -127,7 +125,7 @@ public class SecurityService {
TrainingDefinition trainingDefinition = trainingDefinitionRepository.findByTaskId(taskId)
.orElseThrow(() -> new ForbiddenException("The necessary permissions are required for a resource."));
return trainingDefinition.getAuthors().stream()
- .anyMatch(a -> a.getUserRefId().equals(userManagementServiceApi.getUserRefIdFromUserAndGroup()));
+ .anyMatch(a -> a.getUserRefId().equals(userManagementServiceApi.getLoggedInUserRefId()));
}
/**
diff --git a/src/main/java/cz/muni/ics/kypo/training/adaptive/service/UserService.java b/src/main/java/cz/muni/ics/kypo/training/adaptive/service/UserService.java
index c3fab535..23d48fd7 100644
--- a/src/main/java/cz/muni/ics/kypo/training/adaptive/service/UserService.java
+++ b/src/main/java/cz/muni/ics/kypo/training/adaptive/service/UserService.java
@@ -70,24 +70,4 @@ public class UserService {
LOG.info("User ref with user_ref_id: {} created.", userRef.getUserRefId());
return userRef;
}
-
- public UserRefDTO getUserRefDTOByUserRefId(Long id) {
- return userManagementServiceApi.getUserRefDTOByUserRefId(id);
- }
-
- public Long getLoggedInUserRefId() {
- return userManagementServiceApi.getUserRefIdFromUserAndGroup();
- }
-
- public PageResultResource<UserRefDTO> getUsersRefDTOByGivenUserIds(Set<Long> userRefIds, Pageable pageable, String givenName, String familyName) {
- return userManagementServiceApi.getUsersRefDTOByGivenUserIds(userRefIds, pageable, givenName, familyName);
- }
-
- public PageResultResource<UserRefDTO> getUsersByGivenRoleAndNotWithGivenIds(RoleType roleType, Set<Long> userRefIds, Pageable pageable, String givenName, String familyName) {
- return userManagementServiceApi.getUsersByGivenRoleAndNotWithGivenIds(roleType, userRefIds, pageable, givenName, familyName);
- }
-
- public PageResultResource<UserRefDTO> getUsersByGivenRole(RoleType roleType, Pageable pageable, String givenName, String familyName) {
- return userManagementServiceApi.getUsersByGivenRole(roleType, pageable, givenName, familyName);
- }
}
diff --git a/src/main/java/cz/muni/ics/kypo/training/adaptive/service/api/UserManagementServiceApi.java b/src/main/java/cz/muni/ics/kypo/training/adaptive/service/api/UserManagementServiceApi.java
index d7574cf0..b61b56d0 100644
--- a/src/main/java/cz/muni/ics/kypo/training/adaptive/service/api/UserManagementServiceApi.java
+++ b/src/main/java/cz/muni/ics/kypo/training/adaptive/service/api/UserManagementServiceApi.java
@@ -27,7 +27,6 @@ import java.util.Set;
public class UserManagementServiceApi {
private static final Logger LOG = LoggerFactory.getLogger(UserManagementServiceApi.class);
-
private WebClient userManagementServiceWebClient;
/**
@@ -68,7 +67,7 @@ public class UserManagementServiceApi {
* @param familyName optional parameter used for filtration
* @return the users with given user ref ids
*/
- public PageResultResource<UserRefDTO> getUsersRefDTOByGivenUserIds(Set<Long> userRefIds, Pageable pageable, String givenName, String familyName) {
+ public PageResultResource<UserRefDTO> getUserRefDTOsByUserIds(Set<Long> userRefIds, Pageable pageable, String givenName, String familyName) {
if (userRefIds.isEmpty()) {
return new PageResultResource<>(Collections.emptyList(), new PageResultResource.Pagination(0, 0, pageable.getPageSize(), 0, 0));
}
@@ -101,7 +100,7 @@ public class UserManagementServiceApi {
* @param familyName optional parameter used for filtration
* @return list of users with given role
*/
- public PageResultResource<UserRefDTO> getUsersByGivenRole(RoleType roleType, Pageable pageable, String givenName, String familyName) {
+ public PageResultResource<UserRefDTO> getUserRefsByRole(RoleType roleType, Pageable pageable, String givenName, String familyName) {
try {
return userManagementServiceWebClient
.get()
@@ -132,7 +131,7 @@ public class UserManagementServiceApi {
* @param familyName optional parameter used for filtration
* @return list of users with given role
*/
- public PageResultResource<UserRefDTO> getUsersByGivenRoleAndNotWithGivenIds(RoleType roleType, Set<Long> userRefIds, Pageable pageable, String givenName, String familyName) {
+ public PageResultResource<UserRefDTO> getUserRefsByRoleAndNotWithIds(RoleType roleType, Set<Long> userRefIds, Pageable pageable, String givenName, String familyName) {
try {
return userManagementServiceWebClient
.get()
@@ -159,7 +158,7 @@ public class UserManagementServiceApi {
*
* @return the user ref id from user and group
*/
- public Long getUserRefIdFromUserAndGroup() {
+ public Long getLoggedInUserRefId() {
try {
UserRefDTO userRefDTO = userManagementServiceWebClient
.get()
@@ -179,7 +178,7 @@ public class UserManagementServiceApi {
*
* @return the user ref id from user and group
*/
- public UserRefDTO getUserRefFromUserAndGroup() {
+ public UserRefDTO getUserRefDTO() {
try {
UserRefDTO userRefDTO = userManagementServiceWebClient
.get()
diff --git a/src/main/java/cz/muni/ics/kypo/training/adaptive/service/training/TrainingDefinitionService.java b/src/main/java/cz/muni/ics/kypo/training/adaptive/service/training/TrainingDefinitionService.java
index db69286f..6ab5b96c 100644
--- a/src/main/java/cz/muni/ics/kypo/training/adaptive/service/training/TrainingDefinitionService.java
+++ b/src/main/java/cz/muni/ics/kypo/training/adaptive/service/training/TrainingDefinitionService.java
@@ -421,11 +421,11 @@ public class TrainingDefinitionService {
}
private void addLoggedInUserToTrainingDefinitionAsAuthor(TrainingDefinition trainingDefinition) {
- Optional<UserRef> user = userRefRepository.findUserByUserRefId(userManagementServiceApi.getUserRefIdFromUserAndGroup());
+ Optional<UserRef> user = userRefRepository.findUserByUserRefId(userManagementServiceApi.getLoggedInUserRefId());
if (user.isPresent()) {
trainingDefinition.addAuthor(user.get());
} else {
- UserRef newUser = new UserRef(userManagementServiceApi.getUserRefIdFromUserAndGroup());
+ UserRef newUser = new UserRef(userManagementServiceApi.getLoggedInUserRefId());
trainingDefinition.addAuthor(newUser);
}
trainingDefinition.setLastEdited(getCurrentTimeInUTC());
diff --git a/src/main/java/cz/muni/ics/kypo/training/adaptive/service/training/TrainingInstanceService.java b/src/main/java/cz/muni/ics/kypo/training/adaptive/service/training/TrainingInstanceService.java
index 5c6f7e7a..18c0ac6f 100644
--- a/src/main/java/cz/muni/ics/kypo/training/adaptive/service/training/TrainingInstanceService.java
+++ b/src/main/java/cz/muni/ics/kypo/training/adaptive/service/training/TrainingInstanceService.java
@@ -12,7 +12,6 @@ import cz.muni.ics.kypo.training.adaptive.repository.AccessTokenRepository;
import cz.muni.ics.kypo.training.adaptive.repository.UserRefRepository;
import cz.muni.ics.kypo.training.adaptive.repository.training.TrainingInstanceRepository;
import cz.muni.ics.kypo.training.adaptive.repository.training.TrainingRunRepository;
-import cz.muni.ics.kypo.training.adaptive.service.SecurityService;
import cz.muni.ics.kypo.training.adaptive.service.api.UserManagementServiceApi;
import org.apache.commons.lang3.RandomStringUtils;
import org.slf4j.Logger;
@@ -204,11 +203,11 @@ public class TrainingInstanceService {
}
private void addLoggedInUserAsOrganizerToTrainingInstance(TrainingInstance trainingInstance) {
- Optional<UserRef> authorOfTrainingInstance = organizerRefRepository.findUserByUserRefId(userManagementServiceApi.getUserRefIdFromUserAndGroup());
+ Optional<UserRef> authorOfTrainingInstance = organizerRefRepository.findUserByUserRefId(userManagementServiceApi.getLoggedInUserRefId());
if (authorOfTrainingInstance.isPresent()) {
trainingInstance.addOrganizer(authorOfTrainingInstance.get());
} else {
- UserRef userRef = new UserRef(userManagementServiceApi.getUserRefIdFromUserAndGroup());
+ UserRef userRef = new UserRef(userManagementServiceApi.getLoggedInUserRefId());
trainingInstance.addOrganizer(organizerRefRepository.save(userRef));
}
}
diff --git a/src/main/java/cz/muni/ics/kypo/training/adaptive/service/training/TrainingRunService.java b/src/main/java/cz/muni/ics/kypo/training/adaptive/service/training/TrainingRunService.java
index 28270418..f1924170 100644
--- a/src/main/java/cz/muni/ics/kypo/training/adaptive/service/training/TrainingRunService.java
+++ b/src/main/java/cz/muni/ics/kypo/training/adaptive/service/training/TrainingRunService.java
@@ -15,7 +15,6 @@ import cz.muni.ics.kypo.training.adaptive.repository.UserRefRepository;
import cz.muni.ics.kypo.training.adaptive.repository.phases.AbstractPhaseRepository;
import cz.muni.ics.kypo.training.adaptive.repository.training.TrainingInstanceRepository;
import cz.muni.ics.kypo.training.adaptive.repository.training.TrainingRunRepository;
-import cz.muni.ics.kypo.training.adaptive.service.SecurityService;
import cz.muni.ics.kypo.training.adaptive.service.api.ElasticsearchServiceApi;
import cz.muni.ics.kypo.training.adaptive.service.api.SandboxServiceApi;
import cz.muni.ics.kypo.training.adaptive.service.api.UserManagementServiceApi;
@@ -156,7 +155,7 @@ public class TrainingRunService {
* @return {@link TrainingRun}s of logged in user.
*/
public Page<TrainingRun> findAllByParticipantRefUserRefId(Pageable pageable) {
- return trainingRunRepository.findAllByParticipantRefId(userManagementServiceApi.getUserRefIdFromUserAndGroup(), pageable);
+ return trainingRunRepository.findAllByParticipantRefId(userManagementServiceApi.getLoggedInUserRefId(), pageable);
}
/**
@@ -214,7 +213,7 @@ public class TrainingRunService {
* @return {@link TrainingRun}s of specific Training Definition of logged in user
*/
public Page<TrainingRun> findAllByTrainingDefinitionAndParticipant(Long definitionId, Pageable pageable) {
- return trainingRunRepository.findAllByTrainingDefinitionIdAndParticipantUserRefId(definitionId, userManagementServiceApi.getUserRefIdFromUserAndGroup(), pageable);
+ return trainingRunRepository.findAllByTrainingDefinitionIdAndParticipantUserRefId(definitionId, userManagementServiceApi.getLoggedInUserRefId(), pageable);
}
/**
@@ -321,7 +320,7 @@ public class TrainingRunService {
if (userRefOpt.isPresent()) {
newTrainingRun.setParticipantRef(userRefOpt.get());
} else {
- newTrainingRun.setParticipantRef(participantRefRepository.save(new UserRef(userManagementServiceApi.getUserRefIdFromUserAndGroup())));
+ newTrainingRun.setParticipantRef(participantRefRepository.save(new UserRef(userManagementServiceApi.getLoggedInUserRefId())));
}
newTrainingRun.setQuestionnaireResponses("[]");
newTrainingRun.setState(TRState.RUNNING);
--
GitLab