Merge pull request #132 from dnd-side-project/dev

release v0.2.5
dnd-side-project · Mar 19, 2024 · 3b91a6c · 3b91a6c
2 parents d353e58 + 24d5e76
commit 3b91a6c
Show file tree

Hide file tree

Showing 7 changed files with 100 additions and 30 deletions.
diff --git a/src/main/java/com/dnd/namuiwiki/domain/dashboard/model/BestWorthDashboardComponent.java b/src/main/java/com/dnd/namuiwiki/domain/dashboard/model/BestWorthDashboardComponent.java
@@ -2,11 +2,14 @@
 
 import com.dnd.namuiwiki.domain.dashboard.model.dto.RatioDto;
 import com.dnd.namuiwiki.domain.dashboard.type.DashboardType;
+import com.dnd.namuiwiki.domain.statistic.model.Legend;
 import com.dnd.namuiwiki.domain.statistic.model.RatioStatistic;
 import com.dnd.namuiwiki.domain.statistic.model.Statistics;
 import lombok.Getter;
 
+import java.util.ArrayList;
 import java.util.List;
+import java.util.Optional;
 
 @Getter
 public class BestWorthDashboardComponent extends DashboardComponent {
@@ -25,15 +28,29 @@ public void calculate(Statistics statistics) {
         RatioStatistic bestWorth = (RatioStatistic) statistics.getStatisticsByDashboardType(this.dashboardType).get(0);
         Long totalCount = bestWorth.getTotalCount();
 
-        this.rank = bestWorth.getLegends().stream()
-                .map(legend -> {
-                    if (totalCount == 0) {
-                        return new RatioDto(legend.getText(), 0);
-                    }
-                    int percentage = (int) (legend.getCount() * 100 / totalCount);
-                    return new RatioDto(legend.getText(), percentage);
-                })
-                .toList();
+        List<Legend> legends = bestWorth.getLegends();
+        int optionPercentage = 0;
+
+        this.rank = new ArrayList<>();
+
+        for (Legend legend : legends) {
+            if (totalCount == 0) {
+                rank.add(new RatioDto(legend.getText(), 0));
+            }
+            int percentage = (int) (legend.getCount() * 100 / totalCount);
+            optionPercentage += percentage;
+            rank.add(new RatioDto(legend.getText(), percentage));
+        }
+
+        // 직접입력인 legend 인거 찾아서 새로 업데이트
+        updateManualLegendPercentage(optionPercentage);
+    }
+
+    private void updateManualLegendPercentage(int optionPercentage) {
+        Optional<RatioDto> manualLegend = this.rank.stream()
+                .filter(legend -> legend.getLegend().contains("직접 입력"))
+                .findFirst();
+        manualLegend.ifPresent(ratioDto -> ratioDto.setPercentage(100 - optionPercentage));
     }
 
 }
diff --git a/src/main/java/com/dnd/namuiwiki/domain/dashboard/model/HappyDashboardComponent.java b/src/main/java/com/dnd/namuiwiki/domain/dashboard/model/HappyDashboardComponent.java
@@ -2,11 +2,14 @@
 
 import com.dnd.namuiwiki.domain.dashboard.model.dto.RatioDto;
 import com.dnd.namuiwiki.domain.dashboard.type.DashboardType;
+import com.dnd.namuiwiki.domain.statistic.model.Legend;
 import com.dnd.namuiwiki.domain.statistic.model.RatioStatistic;
 import com.dnd.namuiwiki.domain.statistic.model.Statistics;
 import lombok.Getter;
 
+import java.util.ArrayList;
 import java.util.List;
