From 11c65c3a557f6d097d7a7ee51a7c6af0d8d5bfd8 Mon Sep 17 00:00:00 2001
From: geniuus <cross_man@naver.com>
Date: Wed, 17 Jul 2024 02:11:55 +0900
Subject: [PATCH] =?UTF-8?q?Fix=20[#115]=20=ED=99=88=EB=B7=B0=20null=20hand?=
 =?UTF-8?q?ling?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

task, category
---
 .../org/sopt/jaksim/category/service/CategoryService.java   | 5 +++--
 .../main/java/org/sopt/jaksim/task/service/TaskService.java | 6 +++++-
 2 files changed, 8 insertions(+), 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
index 55dea12..db4bb32 100644
--- 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
index 5af48f4..dce1c66 100644
--- 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를 포함
     }