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

release v0.2.9

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

@@ -0,0 +1,20 @@
+package com.dnd.namuiwiki.common.exception;
+
+import lombok.extern.slf4j.Slf4j;
+import org.springframework.aop.interceptor.AsyncUncaughtExceptionHandler;
+
+import java.lang.reflect.Method;
+
+@Slf4j
+public class AsyncExceptionHandler implements AsyncUncaughtExceptionHandler {
+
+    @Override
+    public void handleUncaughtException(Throwable ex, Method method, Object... params) {
+        log.error("AsyncException message={}, declaringClass={}, methodName={}", ex.getMessage(), method.getDeclaringClass(), method.getName(), ex);
+
+        for (Object param : params) {
+            log.error("Parameter value - {}, declaringClass={}, methodName={}", param, method.getDeclaringClass(), method.getName());
+        }
+    }
+
+}

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

@@ -0,0 +1,24 @@
+package com.dnd.namuiwiki.config;
+
+import com.dnd.namuiwiki.common.exception.AsyncExceptionHandler;
+import org.springframework.aop.interceptor.AsyncUncaughtExceptionHandler;
+import org.springframework.context.annotation.Bean;
+import org.springframework.context.annotation.Configuration;
+import org.springframework.scheduling.annotation.AsyncConfigurer;
+import org.springframework.scheduling.annotation.EnableAsync;
+
+@EnableAsync
+@Configuration
+public class AsyncConfiguration implements AsyncConfigurer {
+
+    @Override
+    public AsyncUncaughtExceptionHandler getAsyncUncaughtExceptionHandler() {
+        return asyncExceptionHandler();
+    }
+
+    @Bean
+    public AsyncExceptionHandler asyncExceptionHandler() {
+        return new AsyncExceptionHandler();
+    }
+
+}

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

@@ -0,0 +1,28 @@
+package com.dnd.namuiwiki.config;
+
+import org.springframework.cache.Cache;
+import org.springframework.cache.CacheManager;
+import org.springframework.cache.annotation.EnableCaching;
+import org.springframework.cache.concurrent.ConcurrentMapCache;
+import org.springframework.cache.support.SimpleCacheManager;
+import org.springframework.context.annotation.Bean;
+import org.springframework.context.annotation.Configuration;
+
+import java.util.ArrayList;
+import java.util.List;
+
+@EnableCaching
+@Configuration
+public class CacheConfiguration {
+
+    @Bean
+    CacheManager cacheManager() {
+        SimpleCacheManager cacheManager = new SimpleCacheManager();
+        List<Cache> caches = new ArrayList<>();
+        caches.add(new ConcurrentMapCache("questions"));
+        caches.add(new ConcurrentMapCache("question"));
+        cacheManager.setCaches(caches);
+        return cacheManager;
+    }
+
+}

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

@@ -0,0 +1,19 @@
+package com.dnd.namuiwiki.config;
+
+import com.dnd.namuiwiki.domain.statistic.StatisticsService;
+import com.dnd.namuiwiki.domain.survey.SurveyEventHandler;
+import lombok.RequiredArgsConstructor;
+import org.springframework.context.annotation.Bean;
+import org.springframework.context.annotation.Configuration;
+
+@Configuration
+@RequiredArgsConstructor
+public class EventConfiguration {
+    private final StatisticsService statisticsService;
+
+    @Bean
+    public SurveyEventHandler surveyEventHandler() {
+        return new SurveyEventHandler(statisticsService);
+    }
+
+}

src/main/java/com/dnd/namuiwiki/domain/question/QuestionRepository.java

@@ -1,7 +1,21 @@
 package com.dnd.namuiwiki.domain.question;
 
 import com.dnd.namuiwiki.domain.question.entity.Question;
+import org.springframework.cache.annotation.Cacheable;
 import org.springframework.data.mongodb.repository.MongoRepository;
+import org.springframework.lang.NonNull;
+
+import java.util.List;
+import java.util.Optional;
 
 public interface QuestionRepository extends MongoRepository<Question, String> {
+
+    @NonNull
+    @Cacheable("questions")
+    List<Question> findAll();
+
+    @NonNull
+    @Cacheable("question")
+    Optional<Question> findById(@NonNull String id);
+
 }

src/main/java/com/dnd/namuiwiki/domain/question/entity/Question.java

