Update

flowinquiry · Dec 8, 2024 · 51e17ab · 51e17ab
1 parent 84e2b8a
commit 51e17ab
Show file tree

Hide file tree

Showing 10 changed files with 53 additions and 186 deletions.
diff --git a/server/src/main/java/io/flexwork/modules/teams/repository/WorkflowRepository.java b/server/src/main/java/io/flexwork/modules/teams/repository/WorkflowRepository.java
@@ -5,12 +5,14 @@
 import java.util.Optional;
 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
-public interface WorkflowRepository extends JpaRepository<Workflow, Long> {
+public interface WorkflowRepository
+        extends JpaRepository<Workflow, Long>, JpaSpecificationExecutor<Workflow> {
 
     @Query(
             """

diff --git a/server/src/main/java/io/flexwork/modules/teams/service/WorkflowService.java b/server/src/main/java/io/flexwork/modules/teams/service/WorkflowService.java
@@ -1,5 +1,7 @@
 package io.flexwork.modules.teams.service;
 
+import static io.flexwork.query.QueryUtils.createSpecification;
+
 import io.flexwork.modules.teams.domain.Workflow;
 import io.flexwork.modules.teams.domain.WorkflowState;
 import io.flexwork.modules.teams.domain.WorkflowTransition;
@@ -11,9 +13,13 @@
 import io.flexwork.modules.teams.service.mapper.WorkflowMapper;
 import io.flexwork.modules.teams.service.mapper.WorkflowStateMapper;
 import io.flexwork.modules.teams.service.mapper.WorkflowTransitionMapper;
+import io.flexwork.query.QueryDTO;
 import java.util.List;
 import java.util.Optional;
 import java.util.stream.Collectors;
+import org.springframework.data.domain.Page;
+import org.springframework.data.domain.Pageable;
+import org.springframework.data.jpa.domain.Specification;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
 
@@ -48,13 +54,8 @@ public WorkflowService(
     }
 
     @Transactional
-    public Workflow createWorkflow(Workflow workflow) {
-        return workflowRepository.save(workflow);
-    }
-
-    @Transactional(readOnly = true)
-    public List<Workflow> getAllWorkflows() {
-        return workflowRepository.findAll();
+    public WorkflowDTO createWorkflow(Workflow workflow) {
+        return workflowMapper.toDto(workflowRepository.save(workflow));
     }
 
     @Transactional(readOnly = true)
@@ -63,14 +64,13 @@ public Optional<Workflow> getWorkflowById(Long id) {
     }
 
     @Transactional
-    public Workflow updateWorkflow(Long id, Workflow updatedWorkflow) {
+    public WorkflowDTO updateWorkflow(Long id, WorkflowDTO updatedWorkflow) {
         return workflowRepository
                 .findById(id)
                 .map(
                         existingWorkflow -> {
-                            existingWorkflow.setName(updatedWorkflow.getName());
-                            existingWorkflow.setDescription(updatedWorkflow.getDescription());
-                            return workflowRepository.save(existingWorkflow);
+                            workflowMapper.updateEntity(updatedWorkflow, existingWorkflow);
+                            return workflowMapper.toDto(workflowRepository.save(existingWorkflow));
                         })
                 .orElseThrow(
                         () -> new IllegalArgumentException("Workflow not found with id: " + id));
@@ -100,7 +100,13 @@ public List<WorkflowDTO> getWorkflowsForTeam(Long teamId) {
     public Optional<WorkflowDetailedDTO> getWorkflowDetail(Long workflowId) {
         return workflowRepository
                 .findWithDetailsById(workflowId)
-                .map(workflowMapper::toDetailedDTO);
+                .map(workflowMapper::toDetailedDto);
+    }
+
+    @Transactional(readOnly = true)
+    public Page<WorkflowDTO> findWorkflows(Optional<QueryDTO> queryDTO, Pageable pageable) {
+        Specification<Workflow> spec = createSpecification(queryDTO);
+        return workflowRepository.findAll(spec, pageable).map(workflowMapper::toDto);
     }
 
     @Transactional
@@ -153,6 +159,6 @@ public WorkflowDetailedDTO saveWorkflow(WorkflowDetailedDTO dto) {
                         .collect(Collectors.toList());
         workflowTransitionRepository.saveAll(transitions);
 
-        return workflowMapper.toDetailedDTO(workflow);
+        return workflowMapper.toDetailedDto(workflow);
     }
 }
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
@@ -5,6 +5,7 @@
 import io.flexwork.modules.teams.service.dto.WorkflowDetailedDTO;
 import org.mapstruct.Mapper;
 import org.mapstruct.Mapping;
+import org.mapstruct.MappingTarget;
 
 @Mapper(
         componentModel = "spring",
@@ -18,5 +19,7 @@ public interface WorkflowMapper {
 
     @Mapping(source = "owner.name", target = "ownerName")
     @Mapping(source = "owner.id", target = "ownerId")
-    WorkflowDetailedDTO toDetailedDTO(Workflow workflow);
+    WorkflowDetailedDTO toDetailedDto(Workflow workflow);
+
+    Workflow updateEntity(WorkflowDTO workflowDTO, @MappingTarget Workflow workflow);
 }
diff --git a/server/src/main/java/io/flexwork/modules/teams/web/rest/TeamController.java b/server/src/main/java/io/flexwork/modules/teams/web/rest/TeamController.java
@@ -88,9 +88,8 @@ public ResponseEntity<TeamDTO> updateTeam(
         }
         TeamDTO updatedTeam = teamService.updateTeam(team);
         // Remove the old logo
-        if (fileRemovedPath.isPresent()) {
-            eventPublisher.publishEvent(new ResourceRemoveEvent(this, fileRemovedPath.get()));
-        }
+        fileRemovedPath.ifPresent(
+                s -> eventPublisher.publishEvent(new ResourceRemoveEvent(this, s)));
         return ResponseEntity.ok(updatedTeam);
     }
 

diff --git a/server/src/main/java/io/flexwork/modules/teams/web/rest/WorkflowController.java b/server/src/main/java/io/flexwork/modules/teams/web/rest/WorkflowController.java
@@ -6,7 +6,13 @@
 import io.flexwork.modules.teams.service.dto.WorkflowDTO;
 import io.flexwork.modules.teams.service.dto.WorkflowDetailedDTO;
 import io.flexwork.modules.teams.service.dto.WorkflowStateDTO;
+import io.flexwork.query.QueryDTO;
+import jakarta.validation.Valid;
 import java.util.List;
+import java.util.Optional;
+import org.springframework.data.domain.Page;
+import org.springframework.data.domain.Pageable;
+import org.springframework.http.HttpStatus;
 import org.springframework.http.ResponseEntity;
 import org.springframework.web.bind.annotation.DeleteMapping;
 import org.springframework.web.bind.annotation.GetMapping;
@@ -33,15 +39,16 @@ public WorkflowController(
     }
 
     @PostMapping
-    public ResponseEntity<Workflow> createWorkflow(@RequestBody Workflow workflow) {
-        Workflow createdWorkflow = workflowService.createWorkflow(workflow);
+    public ResponseEntity<WorkflowDTO> createWorkflow(@RequestBody Workflow workflow) {
+        WorkflowDTO createdWorkflow = workflowService.createWorkflow(workflow);
         return ResponseEntity.ok(createdWorkflow);
     }
 
-    @GetMapping
-    public ResponseEntity<List<Workflow>> getAllWorkflows() {
-        List<Workflow> workflows = workflowService.getAllWorkflows();
-        return ResponseEntity.ok(workflows);
+    @PostMapping("/search")
+    public ResponseEntity<Page<WorkflowDTO>> findWorkflows(
+            @Valid @RequestBody Optional<QueryDTO> queryDTO, Pageable pageable) {
+        return new ResponseEntity<>(
+                workflowService.findWorkflows(queryDTO, pageable), HttpStatus.OK);
     }
 
     @GetMapping("/{id}")
@@ -53,10 +60,10 @@ public ResponseEntity<Workflow> getWorkflowById(@PathVariable Long id) {
     }
 
     @PutMapping("/{id}")
-    public ResponseEntity<Workflow> updateWorkflow(
-            @PathVariable Long id, @RequestBody Workflow workflow) {
+    public ResponseEntity<WorkflowDTO> updateWorkflow(
+            @PathVariable Long id, @RequestBody WorkflowDTO workflow) {
         try {
-            Workflow updatedWorkflow = workflowService.updateWorkflow(id, workflow);
+            WorkflowDTO updatedWorkflow = workflowService.updateWorkflow(id, workflow);
             return ResponseEntity.ok(updatedWorkflow);
         } catch (IllegalArgumentException e) {
             return ResponseEntity.notFound().build();

diff --git a/...base/src/main/resources/config/liquibase/tenant/data/fw_authority_resource_permission.csv b/...base/src/main/resources/config/liquibase/tenant/data/fw_authority_resource_permission.csv
@@ -2,4 +2,10 @@ authority_name;resource_name;permission
 ROLE_USER;Users;1
 ROLE_USER;Teams;1
 ROLE_USER;Organizations;1
-ROLE_USER;Authorities;1
+ROLE_USER;Authorities;1
+ROLE_USER;Workflows;0
+ROLE_ADMIN;Users;3
+ROLE_ADMIN;Teams;3
+ROLE_ADMIN;Organizations;3
+ROLE_ADMIN;Authorities;3
+ROLE_ADMIN;Workflows;3
diff --git a/tools/liquibase/src/main/resources/config/liquibase/tenant/data/fw_crm_account.csv b/tools/liquibase/src/main/resources/config/liquibase/tenant/data/fw_crm_account.csv