Team request edit (#14)

flowinquiry · Nov 25, 2024 · 59f68b5 · 59f68b5
1 parent 6b58679
commit 59f68b5
Show file tree

Hide file tree

Showing 34 changed files with 207 additions and 94 deletions.
diff --git a/server/src/main/java/io/flexwork/modules/collab/repository/NotificationRepository.java b/server/src/main/java/io/flexwork/modules/collab/repository/NotificationRepository.java
@@ -2,6 +2,7 @@
 
 import io.flexwork.modules.collab.domain.Notification;
 import java.util.List;
+import org.springframework.data.domain.Sort;
 import org.springframework.data.jpa.repository.JpaRepository;
 import org.springframework.data.jpa.repository.Modifying;
 import org.springframework.data.jpa.repository.Query;
@@ -11,7 +12,7 @@
 @Repository
 public interface NotificationRepository extends JpaRepository<Notification, Long> {
 
-    List<Notification> findByUserIdAndIsReadFalse(Long userId);
+    List<Notification> findByUserIdAndIsReadFalse(Long userId, Sort sort);
 
     @Modifying
     @Query("UPDATE Notification n SET n.isRead = true WHERE n.id IN :ids")

diff --git a/server/src/main/java/io/flexwork/modules/collab/service/NotificationService.java b/server/src/main/java/io/flexwork/modules/collab/service/NotificationService.java
@@ -4,6 +4,7 @@
 import io.flexwork.modules.collab.service.dto.NotificationDTO;
 import io.flexwork.modules.collab.service.mapper.NotificationMapper;
 import java.util.List;
+import org.springframework.data.domain.Sort;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
 
@@ -22,7 +23,9 @@ public NotificationService(
 
     @Transactional(readOnly = true)
     public List<NotificationDTO> getUnreadNotificationsForUser(Long userId) {
-        return notificationRepository.findByUserIdAndIsReadFalse(userId).stream()
+        return notificationRepository
+                .findByUserIdAndIsReadFalse(userId, Sort.by(Sort.Direction.DESC, "createdAt"))
+                .stream()
                 .map(notificationMapper::toDTO)
                 .toList();
     }

diff --git a/server/src/main/java/io/flexwork/modules/crm/web/rest/AccountController.java b/server/src/main/java/io/flexwork/modules/crm/web/rest/AccountController.java
@@ -69,15 +69,15 @@ public ResponseEntity<Page<AccountDTO>> findAccounts(
         return new ResponseEntity<>(accounts, HttpStatus.OK);
     }
 
-    @GetMapping("/next/{currentId}")
+    @GetMapping("/{currentId}/next")
     public ResponseEntity<AccountDTO> getNextEntity(@PathVariable Long currentId) {
         return accountService
                 .getNextEntity(currentId)
                 .map(ResponseEntity::ok)
                 .orElse(ResponseEntity.notFound().build());
     }
 
-    @GetMapping("/previous/{currentId}")
+    @GetMapping("/{currentId}/previous")
     public ResponseEntity<AccountDTO> getPreviousEntity(@PathVariable Long currentId) {
         return accountService
                 .getPreviousEntity(currentId)

diff --git a/...k/modules/collab/domain/Organization.java → ...rk/modules/teams/domain/Organization.java b/...k/modules/collab/domain/Organization.java → ...rk/modules/teams/domain/Organization.java
@@ -1,4 +1,4 @@
-package io.flexwork.modules.collab.domain;
+package io.flexwork.modules.teams.domain;
 
 import jakarta.persistence.*;
 import java.util.Set;

diff --git a/.../flexwork/modules/collab/domain/Team.java → ...o/flexwork/modules/teams/domain/Team.java b/.../flexwork/modules/collab/domain/Team.java → ...o/flexwork/modules/teams/domain/Team.java
@@ -1,7 +1,5 @@
-package io.flexwork.modules.collab.domain;
+package io.flexwork.modules.teams.domain;
 
-import io.flexwork.modules.teams.domain.TeamWorkflowSelection;
-import io.flexwork.modules.teams.domain.Workflow;
 import io.flexwork.modules.usermanagement.domain.User;
 import io.flexwork.modules.usermanagement.domain.UserTeam;
 import jakarta.persistence.*;

diff --git a/server/src/main/java/io/flexwork/modules/teams/domain/TeamRequest.java b/server/src/main/java/io/flexwork/modules/teams/domain/TeamRequest.java
@@ -1,6 +1,5 @@
 package io.flexwork.modules.teams.domain;
 
-import io.flexwork.modules.collab.domain.Team;
 import io.flexwork.modules.usermanagement.domain.User;
 import jakarta.persistence.Column;
 import jakarta.persistence.Entity;

diff --git a/...xwork/modules/collab/domain/TeamRole.java → ...exwork/modules/teams/domain/TeamRole.java b/...xwork/modules/collab/domain/TeamRole.java → ...exwork/modules/teams/domain/TeamRole.java
@@ -1,4 +1,4 @@
-package io.flexwork.modules.collab.domain;
+package io.flexwork.modules.teams.domain;
 
 import jakarta.persistence.Column;
 import jakarta.persistence.Entity;

diff --git a/server/src/main/java/io/flexwork/modules/teams/domain/TeamWorkflowSelection.java b/server/src/main/java/io/flexwork/modules/teams/domain/TeamWorkflowSelection.java
@@ -1,6 +1,5 @@
 package io.flexwork.modules.teams.domain;
 
-import io.flexwork.modules.collab.domain.Team;
 import jakarta.persistence.Entity;
 import jakarta.persistence.GeneratedValue;
 import jakarta.persistence.GenerationType;

diff --git a/server/src/main/java/io/flexwork/modules/teams/domain/Workflow.java b/server/src/main/java/io/flexwork/modules/teams/domain/Workflow.java
@@ -1,6 +1,5 @@
 package io.flexwork.modules.teams.domain;
 
-import io.flexwork.modules.collab.domain.Team;
 import jakarta.persistence.CascadeType;
 import jakarta.persistence.Column;
 import jakarta.persistence.Entity;

diff --git a/...ab/repository/OrganizationRepository.java → ...ms/repository/OrganizationRepository.java b/...ab/repository/OrganizationRepository.java → ...ms/repository/OrganizationRepository.java
@@ -1,6 +1,6 @@
-package io.flexwork.modules.collab.repository;
+package io.flexwork.modules.teams.repository;
 
-import io.flexwork.modules.collab.domain.Organization;
+import io.flexwork.modules.teams.domain.Organization;
 import org.springframework.data.jpa.repository.JpaRepository;
 import org.springframework.data.jpa.repository.JpaSpecificationExecutor;
 import org.springframework.stereotype.Repository;

diff --git a/...les/collab/repository/TeamRepository.java → ...ules/teams/repository/TeamRepository.java b/...les/collab/repository/TeamRepository.java → ...ules/teams/repository/TeamRepository.java
@@ -1,7 +1,7 @@
-package io.flexwork.modules.collab.repository;
+package io.flexwork.modules.teams.repository;
 
-import io.flexwork.modules.collab.domain.Team;
-import io.flexwork.modules.collab.service.dto.TeamDTO;
+import io.flexwork.modules.teams.domain.Team;
+import io.flexwork.modules.teams.service.dto.TeamDTO;
 import io.flexwork.modules.usermanagement.domain.User;
 import io.flexwork.modules.usermanagement.service.dto.UserWithTeamRoleDTO;
 import java.util.List;
@@ -17,7 +17,7 @@
 @Repository
 public interface TeamRepository extends JpaRepository<Team, Long>, JpaSpecificationExecutor<Team> {
     @Query(
-            "SELECT new io.flexwork.modules.collab.service.dto.TeamDTO(t.id, t.name, t.logoUrl, t.slogan, t.description, t.organization.id, COUNT(m.id)) "
+            "SELECT new io.flexwork.modules.teams.service.dto.TeamDTO(t.id, t.name, t.logoUrl, t.slogan, t.description, t.organization.id, COUNT(m.id)) "
                     + "FROM Team t LEFT JOIN t.users m "
                     + "GROUP BY t.id")
     Page<TeamDTO> findAllDTOs(Specification<Team> spec, Pageable pageable);

diff --git a/server/src/main/java/io/flexwork/modules/teams/repository/TeamRequestRepository.java b/server/src/main/java/io/flexwork/modules/teams/repository/TeamRequestRepository.java
@@ -1,12 +1,15 @@
 package io.flexwork.modules.teams.repository;
 
 import io.flexwork.modules.teams.domain.TeamRequest;
+import java.util.Optional;
 import org.springframework.data.domain.Page;
 import org.springframework.data.domain.Pageable;
 import org.springframework.data.jpa.domain.Specification;
 import org.springframework.data.jpa.repository.EntityGraph;
 import org.springframework.data.jpa.repository.JpaRepository;
 import org.springframework.data.jpa.repository.JpaSpecificationExecutor;
+import org.springframework.data.jpa.repository.Query;
+import org.springframework.data.repository.query.Param;
 import org.springframework.stereotype.Repository;
 
 @Repository
@@ -15,4 +18,41 @@ public interface TeamRequestRepository
 
     @EntityGraph(attributePaths = {"team", "requestUser", "assignUser", "workflow"})
     Page<TeamRequest> findAll(Specification<TeamRequest> spec, Pageable pageable);
+
+    @EntityGraph(attributePaths = {"team", "requestUser", "assignUser", "workflow"})
+    Optional<TeamRequest> findById(@Param("id") Long id);
+
+    @EntityGraph(attributePaths = {"team", "requestUser", "assignUser", "workflow"})
+    @Query(
+            value =
+                    """
+        SELECT tr
+        FROM TeamRequest tr
+        WHERE tr.team.id = (
+            SELECT r.team.id
+            FROM TeamRequest r
+            WHERE r.id = :requestId
+        )
+        AND tr.id < :requestId
+        ORDER BY tr.id DESC
+            LIMIT 1
+    """)
+    Optional<TeamRequest> findPreviousEntity(@Param("requestId") Long requestId);
+
+    @EntityGraph(attributePaths = {"team", "requestUser", "assignUser", "workflow"})
+    @Query(
+            value =
+                    """
+        SELECT tr
+        FROM TeamRequest tr
+        WHERE tr.team.id = (
+            SELECT r.team.id
+            FROM TeamRequest r
+            WHERE r.id = :requestId
+        )
+        AND tr.id > :requestId
+        ORDER BY tr.id ASC
+            LIMIT 1
+    """)
+    Optional<TeamRequest> findNextEntity(@Param("requestId") Long requestId);
 }
diff --git a/...collab/repository/TeamRoleRepository.java → .../teams/repository/TeamRoleRepository.java b/...collab/repository/TeamRoleRepository.java → .../teams/repository/TeamRoleRepository.java
@@ -1,6 +1,6 @@
-package io.flexwork.modules.collab.repository;
+package io.flexwork.modules.teams.repository;
 
-import io.flexwork.modules.collab.domain.TeamRole;
+import io.flexwork.modules.teams.domain.TeamRole;
 import org.springframework.data.jpa.repository.JpaRepository;
 import org.springframework.stereotype.Repository;
 

diff --git a/...s/collab/service/OrganizationService.java → ...es/teams/service/OrganizationService.java b/...s/collab/service/OrganizationService.java → ...es/teams/service/OrganizationService.java
@@ -1,9 +1,9 @@
-package io.flexwork.modules.collab.service;
+package io.flexwork.modules.teams.service;
 
 import static io.flexwork.query.QueryUtils.createSpecification;
 
-import io.flexwork.modules.collab.domain.Organization;
-import io.flexwork.modules.collab.repository.OrganizationRepository;
+import io.flexwork.modules.teams.domain.Organization;
+import io.flexwork.modules.teams.repository.OrganizationRepository;
 import io.flexwork.query.QueryDTO;
 import jakarta.persistence.EntityNotFoundException;
 import java.util.Optional;

diff --git a/server/src/main/java/io/flexwork/modules/teams/service/TeamRequestService.java b/server/src/main/java/io/flexwork/modules/teams/service/TeamRequestService.java
@@ -2,15 +2,18 @@
 
 import static io.flexwork.query.QueryUtils.createSpecification;
 
-import io.flexwork.modules.collab.service.event.NewTeamRequestCreatedEvent;
 import io.flexwork.modules.teams.domain.TeamRequest;
 import io.flexwork.modules.teams.domain.WorkflowState;
 import io.flexwork.modules.teams.repository.TeamRequestRepository;
 import io.flexwork.modules.teams.repository.WorkflowRepository;
 import io.flexwork.modules.teams.repository.WorkflowStateRepository;
 import io.flexwork.modules.teams.service.dto.TeamRequestDTO;
+import io.flexwork.modules.teams.service.event.NewTeamRequestCreatedEvent;
 import io.flexwork.modules.teams.service.mapper.TeamRequestMapper;
 import io.flexwork.query.QueryDTO;
+import jakarta.persistence.EntityManager;
+import jakarta.persistence.EntityNotFoundException;
+import jakarta.persistence.PersistenceContext;
 import java.util.Objects;
 import java.util.Optional;
 import org.jclouds.rest.ResourceNotFoundException;
@@ -25,6 +28,7 @@
 @Service
 @Transactional
 public class TeamRequestService {
+    @PersistenceContext private EntityManager entityManager;
 
     private final TeamRequestRepository teamRequestRepository;
     private final TeamRequestMapper teamRequestMapper;
@@ -88,6 +92,13 @@ public TeamRequestDTO createTeamRequest(TeamRequestDTO teamRequestDTO) {
 
         TeamRequest teamRequest = teamRequestMapper.toEntity(teamRequestDTO);
         teamRequest = teamRequestRepository.save(teamRequest);
+        // Clear the persistence context to force a reload
+        entityManager.clear();
+
+        teamRequest =
+                teamRequestRepository
+                        .findById(teamRequest.getId())
+                        .orElseThrow(() -> new EntityNotFoundException("TeamRequest not found"));
         TeamRequestDTO savedTeamRequestDTO = teamRequestMapper.toDto(teamRequest);
         eventPublisher.publishEvent(new NewTeamRequestCreatedEvent(this, savedTeamRequestDTO));
         return savedTeamRequestDTO;
@@ -123,4 +134,12 @@ private static boolean hasTeamIdFilter(QueryDTO queryDTO) {
                         .filter(Objects::nonNull)
                         .anyMatch(filter -> "team.id".equals(filter.getField()));
     }
+
+    public Optional<TeamRequestDTO> getNextEntity(Long requestId) {
+        return teamRequestRepository.findNextEntity(requestId).map(teamRequestMapper::toDto);
+    }
+
+    public Optional<TeamRequestDTO> getPreviousEntity(Long requestId) {
+        return teamRequestRepository.findPreviousEntity(requestId).map(teamRequestMapper::toDto);
+    }
 }
diff --git a/...k/modules/collab/service/TeamService.java → ...rk/modules/teams/service/TeamService.java b/...k/modules/collab/service/TeamService.java → ...rk/modules/teams/service/TeamService.java
@@ -1,13 +1,13 @@
-package io.flexwork.modules.collab.service;
+package io.flexwork.modules.teams.service;
 
 import static io.flexwork.query.QueryUtils.createSpecification;
 
-import io.flexwork.modules.collab.domain.Team;
-import io.flexwork.modules.collab.domain.TeamRole;
-import io.flexwork.modules.collab.repository.TeamRepository;
-import io.flexwork.modules.collab.repository.TeamRoleRepository;
-import io.flexwork.modules.collab.service.dto.TeamDTO;
-import io.flexwork.modules.collab.service.mapper.TeamMapper;
+import io.flexwork.modules.teams.domain.Team;
+import io.flexwork.modules.teams.domain.TeamRole;
+import io.flexwork.modules.teams.repository.TeamRepository;
+import io.flexwork.modules.teams.repository.TeamRoleRepository;
+import io.flexwork.modules.teams.service.dto.TeamDTO;
+import io.flexwork.modules.teams.service.mapper.TeamMapper;
 import io.flexwork.modules.usermanagement.domain.User;
 import io.flexwork.modules.usermanagement.domain.UserTeam;
 import io.flexwork.modules.usermanagement.domain.UserTeamId;

diff --git a/...s/collab/service/dto/OrganizationDTO.java → ...es/teams/service/dto/OrganizationDTO.java b/...s/collab/service/dto/OrganizationDTO.java → ...es/teams/service/dto/OrganizationDTO.java
@@ -1,4 +1,4 @@
-package io.flexwork.modules.collab.service.dto;
+package io.flexwork.modules.teams.service.dto;
 
 import java.util.Set;
 import lombok.Builder;

diff --git a/...k/modules/collab/service/dto/TeamDTO.java → ...rk/modules/teams/service/dto/TeamDTO.java b/...k/modules/collab/service/dto/TeamDTO.java → ...rk/modules/teams/service/dto/TeamDTO.java
@@ -1,4 +1,4 @@
-package io.flexwork.modules.collab.service.dto;
+package io.flexwork.modules.teams.service.dto;
 
 import lombok.AllArgsConstructor;
 import lombok.Builder;

diff --git a/...ice/event/NewTeamRequestCreatedEvent.java → ...ice/event/NewTeamRequestCreatedEvent.java b/...ice/event/NewTeamRequestCreatedEvent.java → ...ice/event/NewTeamRequestCreatedEvent.java
@@ -1,4 +1,4 @@
-package io.flexwork.modules.collab.service.event;
+package io.flexwork.modules.teams.service.event;
 
 import io.flexwork.modules.teams.service.dto.TeamRequestDTO;
 import lombok.Getter;

diff --git a/...ce/listener/TeamRequestEventListener.java → ...ce/listener/TeamRequestEventListener.java b/...ce/listener/TeamRequestEventListener.java → ...ce/listener/TeamRequestEventListener.java
@@ -1,12 +1,13 @@
-package io.flexwork.modules.collab.service.listener;
+package io.flexwork.modules.teams.service.listener;
 
 import static j2html.TagCreator.*;
 
+import com.flexwork.platform.utils.Obfuscator;
 import io.flexwork.modules.collab.domain.Notification;
 import io.flexwork.modules.collab.repository.NotificationRepository;
-import io.flexwork.modules.collab.repository.TeamRepository;
-import io.flexwork.modules.collab.service.event.NewTeamRequestCreatedEvent;
+import io.flexwork.modules.teams.repository.TeamRepository;
 import io.flexwork.modules.teams.service.dto.TeamRequestDTO;
+import io.flexwork.modules.teams.service.event.NewTeamRequestCreatedEvent;
 import io.flexwork.modules.usermanagement.domain.User;
 import io.flexwork.modules.usermanagement.service.dto.UserWithTeamRoleDTO;
 import java.time.LocalDateTime;
@@ -31,15 +32,33 @@ public void onNewTeamRequestCreated(NewTeamRequestCreatedEvent event) {
         String html =
                 p(
                                 text("A new "),
-                                a("ticket request").withHref("#"),
-                                text(" has been just created by "),
-                                a("user").withHref("#"))
+                                a("ticket ")
+                                        .withHref(
+                                                "/portal/teams/"
+                                                        + Obfuscator.obfuscate(
+                                                                teamRequestDTO.getTeamId())
+                                                        + "/requests/"
+                                                        + Obfuscator.obfuscate(
+                                                                teamRequestDTO.getId())),
+                                text(" has been created by "),
+                                a(teamRequestDTO.getRequestUserName())
+                                        .withHref(
+                                                "/portals/users/"
+                                                        + Obfuscator.obfuscate(
+                                                                teamRequestDTO.getRequestUserId())))
                         .render();
 
         List<UserWithTeamRoleDTO> usersInTeam =
                 teamRepository.findUsersByTeamId(teamRequestDTO.getTeamId());
         List<Notification> notifications =
                 usersInTeam.stream()
+                        .filter(
+                                user ->
+                                        !user.getId()
+                                                .equals(
+                                                        teamRequestDTO
+                                                                .getRequestUserId())) // Exclude
+                        // creator
                         .map(
                                 user ->
                                         Notification.builder()

diff --git a/...ab/service/mapper/OrganizationMapper.java → ...ms/service/mapper/OrganizationMapper.java b/...ab/service/mapper/OrganizationMapper.java → ...ms/service/mapper/OrganizationMapper.java
@@ -1,9 +1,9 @@
-package io.flexwork.modules.collab.service.mapper;
+package io.flexwork.modules.teams.service.mapper;
 
-import io.flexwork.modules.collab.domain.Organization;
-import io.flexwork.modules.collab.domain.Team;
-import io.flexwork.modules.collab.service.dto.OrganizationDTO;
-import io.flexwork.modules.collab.service.dto.TeamDTO;
+import io.flexwork.modules.teams.domain.Organization;
+import io.flexwork.modules.teams.domain.Team;
+import io.flexwork.modules.teams.service.dto.OrganizationDTO;
+import io.flexwork.modules.teams.service.dto.TeamDTO;
 import java.util.Set;
 import java.util.stream.Collectors;
 import org.mapstruct.Mapper;

diff --git a/...les/collab/service/mapper/TeamMapper.java → ...ules/teams/service/mapper/TeamMapper.java b/...les/collab/service/mapper/TeamMapper.java → ...ules/teams/service/mapper/TeamMapper.java
@@ -1,8 +1,8 @@
-package io.flexwork.modules.collab.service.mapper;
+package io.flexwork.modules.teams.service.mapper;
 
-import io.flexwork.modules.collab.domain.Organization;
-import io.flexwork.modules.collab.domain.Team;
-import io.flexwork.modules.collab.service.dto.TeamDTO;
+import io.flexwork.modules.teams.domain.Organization;
+import io.flexwork.modules.teams.domain.Team;
+import io.flexwork.modules.teams.service.dto.TeamDTO;
 import org.mapstruct.Mapper;
 import org.mapstruct.Mapping;
 import org.mapstruct.MappingTarget;

diff --git a/server/src/main/java/io/flexwork/modules/teams/service/mapper/TeamRequestMapper.java b/server/src/main/java/io/flexwork/modules/teams/service/mapper/TeamRequestMapper.java
@@ -1,6 +1,6 @@
 package io.flexwork.modules.teams.service.mapper;
 
-import io.flexwork.modules.collab.domain.Team;
+import io.flexwork.modules.teams.domain.Team;
 import io.flexwork.modules.teams.domain.TeamRequest;
 import io.flexwork.modules.teams.domain.Workflow;
 import io.flexwork.modules.teams.service.dto.TeamRequestDTO;

diff --git a/server/src/main/java/io/flexwork/modules/teams/service/mapper/WorkflowMapper.java b/server/src/main/java/io/flexwork/modules/teams/service/mapper/WorkflowMapper.java
@@ -1,6 +1,6 @@
 package io.flexwork.modules.teams.service.mapper;
 
-import io.flexwork.modules.collab.domain.Team;
+import io.flexwork.modules.teams.domain.Team;
 import io.flexwork.modules.teams.domain.Workflow;
 import io.flexwork.modules.teams.service.dto.WorkflowDTO;
 import org.mapstruct.Mapper;