fix: (#2) (#9)

* fix: modify jpql * fix: modify jpql * fix: remove picked task from tasks in response * fix: remove picked task from tasks in response
JNU-econovation · Jul 17, 2024 · 97526fe · 97526fe
1 parent fe06286
commit 97526fe
Show file tree

Hide file tree

Showing 3 changed files with 9 additions and 5 deletions.
diff --git a/src/main/java/gymmi/repository/WorkspaceRepository.java b/src/main/java/gymmi/repository/WorkspaceRepository.java
@@ -33,7 +33,9 @@ default Workspace getWorkspaceById(Long id) {
             "limit 10 offset :pageNumber", nativeQuery = true)
     List<Workspace> getJoinedWorkspacesByUserIdOrderBy_(Long userId, int pageNumber);
 
-    @Query("select count(*) from Workspace w where w.status = 'PREPARING' or w.status = 'IN_PROGRESS'")
+    @Query("select count(*) from Workspace ws join Worker w on ws.id = w.workspace.id " +
+            "where (ws.status = 'PREPARING' or ws.status = 'IN_PROGRESS') " +
+            "and w.user.id = :userId")
     int getCountsOfJoinedWorkspacesWhereStatusIsPreparingOrInProgress(Long userId);
 
 

diff --git a/src/main/java/gymmi/response/OpeningTasksBoxResponse.java b/src/main/java/gymmi/response/OpeningTasksBoxResponse.java
@@ -2,9 +2,10 @@
 
 import gymmi.entity.Task;
 import gymmi.exception.ServerLogicFaultException;
-import java.util.List;
 import lombok.Getter;
 
+import java.util.List;
+
 @Getter
 public class OpeningTasksBoxResponse {
 
@@ -13,11 +14,12 @@ public class OpeningTasksBoxResponse {
 
     public OpeningTasksBoxResponse(List<Task> tasks) {
         this.pickedTask = getPickedTask(tasks);
-        this.tasks = getTask(tasks);
+        this.tasks = getRestTasks(tasks);
     }
 
-    private List<TaskDTO> getTask(List<Task> tasks) {
+    private List<TaskDTO> getRestTasks(List<Task> tasks) {
         return tasks.stream()
+                .filter(t -> !t.isPicked())
                 .map(t -> new TaskDTO(t.getId(), t.getName(), t.getRegister().getNickname()))
                 .toList();
     }

diff --git a/src/test/java/gymmi/integration/WorkspaceIntegrationTest.java b/src/test/java/gymmi/integration/WorkspaceIntegrationTest.java
@@ -811,7 +811,7 @@ class 미션_수행 {
         response.then().log().all()
                 .statusCode(200)
                 .body("pickedTask", Matchers.notNullValue())
-                .body("tasks", Matchers.hasSize(2));
+                .body("tasks", Matchers.hasSize(1));
     }
 
     @Nested