+import java.util.Optional;
 
 @Getter
 public class HappyDashboardComponent extends DashboardComponent {
@@ -24,15 +27,30 @@ public HappyDashboardComponent(Statistics statistics, String questionId) {
     public void calculate(Statistics statistics) {
         RatioStatistic happy = (RatioStatistic) statistics.getStatisticsByDashboardType(this.dashboardType).get(0);
         Long totalCount = happy.getTotalCount();
-        this.rank = happy.getLegends().stream()
-                .map(legend -> {
-                    if (totalCount == 0) {
-                        return new RatioDto(legend.getText(), 0);
-                    }
-                    int percentage = (int) (legend.getCount() * 100 / totalCount);
-                    return new RatioDto(legend.getText(), percentage);
-                })
-                .toList();
+
+        List<Legend> legends = happy.getLegends();
+        int optionPercentage = 0;
+
+        this.rank = new ArrayList<>();
+
+        for (Legend legend : legends) {
+            if (totalCount == 0) {
+                rank.add(new RatioDto(legend.getText(), 0));
+            }
+            int percentage = (int) (legend.getCount() * 100 / totalCount);
+            optionPercentage += percentage;
+            rank.add(new RatioDto(legend.getText(), percentage));
+        }
+
+        // 직접입력인 legend 인거 찾아서 새로 업데이트
+        updateManualLegendPercentage(optionPercentage);
+    }
+
+    private void updateManualLegendPercentage(int optionPercentage) {
+        Optional<RatioDto> manualLegend = this.rank.stream()
+                .filter(legend -> legend.getLegend().contains("직접 입력"))
+                .findFirst();
+        manualLegend.ifPresent(ratioDto -> ratioDto.setPercentage(100 - optionPercentage));
     }
 
 }
diff --git a/src/main/java/com/dnd/namuiwiki/domain/dashboard/model/SadDashboardComponent.java b/src/main/java/com/dnd/namuiwiki/domain/dashboard/model/SadDashboardComponent.java
@@ -2,11 +2,14 @@
 
 import com.dnd.namuiwiki.domain.dashboard.model.dto.RatioDto;
 import com.dnd.namuiwiki.domain.dashboard.type.DashboardType;
+import com.dnd.namuiwiki.domain.statistic.model.Legend;
 import com.dnd.namuiwiki.domain.statistic.model.RatioStatistic;
 import com.dnd.namuiwiki.domain.statistic.model.Statistics;
 import lombok.Getter;
 
+import java.util.ArrayList;
 import java.util.List;
+import java.util.Optional;
 
 @Getter
 public class SadDashboardComponent extends DashboardComponent {
@@ -24,15 +27,30 @@ public SadDashboardComponent(Statistics statistics, String questionId) {
     public void calculate(Statistics statistics) {
         RatioStatistic sad = (RatioStatistic) statistics.getStatisticsByDashboardType(this.dashboardType).get(0);
         Long totalCount = sad.getTotalCount();
-        this.rank = sad.getLegends().stream()
-                .map(legend -> {
-                    if (totalCount == 0) {
-                        return new RatioDto(legend.getText(), 0);
-                    }
-                    int percentage = (int) (legend.getCount() * 100 / totalCount);
-                    return new RatioDto(legend.getText(), percentage);
-                })
-                .toList();
+
+        List<Legend> legends = sad.getLegends();
+        int optionPercentage = 0;
+
+        this.rank = new ArrayList<>();
+
+        for (Legend legend : legends) {
+            if (totalCount == 0) {
+                rank.add(new RatioDto(legend.getText(), 0));
+            }
+            int percentage = (int) (legend.getCount() * 100 / totalCount);
+            optionPercentage += percentage;
+            rank.add(new RatioDto(legend.getText(), percentage));
+        }
+
+        // 직접입력인 legend 인거 찾아서 새로 업데이트
+        updateManualLegendPercentage(optionPercentage);
+    }
+
+    private void updateManualLegendPercentage(int optionPercentage) {
+        Optional<RatioDto> manualLegend = this.rank.stream()
+                .filter(legend -> legend.getLegend().contains("직접 입력"))
+                .findFirst();
+        manualLegend.ifPresent(ratioDto -> ratioDto.setPercentage(100 - optionPercentage));
     }
 
 }
diff --git a/src/main/java/com/dnd/namuiwiki/domain/dashboard/model/dto/RatioDto.java b/src/main/java/com/dnd/namuiwiki/domain/dashboard/model/dto/RatioDto.java
@@ -7,5 +7,9 @@
 @Getter
 public class RatioDto {
     private final String legend;
-    private final int percentage;
+    private int percentage;
+
+    public void setPercentage(int percentage) {
+        this.percentage = percentage;
+    }
 }
diff --git a/src/main/java/com/dnd/namuiwiki/domain/survey/SurveyService.java b/src/main/java/com/dnd/namuiwiki/domain/survey/SurveyService.java
@@ -147,7 +147,7 @@ public GetAnswersByQuestionResponse getAnswersByQuestion(String wikiId, String q
                     .build();
         });
 
-        return new GetAnswersByQuestionResponse(question.getTitle(), PageableDto.create(answers));
+        return new GetAnswersByQuestionResponse(question.getTitle(), question.getName(), PageableDto.create(answers));
     }
 
     private void validateFilter(Period period, Relation relation) {

diff --git a/src/main/java/com/dnd/namuiwiki/domain/survey/model/dto/GetAnswersByQuestionResponse.java b/src/main/java/com/dnd/namuiwiki/domain/survey/model/dto/GetAnswersByQuestionResponse.java
@@ -1,6 +1,7 @@
 package com.dnd.namuiwiki.domain.survey.model.dto;
 
 import com.dnd.namuiwiki.common.dto.PageableDto;
+import com.dnd.namuiwiki.domain.question.type.QuestionName;
 import lombok.AllArgsConstructor;
 import lombok.Getter;
 
@@ -10,5 +11,6 @@
 @Getter
 public class GetAnswersByQuestionResponse {
     private String questionTitle;
+    private QuestionName questionName;
     private PageableDto<SingleAnswerWithSurveyDetailDto> answers;
 }
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
         );
     }