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

release v0.3.0

build.gradle

@@ -8,11 +8,9 @@ ext {
     set('jwtVersion', '0.12.5')
     set('springdocOpenapiUIVersion', '2.3.0')
     set('mockitoVersion', '5.10.0')
-}
-
-ext {
     set('jwtVersion', '0.12.5')
     set('springdocOpenapiUIVersion', '2.3.0')
+    set('springRetryVersion', '2.0.7')
 }
 
 group = 'com.dnd'
@@ -33,6 +31,10 @@ dependencies {
     implementation 'org.springframework.boot:spring-boot-starter-validation'
     implementation 'org.springframework.boot:spring-boot-starter-data-mongodb'
 
+    /* spring retry */
+    implementation("org.springframework.retry:spring-retry:${springRetryVersion}")
+    implementation("org.springframework:spring-aspects")
+
     /* micrometer */
     implementation 'io.micrometer:micrometer-registry-prometheus'
 

src/main/java/com/dnd/namuiwiki/common/exception/ApplicationErrorType.java

@@ -36,6 +36,12 @@ public enum ApplicationErrorType {
     NOT_FOUND_USER(HttpStatus.NOT_FOUND, "존재하지 않는 유저입니다."),
     EXISTING_USER(HttpStatus.CONFLICT, "이미 존재하는 유저입니다."),
 
+    /**
+     * Wiki Error Type
+     */
+    NOT_FOUND_WIKI(HttpStatus.NOT_FOUND, "존재하지 않는 위키입니다."),
+    INVALID_WIKI_TYPE(HttpStatus.CONFLICT, "잘못된 위키 타입입니다."),
+
     /**
      * Question Error Type
      */
@@ -55,6 +61,7 @@ public enum ApplicationErrorType {
     NOT_STRING_ANSWER(HttpStatus.NOT_FOUND, "문자형 답변이 아닙니다."),
     CANNOT_SEND_SURVEY_TO_MYSELF(HttpStatus.BAD_REQUEST, "자신에게 설문을 보낼 수 없습니다."),
     ANSWER_REASON_REQUIRED(HttpStatus.CONFLICT, "reason 필드가 필요한 질문입니다."),
+    INVALID_ANSWER_TYPE(HttpStatus.BAD_REQUEST, "답변 타입이 다릅니다."),
 
     /**
      * Survey Error Type
@@ -64,10 +71,17 @@ public enum ApplicationErrorType {
     INVALID_BORROWING_LIMIT(HttpStatus.BAD_REQUEST, "빌릴 수 있는 돈은 0 이상 10억 이하입니다."),
     INVALID_SURVEY_OWNER(HttpStatus.CONFLICT, "설문 소유자가 아닙니다."),
 
+    /**
+     * Dashboard Error Type
+     */
+    INVALID_DASHBOARD_TYPE(HttpStatus.CONFLICT, "잘못된 대시보드 타입입니다."),
+
     /**
      * Filter Error Type
      */
-    INVALID_FILTER(HttpStatus.BAD_REQUEST, "동시에 두가지 필터를 사용할 수 없습니다.");
+    INVALID_FILTER(HttpStatus.BAD_REQUEST, "동시에 두가지 필터를 사용할 수 없습니다."),
+    INVALID_QUESTION_WIKI_TYPE(HttpStatus.BAD_REQUEST, "질문의 위키 타입이 다릅니다."),
+    ;
 
 
     @Getter

src/main/java/com/dnd/namuiwiki/common/util/ListUtils.java

@@ -0,0 +1,19 @@
+package com.dnd.namuiwiki.common.util;
+
+import java.util.ArrayList;
+import java.util.Arrays;
+import java.util.Collection;
+import java.util.List;
+
+public class ListUtils {
+    public static <T> List<T> convertList(Object obj) {
+        if (obj.getClass().isArray()) {
+            return Arrays.asList((T[]) obj);
+        } else if (obj instanceof Collection) {
+            return new ArrayList<>((Collection<T>) obj);
+        } else {
+            throw new ClassCastException("Object is not a List.");
+        }
+
+    }
+}

src/main/java/com/dnd/namuiwiki/config/EventConfiguration.java

@@ -1,5 +1,6 @@
 package com.dnd.namuiwiki.config;
 
+import com.dnd.namuiwiki.domain.dashboard.DashboardService;
 import com.dnd.namuiwiki.domain.statistic.StatisticsService;
 import com.dnd.namuiwiki.domain.survey.SurveyEventHandler;
 import lombok.RequiredArgsConstructor;
@@ -10,10 +11,11 @@
 @RequiredArgsConstructor
 public class EventConfiguration {
     private final StatisticsService statisticsService;
+    private final DashboardService dashboardService;
 
     @Bean
     public SurveyEventHandler surveyEventHandler() {
-        return new SurveyEventHandler(statisticsService);
+        return new SurveyEventHandler(statisticsService, dashboardService);
     }
 
 }

src/main/java/com/dnd/namuiwiki/config/RetryConfiguration.java

@@ -0,0 +1,9 @@
+package com.dnd.namuiwiki.config;
+
+import org.springframework.context.annotation.Configuration;
+import org.springframework.retry.annotation.EnableRetry;
+
+@Configuration
+@EnableRetry(proxyTargetClass=true)
+public class RetryConfiguration {
+}

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

@@ -6,6 +6,7 @@
 import com.dnd.namuiwiki.domain.jwt.dto.TokenUserInfoDto;
 import com.dnd.namuiwiki.domain.survey.type.Period;
 import com.dnd.namuiwiki.domain.survey.type.Relation;
+import com.dnd.namuiwiki.domain.wiki.WikiType;
 import io.swagger.v3.oas.annotations.Operation;
 import io.swagger.v3.oas.annotations.media.Content;
 import io.swagger.v3.oas.annotations.media.Schema;
@@ -32,9 +33,10 @@ public class DashboardController {
     public ResponseEntity<?> getDashboard(
             @JwtAuthorization TokenUserInfoDto tokenUserInfoDto,
             @RequestParam(required = false) Period period,
-            @RequestParam(required = false) Relation relation
+            @RequestParam(required = false) Relation relation,
+            @RequestParam WikiType wikiType
     ) {
-        DashboardDto response = dashboardService.getDashboard(tokenUserInfoDto, period, relation);
+        DashboardDto response = dashboardService.getDashboard(tokenUserInfoDto, wikiType, period, relation);
         return ResponseDto.ok(response);
     }
 

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

@@ -0,0 +1,70 @@
+package com.dnd.namuiwiki.domain.dashboard;
+
+
+import com.dnd.namuiwiki.domain.dashboard.model.entity.Dashboard;
+import com.dnd.namuiwiki.domain.statistic.model.Statistics;
+import com.dnd.namuiwiki.domain.survey.model.entity.Answer;
+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 com.dnd.namuiwiki.domain.wiki.WikiType;
+import com.dnd.namuiwiki.external.DiscordClient;
+import lombok.RequiredArgsConstructor;
+import lombok.extern.slf4j.Slf4j;
+import org.springframework.dao.OptimisticLockingFailureException;
+import org.springframework.retry.annotation.Backoff;
+import org.springframework.retry.annotation.Recover;
+import org.springframework.retry.annotation.Retryable;
+import org.springframework.stereotype.Service;
+
+import java.util.List;
+
+@Slf4j
+@RequiredArgsConstructor
+@Service
+public class DashboardInternalProxyService {
+    private final DashboardRepository dashboardRepository;
+    private final DiscordClient discordClient;
+
+    @Retryable(
+            retryFor = {OptimisticLockingFailureException.class},
+            maxAttempts = 3,
+            backoff = @Backoff(delay = 30 * 1000L)
+    )
+    public void updateDashboard(User owner, WikiType wikiType, Period period, Relation relation, List<Answer> answers) {
+        insertDashboardIfNotExist(owner, wikiType, period, relation, answers);
+        Dashboard dashboard = dashboardRepository.findByUserAndWikiTypeAndPeriodAndRelation(owner, wikiType, period, relation)
+                .orElseGet(() -> {
+                    Dashboard d = Dashboard.builder()
+                            .user(owner)
+                            .wikiType(wikiType)
+                            .period(period)
+                            .relation(relation)
+                            .statistics(Statistics.from(answers.stream().map(Answer::getQuestion).toList()))
+                            .build();
+                    return dashboardRepository.save(d);
+                });
+
+        dashboard.updateStatistics(answers);
+        dashboardRepository.save(dashboard);
+    }
+
+    @Recover
+    private void recoverForUpdateDashboard(Exception e) {
+        log.error("Failed to update dashboard", e);
+        discordClient.sendMessage(e.toString());
+    }
+
+    private void insertDashboardIfNotExist(User owner, WikiType wikiType, Period period, Relation relation, List<Answer> answers) {
+        if (!dashboardRepository.existsByUserAndWikiTypeAndPeriodAndRelation(owner, wikiType, period, relation)) {
+            dashboardRepository.save(Dashboard.builder()
+                    .user(owner)
+                    .wikiType(wikiType)
+                    .period(period)
+                    .relation(relation)
+                    .statistics(Statistics.from(answers.stream().map(Answer::getQuestion).toList()))
+                    .build());
+        }
+    }
+
+}

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

@@ -4,11 +4,13 @@
 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 com.dnd.namuiwiki.domain.wiki.WikiType;
 import org.springframework.data.mongodb.repository.MongoRepository;
 
 import java.util.Optional;
 
-public interface DashboardRepository extends MongoRepository<Dashboard, String>, DashboardCustomRepository {
-    Optional<Dashboard> findByUserAndPeriodAndRelation(User user, Period period, Relation relation);
-    boolean existsByUserAndPeriodAndRelation(User user, Period period, Relation relation);
+public interface DashboardRepository extends MongoRepository<Dashboard, String> {
+    Optional<Dashboard> findByUserAndWikiTypeAndPeriodAndRelation(User user, WikiType wikiType, Period period, Relation relation);
+
+    boolean existsByUserAndWikiTypeAndPeriodAndRelation(User user, WikiType wikiType, Period period, Relation relation);
 }