#8 Fix: add member name

re-Mine · Feb 12, 2024 · 7dcc9e1 · 7dcc9e1
1 parent 3ff4ca6
commit 7dcc9e1
Show file tree

Hide file tree

Showing 2 changed files with 10 additions and 3 deletions.
diff --git a/src/main/java/com/gdsc/remine/declaration/dto/response/PrivateDeclarationElements.java b/src/main/java/com/gdsc/remine/declaration/dto/response/PrivateDeclarationElements.java
@@ -12,17 +12,23 @@
 @NoArgsConstructor
 @AllArgsConstructor
 public class PrivateDeclarationElements {
+    private String memberName;
     private Long todayParticipantsCount;
     private List<PrivateDeclarationElement> declarationList;
 
     public static PrivateDeclarationElements from(
+            String memberName,
             Long todayParticipantsCount,
             List<Declaration> declarationList
     ) {
         final List<PrivateDeclarationElement> declarationElementList = declarationList.stream().map(
                 PrivateDeclarationElement::new
         ).collect(Collectors.toList());
 
-        return new PrivateDeclarationElements(todayParticipantsCount, declarationElementList);
+        return new PrivateDeclarationElements(
+                memberName,
+                todayParticipantsCount,
+                declarationElementList
+        );
     }
 }
diff --git a/src/main/java/com/gdsc/remine/declaration/service/DeclarationService.java b/src/main/java/com/gdsc/remine/declaration/service/DeclarationService.java
@@ -42,18 +42,19 @@ public PrivateDeclarationElement uploadDeclaration(
     }
 
     public PrivateDeclarationElements getDeclarationInWeek() {
-        final Long loginMemberId = authTokensGenerator.getLoginMemberId();
+        final Member loginMember = authTokensGenerator.getLoginMember();
 
         final LocalDateTime oneWeekAgo = getOneWeekAgoDate();
         final List<Declaration> declarationList = declarationRepository.findInRecent7Day(
                 oneWeekAgo,
-                loginMemberId
+                loginMember.getId()
         );
 
         final LocalDateTime oneDayAgo = getOneDayAgoDate();
         final Long count = declarationRepository.countInRecent1Day(oneDayAgo);
 
         return PrivateDeclarationElements.from(
+                loginMember.getName(),
                 count,
                 declarationList
         );