EPMRPP-114304 || Refactor project user unassignment logic (#2639)

Author: grabsefx

src/main/java/com/epam/reportportal/base/core/organization/impl/OrganizationUsersHandlerImpl.java

@@ -43,6 +43,7 @@
 import com.epam.reportportal.api.model.UserProjectInfo;
 import com.epam.reportportal.base.core.organization.OrganizationUserService;
 import com.epam.reportportal.base.core.organization.OrganizationUsersHandler;
+import com.epam.reportportal.base.core.project.ProjectUserService;
 import com.epam.reportportal.base.infrastructure.persistence.commons.querygen.Queryable;
 import com.epam.reportportal.base.infrastructure.persistence.dao.ProjectRepository;
 import com.epam.reportportal.base.infrastructure.persistence.dao.ProjectUserRepository;
@@ -90,6 +91,7 @@ public class OrganizationUsersHandlerImpl implements OrganizationUsersHandler {
   private final UserRepository userRepository;
 
   private final ProjectUserRepository projectUserRepository;
+  private final ProjectUserService projectUserService;
   private final OrganizationUserRepository organizationUserRepository;
   private final OrganizationRepositoryCustom organizationRepositoryCustom;
   private final OrganizationUserService organizationUserService;
@@ -264,7 +266,7 @@ private void unassignUserProject(Long orgId, Long userId, List<Long> projectsId)
         .filter(projectId -> !projectsId.contains(projectId))
         .toList();
 
-    projectUserRepository.deleteByUserIdAndProjectIds(userId, projectIdsToUnassign);
+    projectUserService.deleteByUserIdAndProjectIds(orgId, userId, projectIdsToUnassign);
   }
 
   private void assignToProjects(List<UserProjectInfo> projects, User user, boolean isManager) {

src/main/java/com/epam/reportportal/base/core/project/ProjectUserService.java

@@ -1,10 +1,13 @@
 package com.epam.reportportal.base.core.project;
 
+import static com.epam.reportportal.base.util.SecurityContextUtils.getPrincipal;
+
 import com.epam.reportportal.base.core.events.domain.UnassignUserEvent;
 import com.epam.reportportal.base.core.user.UserService;
 import com.epam.reportportal.base.infrastructure.persistence.dao.ProjectUserRepository;
 import com.epam.reportportal.base.model.activity.UserActivityResource;
 import com.epam.reportportal.base.ws.converter.converters.UserConverter;
+import java.util.List;
 import lombok.RequiredArgsConstructor;
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.context.ApplicationEventPublisher;
@@ -31,4 +34,15 @@ public void unassignUserFromProjectsByOrgId(long orgId, long userId) {
         });
   }
 
+  public void deleteByUserIdAndProjectIds(Long orgId, Long userId, List<Long> projectIdsToUnassign) {
+    var unassignedUser = userService.findById(userId);
+    projectUserRepository.deleteByUserIdAndProjectIds(userId, projectIdsToUnassign)
+        .forEach(projectId -> {
+          UserActivityResource userActivityResource =
+              UserConverter.TO_ACTIVITY_RESOURCE.apply(unassignedUser, projectId);
+          applicationEventPublisher.publishEvent(
+              new UnassignUserEvent(userActivityResource, getPrincipal().getUserId(), getPrincipal().getUsername(),
+                  orgId));
+        });
+  }
 }

src/main/java/com/epam/reportportal/base/infrastructure/persistence/dao/ProjectUserRepository.java

@@ -77,9 +77,9 @@ public interface ProjectUserRepository
   @Modifying
   @Query(value =
       """
-            DELETE FROM project_user WHERE user_id = :userId AND project_id IN :projectIds
+            DELETE FROM project_user WHERE user_id = :userId AND project_id IN :projectIds RETURNING project_id;
           """, nativeQuery = true)
-  void deleteByUserIdAndProjectIds(@Param("userId") Long userId, @Param("projectIds") List<Long> projectIds);
+  List<Long> deleteByUserIdAndProjectIds(@Param("userId") Long userId, @Param("projectIds") List<Long> projectIds);
 
   /**
    * Deletes all entries from the project_user table for the specified project ID with user IDs in the provided list.

src/main/java/com/epam/reportportal/base/util/email/MailServiceFactory.java

@@ -197,14 +197,14 @@ public EmailService getDefaultEmailService(boolean checkConnection) {
         .map(IntegrationType::getId)
         .collect(Collectors.toList());
 
-    Integration globalIntegration = integrationRepository.findAllGlobalInIntegrationTypeIds(
-            integrationTypeIds).stream()
+    Integration globalIntegration = integrationRepository.findAllGlobalInIntegrationTypeIds(integrationTypeIds)
+        .stream()
         .filter(integration -> integration.isEnabled() && integration.getType().isEnabled())
         .findFirst()
         .orElseThrow(() -> emailConfigurationFail(null));
 
-    EmailService emailService = getEmailService(globalIntegration).orElseThrow(
-        () -> emailConfigurationFail(null));
+    EmailService emailService = getEmailService(globalIntegration)
+        .orElseThrow(() -> emailConfigurationFail(null));
 
     if (checkConnection) {
       checkConnection(emailService);