#165: added filter options for get work

Author: Death111

src/main/java/de/doubleslash/keeptime/model/repos/WorkRepository.java

@@ -16,20 +16,24 @@
 
 package de.doubleslash.keeptime.model.repos;
 
-import java.time.LocalDate;
-import java.util.List;
-
+import de.doubleslash.keeptime.model.Work;
 import org.springframework.data.jpa.repository.JpaRepository;
 import org.springframework.data.jpa.repository.Query;
+import org.springframework.data.repository.query.Param;
 import org.springframework.stereotype.Repository;
 
-import de.doubleslash.keeptime.model.Work;
+import java.time.LocalDate;
+import java.util.List;
 
 @Repository
 public interface WorkRepository extends JpaRepository<Work, Long> {
 
    @Query(value = "SELECT w FROM Work w WHERE CAST(startTime AS DATE) = ?1 ORDER BY startTime ASC")
    List<Work> findByStartDateOrderByStartTimeAsc(LocalDate creationDate);
 
-   List<Work> findByProjectId(long id);
+   @Query("SELECT w FROM Work w WHERE " + "(:projectId IS NULL OR w.project.id = :projectId) "
+         + "AND (:minStartTime IS NULL OR CAST(w.startTime AS DATE) >= :minStartTime) "
+         + "AND (:maxStartTime IS NULL OR CAST(w.startTime AS DATE) <= :maxStartTime)")
+   List<Work> findWorkItems(@Param("projectId") Long projectId, @Param("minStartTime") LocalDate minStartTime,
+         @Param("maxStartTime") LocalDate maxStartTime);
 }

src/main/java/de/doubleslash/keeptime/rest/controller/ProjectController.java

@@ -16,24 +16,6 @@
 
 package de.doubleslash.keeptime.rest.controller;
 
-import java.util.List;
-import java.util.Optional;
-
-import org.springframework.dao.DataAccessException;
-import org.springframework.http.HttpStatus;
-import org.springframework.http.ResponseEntity;
-import org.springframework.web.bind.annotation.DeleteMapping;
-import org.springframework.web.bind.annotation.GetMapping;
-import org.springframework.web.bind.annotation.PathVariable;
-import org.springframework.web.bind.annotation.PostMapping;
-import org.springframework.web.bind.annotation.PutMapping;
-import org.springframework.web.bind.annotation.RequestBody;
-import org.springframework.web.bind.annotation.RequestMapping;
-import org.springframework.web.bind.annotation.RequestParam;
-import org.springframework.web.bind.annotation.ResponseStatus;
-import org.springframework.web.bind.annotation.RestController;
-import org.springframework.web.server.ResponseStatusException;
-
 import de.doubleslash.keeptime.controller.Controller;
 import de.doubleslash.keeptime.model.Model;
 import de.doubleslash.keeptime.model.Project;
@@ -46,6 +28,14 @@
 import de.doubleslash.keeptime.rest.mapper.ProjectMapper;
 import de.doubleslash.keeptime.rest.mapper.WorkMapper;
 import jakarta.validation.Valid;
+import org.springframework.dao.DataAccessException;
+import org.springframework.http.HttpStatus;
+import org.springframework.http.ResponseEntity;
+import org.springframework.web.bind.annotation.*;
+import org.springframework.web.server.ResponseStatusException;
+
+import java.util.List;
+import java.util.Optional;
 
 @RestController
 @RequestMapping("/api/projects")
@@ -93,7 +83,7 @@ public ResponseEntity<List<ProjectDTO>> getProjectColorDTOsByName(
 
    @GetMapping("/{id}/works")
    public List<WorkDTO> getWorksFromProject(@PathVariable final long id) {
-      return workRepository.findByProjectId(id).stream().map(workMapper::workToWorkDTO).toList();
+      return workRepository.findWorkItems(id, null, null).stream().map(workMapper::workToWorkDTO).toList();
    }
 
    @PostMapping

src/main/java/de/doubleslash/keeptime/rest/controller/WorksController.java

@@ -16,28 +16,20 @@
 
 package de.doubleslash.keeptime.rest.controller;
 
-import java.util.List;
-import java.util.Optional;
-import java.util.stream.Stream;
-
-import org.springframework.http.HttpStatus;
-import org.springframework.http.ResponseEntity;
-import org.springframework.web.bind.annotation.DeleteMapping;
-import org.springframework.web.bind.annotation.GetMapping;
-import org.springframework.web.bind.annotation.PathVariable;
-import org.springframework.web.bind.annotation.PutMapping;
-import org.springframework.web.bind.annotation.RequestBody;
-import org.springframework.web.bind.annotation.RequestMapping;
-import org.springframework.web.bind.annotation.RequestParam;
-import org.springframework.web.bind.annotation.RestController;
-
 import de.doubleslash.keeptime.model.Model;
 import de.doubleslash.keeptime.model.Project;
 import de.doubleslash.keeptime.model.Work;
 import de.doubleslash.keeptime.model.repos.ProjectRepository;
 import de.doubleslash.keeptime.model.repos.WorkRepository;
 import de.doubleslash.keeptime.rest.DTO.WorkDTO;
 import de.doubleslash.keeptime.rest.mapper.WorkMapper;
+import org.springframework.http.HttpStatus;
+import org.springframework.http.ResponseEntity;
+import org.springframework.web.bind.annotation.*;
+
+import java.time.LocalDate;
+import java.util.List;
+import java.util.Optional;
 
 @RestController
 @RequestMapping("/api/works")
@@ -57,15 +49,11 @@ public WorksController(final WorkRepository workRepository, final ProjectReposit
    }
 
    @GetMapping
-   public List<WorkDTO> getWorks(@RequestParam(name = "name", required = false) final String projectName) {
-      List<Work> works = workRepository.findAll();
-
-      Stream<Work> workStream = works.stream();
-
-      if (projectName != null) {
-         workStream = workStream.filter(work -> work.getProject().getName().equals(projectName));
-      }
-      return workStream.map(workMapper::workToWorkDTO).toList();
+   public List<WorkDTO> getWorks(@RequestParam(name = "id", required = false) final Long projectId,
+         @RequestParam(name = "fromDate", required = false) final LocalDate fromDate,
+         @RequestParam(name = "toDate", required = false) final LocalDate toDate) {
+      List<Work> works = workRepository.findWorkItems(projectId, fromDate, toDate);
+      return works.stream().map(workMapper::workToWorkDTO).toList();
    }
 
    @PutMapping("/{id}")