Merge pull request #291 from Hous-Release/develop

release 1.0.5
Hous-Release · Dec 28, 2022 · 19b23aa · 19b23aa
2 parents 7648be3 + 978222c
commit 19b23aa
Show file tree

Hide file tree

Showing 3 changed files with 12 additions and 4 deletions.
diff --git a/build.gradle b/build.gradle
@@ -6,7 +6,7 @@ plugins {
 }
 
 group = 'hous'
-version = '1.0.4-SNAPSHOT'
+version = '1.0.5-SNAPSHOT'
 sourceCompatibility = '11'
 
 configurations {

diff --git a/src/main/java/hous/server/config/swagger/SwaggerConfig.java b/src/main/java/hous/server/config/swagger/SwaggerConfig.java
@@ -113,7 +113,7 @@ private ApiInfo apiInfo() {
         return new ApiInfoBuilder()
                 .title("Hous- Release")
                 .description("Server API Docs")
-                .version("1.0.4")
+                .version("1.0.5")
                 .build();
     }
 }
diff --git 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<Take> takes = todo.getTakes();
+        Set<Take> 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(