Merge pull request #127 from dnd-side-project/feat/#126

내가 받은 설문에 작성자 wikiId 포함(#126)
dnd-side-project · Mar 18, 2024 · 1e88bd7 · 1e88bd7
2 parents b05f59d + e9de068
commit 1e88bd7
Showing 1 changed file with 12 additions and 1 deletion.
diff --git a/src/main/java/com/dnd/namuiwiki/domain/survey/model/dto/ReceivedSurveyDto.java b/src/main/java/com/dnd/namuiwiki/domain/survey/model/dto/ReceivedSurveyDto.java
@@ -3,9 +3,12 @@
 import com.dnd.namuiwiki.domain.survey.model.entity.Survey;
 import com.dnd.namuiwiki.domain.survey.type.Period;
 import com.dnd.namuiwiki.domain.survey.type.Relation;
+import com.dnd.namuiwiki.domain.user.entity.User;
 import lombok.AllArgsConstructor;
 import lombok.Getter;
 
+import java.util.Optional;
+
 @Getter
 @AllArgsConstructor
 public class ReceivedSurveyDto {
@@ -14,13 +17,21 @@ public class ReceivedSurveyDto {
     private Relation relation;
     private Period period;
     private String senderName;
+    private String senderWikiId;
 
     public static ReceivedSurveyDto from(Survey survey) {
+        String senderWikiId = null;
+        User sender = survey.getSender();
+        if (sender != null) {
+            senderWikiId = sender.getWikiId();
+        }
+
         return new ReceivedSurveyDto(
                 survey.getId(),
                 survey.getRelation(),
                 survey.getPeriod(),
-                survey.getSenderName()
+                survey.getSenderName(),
+                senderWikiId
         );
     }