From 1a5fcb2dcda8c12e3990c232cd97ec8866f5d2e4 Mon Sep 17 00:00:00 2001 From: hyejungg Date: Wed, 28 Dec 2022 11:34:09 +0900 Subject: [PATCH] =?UTF-8?q?#289=20[!HOTFIX]=20todo=20=EB=A9=94=EC=9D=B8=20?= =?UTF-8?q?=EC=A1=B0=ED=9A=8C=20=EC=8B=9C=20ourTodo=EC=9D=98=20=EC=B2=B4?= =?UTF-8?q?=ED=81=AC=20=EC=83=81=ED=83=9C=20=EC=9D=B4=EC=8A=88=20=ED=95=B4?= =?UTF-8?q?=EA=B2=B0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../domain/todo/repository/DoneRepositoryImpl.java | 12 ++++++++++-- 1 file changed, 10 insertions(+), 2 deletions(-) diff --git a/src/main/java/hous/server/domain/todo/repository/DoneRepositoryImpl.java b/src/main/java/hous/server/domain/todo/repository/DoneRepositoryImpl.java index cffcf867..7a2b498a 100644 --- a/src/main/java/hous/server/domain/todo/repository/DoneRepositoryImpl.java +++ b/src/main/java/hous/server/domain/todo/repository/DoneRepositoryImpl.java @@ -10,7 +10,8 @@ import lombok.RequiredArgsConstructor; import java.time.LocalDate; -import java.util.List; +import java.util.HashSet; +import java.util.Set; import static hous.server.domain.todo.QDone.done; @@ -34,7 +35,14 @@ public boolean findTodayTodoCheckStatus(LocalDate today, Onboarding onboarding, @Override public OurTodoStatus findTodayOurTodoStatus(LocalDate today, Todo todo) { - List takes = todo.getTakes(); + Set takes = new HashSet<>(); + todo.getTakes().forEach(take -> { + take.getRedos().forEach(redo -> { + if (redo.getDayOfWeek().toString().equals(DateUtils.nowDayOfWeek(today))) { + takes.add(take); + } + }); + }); int doneCnt = (int) takes.stream() .map(take -> queryFactory.selectFrom(done) .where(