Fix [#115] 홈뷰 null handling (#116)

morib-in · Jul 16, 2024 · 6732005 · 6732005
2 parents 12e6626 + 11c65c3
commit 6732005
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 3 deletions.
diff --git a/jaksim/src/main/java/org/sopt/jaksim/category/service/CategoryService.java b/jaksim/src/main/java/org/sopt/jaksim/category/service/CategoryService.java
@@ -85,9 +85,10 @@ public List<CategoryTaskLink> getCategoryTaskByCategories(List<CategoryCheckResp
 
     public boolean isContains(CategoryCheckResponse categoryCheckResponse, LocalDate idxDate) {
         if (categoryCheckResponse.endDate() == null) {
-
+            return categoryCheckResponse.startDate().isBefore(idxDate) ||
+                    categoryCheckResponse.startDate().equals(idxDate);
         }
-        return (categoryCheckResponse.startDate().isBefore(idxDate) &&
+        else return (categoryCheckResponse.startDate().isBefore(idxDate) &&
                 categoryCheckResponse.endDate().isAfter(idxDate)) ||
                 categoryCheckResponse.startDate().equals(idxDate) ||
                 categoryCheckResponse.endDate().equals(idxDate);

diff --git a/jaksim/src/main/java/org/sopt/jaksim/task/service/TaskService.java b/jaksim/src/main/java/org/sopt/jaksim/task/service/TaskService.java
@@ -32,7 +32,11 @@ public Task getTaskById(Long taskId) {
     }
 
     public boolean isContains(TaskWithTaskTimer taskWithTaskTimer, LocalDate idxDate) {
-        return taskWithTaskTimer.startDate().equals(idxDate) || // startDate = idxDate
+        if (taskWithTaskTimer.endDate() == null) {
+            return taskWithTaskTimer.startDate().isBefore(idxDate) ||
+                    taskWithTaskTimer.startDate().equals(idxDate);
+        }
+        else return taskWithTaskTimer.startDate().equals(idxDate) || // startDate = idxDate
                 taskWithTaskTimer.endDate().equals(idxDate) || // endDate = idxDate
                 (taskWithTaskTimer.startDate().isBefore(idxDate) && taskWithTaskTimer.endDate().isAfter(idxDate)); // startDate, endDate가 idxDate를 포함
     }