유저 통계와 전체 통계 분리 리팩토링(#104)

src/main/java/com/dnd/namuiwiki/domain/dashboard/DashboardService.java

@@ -2,29 +2,24 @@
 
 import com.dnd.namuiwiki.common.exception.ApplicationErrorException;
 import com.dnd.namuiwiki.common.exception.ApplicationErrorType;
-import com.dnd.namuiwiki.domain.dashboard.model.BestWorthDashboardComponent;
-import com.dnd.namuiwiki.domain.dashboard.model.CharacterDashboardComponent;
 import com.dnd.namuiwiki.domain.dashboard.model.DashboardComponent;
-import com.dnd.namuiwiki.domain.dashboard.model.HappyDashboardComponent;
-import com.dnd.namuiwiki.domain.dashboard.model.MoneyDashboardComponent;
-import com.dnd.namuiwiki.domain.dashboard.model.SadDashboardComponent;
 import com.dnd.namuiwiki.domain.dashboard.model.dto.DashboardDto;
 import com.dnd.namuiwiki.domain.dashboard.model.entity.Dashboard;
+import com.dnd.namuiwiki.domain.dashboard.type.DashboardType;
 import com.dnd.namuiwiki.domain.jwt.dto.TokenUserInfoDto;
-import com.dnd.namuiwiki.domain.question.QuestionRepository;
-import com.dnd.namuiwiki.domain.question.entity.Question;
 import com.dnd.namuiwiki.domain.question.type.QuestionName;
 import com.dnd.namuiwiki.domain.statistic.StatisticsService;
-import com.dnd.namuiwiki.domain.statistic.model.BorrowingLimitEntireStatistic;
-import com.dnd.namuiwiki.domain.statistic.model.Statistics;
 import com.dnd.namuiwiki.domain.statistic.model.entity.PopulationStatistic;
+import com.dnd.namuiwiki.domain.survey.model.entity.Answer;
+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.UserRepository;
 import com.dnd.namuiwiki.domain.user.entity.User;
 import lombok.RequiredArgsConstructor;
 import org.springframework.stereotype.Service;
 
+import java.util.ArrayList;
 import java.util.List;
 import java.util.Optional;
 
@@ -34,42 +29,25 @@ public class DashboardService {
     private final UserRepository userRepository;
     private final DashboardRepository dashboardRepository;
     private final StatisticsService statisticsService;
-    private final QuestionRepository questionRepository;
 
     public DashboardDto getDashboard(TokenUserInfoDto tokenUserInfoDto, Period period, Relation relation) {
         validateFilterCategory(period, relation);
 
         User user = findByWikiId(tokenUserInfoDto.getWikiId());
-        Optional<Dashboard> dashboard = dashboardRepository.findByUserAndPeriodAndRelation(user, period, relation);
-        if (dashboard.isEmpty()) {
+        Optional<Dashboard> optionalDashboard = dashboardRepository.findByUserAndPeriodAndRelation(user, period, relation);
+        if (optionalDashboard.isEmpty()) {
             return null;
         }
+        Dashboard dashboard = optionalDashboard.get();
 
-        List<Question> questions = questionRepository.findAll();
-
-        Statistics statistics = dashboard.get().getStatistics();
-        List<DashboardComponent> dashboardComponents = List.of(
-                new BestWorthDashboardComponent(statistics, getQuestionIdByQuestionNAme(questions, QuestionName.CORE_VALUE)),
-                new HappyDashboardComponent(statistics, getQuestionIdByQuestionNAme(questions, QuestionName.HAPPY_BEHAVIOR)),
-                new SadDashboardComponent(statistics, getQuestionIdByQuestionNAme(questions, QuestionName.SAD_ANGRY_BEHAVIOR)),
-                new CharacterDashboardComponent(statistics),
-                getMoneyDashboardComponent(statistics, period, relation, getQuestionIdByQuestionNAme(questions, QuestionName.BORROWING_LIMIT))
-        );
-        return new DashboardDto(dashboardComponents);
-    }
-
-    private String getQuestionIdByQuestionNAme(List<Question> questions, QuestionName questionName) {
-        return questions.stream().filter(q -> q.getName() == questionName)
-                .findFirst().orElseThrow(() -> new ApplicationErrorException(ApplicationErrorType.INVALID_QUESTION_ID))
-                .getId();
-    }
-
-    private MoneyDashboardComponent getMoneyDashboardComponent(Statistics statistics, Period period, Relation relation, String questionId) {
+        List<DashboardComponent> userDashboards = dashboard.getUserDashboards();
         PopulationStatistic populationStatistic = statisticsService.getPopulationStatistic(period, relation, QuestionName.BORROWING_LIMIT);
-        BorrowingLimitEntireStatistic statistic = (BorrowingLimitEntireStatistic) populationStatistic.getStatistic();
-        long entireAverage = statistic.getBorrowingMoneyLimitEntireAverage();
+        DashboardComponent populationDashboard = dashboard.getPopulationDashboard(populationStatistic, DashboardType.MONEY);
 
-        return new MoneyDashboardComponent(statistics, entireAverage, questionId);
+        List<DashboardComponent> components = new ArrayList<>(userDashboards);
+        components.add(populationDashboard);
+
+        return new DashboardDto(components);
     }
 
     private void validateFilterCategory(Period period, Relation relation) {
@@ -83,4 +61,30 @@ private User findByWikiId(String wikiId) {
                 .orElseThrow(() -> new ApplicationErrorException(ApplicationErrorType.NOT_FOUND_USER));
     }
 
+
+    public void updateStatistics(Survey survey) {
+        User owner = survey.getOwner();
+        Period period = survey.getPeriod();
+        Relation relation = survey.getRelation();
+
+        var statisticalAnswers = survey.getAnswers().stream()
+                .filter(answer -> answer.getQuestion().getDashboardType().getStatisticsCalculationType().isNotNone())
+                .toList();
+
+        updateDashboards(owner, period, relation, statisticalAnswers);
+    }
+
+    private void updateDashboards(User owner, Period period, Relation relation, List<Answer> statisticalAnswers) {
+        updateDashboardByCategory(owner, null, null, statisticalAnswers);
+        updateDashboardByCategory(owner, period, null, statisticalAnswers);
+        updateDashboardByCategory(owner, null, relation, statisticalAnswers);
+    }
+
+    private void updateDashboardByCategory(User owner, Period period, Relation relation, List<Answer> answers) {
+        Dashboard dashboard = dashboardRepository.findByUserAndPeriodAndRelation(owner, period, relation)
+                .orElseGet(() -> dashboardRepository.save(Dashboard.createNew(owner, period, relation, answers)));
+        dashboard.updateStatistics(answers);
+        dashboardRepository.save(dashboard);
+    }
+
 }

src/main/java/com/dnd/namuiwiki/domain/dashboard/model/AverageDashboardComponent.java

@@ -0,0 +1,26 @@
+package com.dnd.namuiwiki.domain.dashboard.model;
+
+import com.dnd.namuiwiki.domain.dashboard.type.DashboardType;
+import com.dnd.namuiwiki.domain.statistic.model.AverageEntireStatistic;
+import com.dnd.namuiwiki.domain.statistic.model.entity.PopulationStatistic;
+import lombok.Getter;
+
+@Getter
+public class AverageDashboardComponent extends DashboardComponent {
+    private final String questionId;
+    private final long peopleCount;
+    private final long average;
+    private final long entireAverage;
+
+    public AverageDashboardComponent(DashboardType dashboardType, Statistic statistic, PopulationStatistic populationStatistic) {
+        super(dashboardType);
+        AverageEntireStatistic entireStatistic = (AverageEntireStatistic) populationStatistic.getStatistic();
+        AverageStatistic averageStatistic = (AverageStatistic) statistic;
+
+        this.entireAverage = entireStatistic.getEntireAverage();
+        this.questionId = statistic.getQuestionId();
+        this.peopleCount = averageStatistic.getTotalCount();
+        this.average = averageStatistic.getAverage();
+    }
+
+}

src/main/java/com/dnd/namuiwiki/domain/statistic/model/AverageStatistic.java → src/main/java/com/dnd/namuiwiki/domain/dashboard/model/AverageStatistic.java

@@ -1,4 +1,4 @@
-package com.dnd.namuiwiki.domain.statistic.model;
+package com.dnd.namuiwiki.domain.dashboard.model;
 
 import com.dnd.namuiwiki.common.exception.ApplicationErrorException;
 import com.dnd.namuiwiki.common.exception.ApplicationErrorType;
@@ -48,7 +48,7 @@ public void updateAverage(Long newNumber) {
         average = ArithmeticUtils.calculateAverage(totalCount, average, newNumber);
     }
 
-    public static AverageStatistic create(Question question) {
+    protected static AverageStatistic create(Question question) {
         return new AverageStatistic(
                 question.getId(),
                 question.getName(),

src/main/java/com/dnd/namuiwiki/domain/dashboard/model/CharacterDashboardComponent.java → src/main/java/com/dnd/namuiwiki/domain/dashboard/model/BinaryDashboardComponent.java

@@ -4,45 +4,39 @@
 import com.dnd.namuiwiki.common.exception.ApplicationErrorType;
 import com.dnd.namuiwiki.domain.dashboard.type.DashboardType;
 import com.dnd.namuiwiki.domain.question.type.QuestionName;
-import com.dnd.namuiwiki.domain.statistic.model.Legend;
-import com.dnd.namuiwiki.domain.statistic.model.RatioStatistic;
-import com.dnd.namuiwiki.domain.statistic.model.Statistic;
-import com.dnd.namuiwiki.domain.statistic.model.Statistics;
 import lombok.Getter;
 import lombok.RequiredArgsConstructor;
 
 import java.util.ArrayList;
 import java.util.List;
 
 @Getter
-public class CharacterDashboardComponent extends DashboardComponent {
-    private List<Character> characters;
+public class BinaryDashboardComponent extends DashboardComponent {
+    private List<BinaryMetric> characters;
 
-    public CharacterDashboardComponent(Statistics statistics) {
-        super(DashboardType.CHARACTER);
+    public BinaryDashboardComponent(DashboardType dashboardType, List<Statistic> statistics) {
+        super(dashboardType);
         this.characters = new ArrayList<>();
-        calculate(statistics);
+        initiate(statistics);
     }
 
-    @Override
-    public void calculate(Statistics statistics) {
-        List<Statistic> character = statistics.getStatisticsByDashboardType(this.dashboardType);
-        this.characters = character.stream().map(Character::from).toList();
+    public void initiate(List<Statistic> character) {
+        this.characters = character.stream().map(BinaryMetric::from).toList();
     }
 
     @RequiredArgsConstructor
     @Getter
-    static class Character {
+    static class BinaryMetric {
         private final String name;
         private final boolean value;
         private final String questionId;
 
-        private static Character from(Statistic statistic) {
+        private static BinaryMetric from(Statistic statistic) {
             RatioStatistic ratioStatistic = (RatioStatistic) statistic;
             List<Legend> legends = ratioStatistic.getLegends();
             QuestionName questionName = ratioStatistic.getQuestionName();
 
-            return new Character(
+            return new BinaryMetric(
                     questionName.name(),
                     getCharacterRatioResult(legends),
                     statistic.getQuestionId()

src/main/java/com/dnd/namuiwiki/domain/dashboard/model/DashboardComponent.java

@@ -1,23 +1,18 @@
 package com.dnd.namuiwiki.domain.dashboard.model;
 
 import com.dnd.namuiwiki.domain.dashboard.type.DashboardType;
-import com.dnd.namuiwiki.domain.statistic.model.Statistics;
 import io.swagger.v3.oas.annotations.media.Schema;
 import lombok.AllArgsConstructor;
 import lombok.Getter;
 
 @Schema(description = "대시보드 타입", oneOf = {
-        BestWorthDashboardComponent.class,
-        CharacterDashboardComponent.class,
-        HappyDashboardComponent.class,
-        MoneyDashboardComponent.class,
-        SadDashboardComponent.class})
+        AverageDashboardComponent.class,
+        BinaryDashboardComponent.class,
+        RatioDashboardComponent.class})
 @AllArgsConstructor
 @Getter
 public abstract class DashboardComponent {
 
     protected final DashboardType dashboardType;
 
-    public abstract void calculate(Statistics statistics);
-
 }

src/main/java/com/dnd/namuiwiki/domain/dashboard/model/DashboardFactory.java

@@ -0,0 +1,42 @@
+package com.dnd.namuiwiki.domain.dashboard.model;
+
+import com.dnd.namuiwiki.domain.dashboard.type.DashboardStatisticType;
+import com.dnd.namuiwiki.domain.dashboard.type.DashboardType;
+import com.dnd.namuiwiki.domain.statistic.model.entity.PopulationStatistic;
+
+import java.util.List;
+
+public abstract class DashboardFactory {
+
+    public static DashboardComponent create(DashboardType dashboardType, List<Statistic> statistics) {
+        DashboardStatisticType type = dashboardType.getDashboardStatisticType();
+        switch (type) {
+            case RATIO -> {
+                validateStatisticsSize(statistics, 1);
+                return new RatioDashboardComponent(dashboardType, statistics.get(0));
+            }
+            case BINARY -> {
+                return new BinaryDashboardComponent(dashboardType, statistics);
+            }
+            default -> throw new IllegalArgumentException("Not supported type: " + type);
+        }
+    }
+
+    public static DashboardComponent create(DashboardType dashboardType, List<Statistic> statistics, PopulationStatistic populationStatistic) {
+        DashboardStatisticType type = dashboardType.getDashboardStatisticType();
+        switch (type) {
+            case AVERAGE -> {
+                validateStatisticsSize(statistics, 1);
+                return new AverageDashboardComponent(dashboardType, statistics.get(0), populationStatistic);
+            }
+            default -> throw new IllegalArgumentException("Not supported type: " + type);
+        }
+    }
+
+    private static void validateStatisticsSize(List<Statistic> statistics, int size) {
+        if (statistics.size() != size) {
+            throw new IllegalArgumentException(String.format("This Dashboard type should have only %d statistic", size));
+        }
+    }
+
+}

src/main/java/com/dnd/namuiwiki/domain/statistic/model/Legend.java → src/main/java/com/dnd/namuiwiki/domain/dashboard/model/Legend.java

@@ -1,5 +1,6 @@
-package com.dnd.namuiwiki.domain.statistic.model;
+package com.dnd.namuiwiki.domain.dashboard.model;
 
+import com.dnd.namuiwiki.domain.option.entity.Option;
 import lombok.AllArgsConstructor;
 import lombok.Getter;
 
@@ -14,4 +15,8 @@ public class Legend {
     public Long increaseCount() {
         return ++count;
     }
+
+    public static Legend from(Option option) {
+        return new Legend(option.getId(), option.getText(), option.getValue(), 0L);
+    }
 }