@@ -28,7 +28,7 @@ public class Question extends BaseTimeEntity {
     private Long surveyOrder;
     private boolean reasonRequired;
 
-    @DocumentReference
+    @DocumentReference(collection = "options")
     private Map<String, Option> options;
 
     public Optional<Option> getOption(String optionId) {

src/main/java/com/dnd/namuiwiki/domain/survey/SurveyEventHandler.java

@@ -0,0 +1,25 @@
+package com.dnd.namuiwiki.domain.survey;
+
+import com.dnd.namuiwiki.domain.statistic.StatisticsService;
+import com.dnd.namuiwiki.domain.survey.model.dto.SurveyCreatedEvent;
+import com.dnd.namuiwiki.domain.survey.model.entity.Survey;
+import lombok.RequiredArgsConstructor;
+import lombok.extern.slf4j.Slf4j;
+import org.springframework.context.event.EventListener;
+import org.springframework.scheduling.annotation.Async;
+
+@Slf4j
+@RequiredArgsConstructor
+public class SurveyEventHandler {
+    private final StatisticsService statisticsService;
+
+    @Async
+    @EventListener
+    public void handleSurveySuccessEvent(SurveyCreatedEvent event) {
+        Survey survey = event.getSurvey();
+        log.info("SurveyEventHandler.handleSurveySuccessEvent: surveyId={}", survey.getId());
+
+        statisticsService.updateStatistics(survey);
+    }
+
+}

src/main/java/com/dnd/namuiwiki/domain/survey/SurveyService.java

@@ -9,7 +9,6 @@
 import com.dnd.namuiwiki.domain.option.entity.Option;
 import com.dnd.namuiwiki.domain.question.QuestionRepository;
 import com.dnd.namuiwiki.domain.question.entity.Question;
-import com.dnd.namuiwiki.domain.statistic.StatisticsService;
 import com.dnd.namuiwiki.domain.survey.model.dto.AnswerDto;
 import com.dnd.namuiwiki.domain.survey.model.dto.CreateSurveyRequest;
 import com.dnd.namuiwiki.domain.survey.model.dto.CreateSurveyResponse;
@@ -18,6 +17,7 @@
 import com.dnd.namuiwiki.domain.survey.model.dto.ReceivedSurveyDto;
 import com.dnd.namuiwiki.domain.survey.model.dto.SentSurveyDto;
 import com.dnd.namuiwiki.domain.survey.model.dto.SingleAnswerWithSurveyDetailDto;
+import com.dnd.namuiwiki.domain.survey.model.dto.SurveyCreatedEvent;
 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.AnswerType;
@@ -26,6 +26,8 @@
 import com.dnd.namuiwiki.domain.user.UserRepository;
 import com.dnd.namuiwiki.domain.user.entity.User;
 import lombok.RequiredArgsConstructor;
+import lombok.extern.slf4j.Slf4j;
+import org.springframework.context.ApplicationEventPublisher;
 import org.springframework.data.domain.Page;
 import org.springframework.data.domain.PageRequest;
 import org.springframework.data.domain.Pageable;
@@ -34,6 +36,7 @@
 
 import java.util.List;
 
+@Slf4j
 @Service
 @RequiredArgsConstructor
 public class SurveyService {
@@ -42,7 +45,7 @@ public class SurveyService {
     private final QuestionRepository questionRepository;
     private final OptionRepository optionRepository;
     private final JwtProvider jwtProvider;
-    private final StatisticsService statisticsService;
+    private final ApplicationEventPublisher applicationEventPublisher;
 
     public CreateSurveyResponse createSurvey(CreateSurveyRequest request, String accessToken) {
         User owner = getUserByWikiId(request.getOwner());
@@ -59,7 +62,9 @@ public CreateSurveyResponse createSurvey(CreateSurveyRequest request, String acc
                 .answers(surveyAnswer)
                 .build());
 
-        statisticsService.updateStatistics(survey);
+        log.info("SurveyService.createSurvey: surveyId={} done", survey.getId());
+
+        applicationEventPublisher.publishEvent(new SurveyCreatedEvent(survey));
 
         return new CreateSurveyResponse(survey.getId());
     }

src/main/java/com/dnd/namuiwiki/domain/survey/model/dto/SurveyCreatedEvent.java

@@ -0,0 +1,11 @@
+package com.dnd.namuiwiki.domain.survey.model.dto;
+
+import com.dnd.namuiwiki.domain.survey.model.entity.Survey;
+import lombok.Getter;
+import lombok.RequiredArgsConstructor;
+
+@Getter
+@RequiredArgsConstructor
+public class SurveyCreatedEvent {
+    private final Survey survey;
+}

src/main/java/com/dnd/namuiwiki/domain/survey/model/entity/Survey.java

@@ -22,10 +22,10 @@ public class Survey extends BaseTimeEntity {
     @Id
     private String id;
 
-    @DocumentReference
+    @DocumentReference(collection = "users", lazy = true)
     private User owner;
 
-    @DocumentReference
+    @DocumentReference(collection = "users", lazy = true)
     private User sender;
 
     private String senderName;