Merge pull request #189 from tipi-tapi/feature/188

일기 생성시, 광고 리워드가 아닌 티켓을 사용하도록 개선

src/main/java/tipitapi/drawmytoday/common/exception/ErrorCode.java

@@ -64,7 +64,10 @@ public enum ErrorCode {
     GENERATE_KEY_FAILED(500, "O003", "키 생성에 실패하였습니다."),
 
     // REST
-    REST_CLIENT_FAILED(500, "R001", "외부로의 REST 통신에 실패하였습니다.");
+    REST_CLIENT_FAILED(500, "R001", "외부로의 REST 통신에 실패하였습니다."),
+
+    // Ticket
+    VALID_TICKET_NOT_EXISTS(404, "T001", "유효한 티켓이 존재하지 않습니다.");
 
 
     private final int status;

src/main/java/tipitapi/drawmytoday/diary/controller/DiaryController.java

@@ -150,6 +150,14 @@ public ResponseEntity<SuccessResponse<GetLastCreationResponse>> getLastCreation(
             responseCode = "404",
             description = "E001 : 감정을 찾을 수 없습니다.",
             content = @Content(schema = @Schema(hidden = true))),
+        @ApiResponse(
+            responseCode = "409",
+            description = "D001 : 이미 일기를 그린 날짜입니다.",
+            content = @Content(schema = @Schema(hidden = true))),
+        @ApiResponse(
+            responseCode = "404",
+            description = "T001 : 유효한 티켓이 존재하지 않습니다.",
+            content = @Content(schema = @Schema(hidden = true))),
         @ApiResponse(
             responseCode = "500",
             description = "DE001 : DALL-E 이미지 생성에 실패하였습니다.",

src/main/java/tipitapi/drawmytoday/diary/service/CreateDiaryService.java

@@ -15,6 +15,7 @@
 import tipitapi.drawmytoday.diary.repository.DiaryRepository;
 import tipitapi.drawmytoday.emotion.domain.Emotion;
 import tipitapi.drawmytoday.emotion.service.ValidateEmotionService;
+import tipitapi.drawmytoday.ticket.service.ValidateTicketService;
 import tipitapi.drawmytoday.user.domain.User;
 import tipitapi.drawmytoday.user.service.ValidateUserService;
 
@@ -28,6 +29,7 @@ public class CreateDiaryService {
     private final ValidateUserService validateUserService;
     private final ValidateEmotionService validateEmotionService;
     private final ValidateDiaryService validateDiaryService;
+    private final ValidateTicketService validateTicketService;
     private final DallEService dallEService;
     private final PromptService promptService;
     private final PromptTextService promptTextService;
@@ -41,8 +43,9 @@ public CreateDiaryResponse createDiary(Long userId, Long emotionId, String keywo
         String notes, LocalDate diaryDate, LocalTime userTime)
         throws DallERequestFailException, ImageInputStreamFailException {
         // TODO: 이미지 여러 개로 요청할 경우의 핸들링 필요
-        User user = validateUserService.validateUserWithDrawLimit(userId);
+        User user = validateUserService.validateUserById(userId);
         validateDiaryService.validateExistsByDate(userId, diaryDate);
+        validateTicketService.findAndUseTicket(userId);
         Emotion emotion = validateEmotionService.validateEmotionById(emotionId);
         String prompt = promptTextService.createPromptText(emotion, keyword);
         LocalDateTime diaryDateTime = diaryDate.atTime(userTime);
@@ -61,10 +64,11 @@ public CreateDiaryResponse createDiary(Long userId, Long emotionId, String keywo
         }
     }
 
-    @Transactional(readOnly = false)
+    @Transactional
     public CreateDiaryResponse createTestDiary(Long userId, Long emotionId, String keyword,
         String notes, LocalDate diaryDate, LocalTime userTime) {
-        User user = validateUserService.validateUserWithDrawLimit(userId);
+        User user = validateUserService.validateAdminUserById(userId);
+        validateDiaryService.validateExistsByDate(userId, diaryDate);
         Emotion emotion = validateEmotionService.validateEmotionById(emotionId);
         LocalDateTime diaryDateTime = diaryDate.atTime(userTime);
 

src/main/java/tipitapi/drawmytoday/ticket/exception/ValidTicketNotExistsException.java

@@ -0,0 +1,11 @@
+package tipitapi.drawmytoday.ticket.exception;
+
+import tipitapi.drawmytoday.common.exception.BusinessException;
+import tipitapi.drawmytoday.common.exception.ErrorCode;
+
+public class ValidTicketNotExistsException extends BusinessException {
+
+    public ValidTicketNotExistsException() {
+        super(ErrorCode.VALID_TICKET_NOT_EXISTS);
+    }
+}

src/main/java/tipitapi/drawmytoday/ticket/service/ValidateTicketService.java

@@ -5,6 +5,7 @@
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
 import tipitapi.drawmytoday.ticket.domain.Ticket;
+import tipitapi.drawmytoday.ticket.exception.ValidTicketNotExistsException;
 import tipitapi.drawmytoday.ticket.repository.TicketRepository;
 
 @Service
@@ -17,4 +18,11 @@ public class ValidateTicketService {
     public Optional<Ticket> findValidTicket(Long userId) {
         return ticketRepository.findValidTicket(userId);
     }
+
+    @Transactional
+    public void findAndUseTicket(Long userId) {
+        ticketRepository.findValidTicket(userId)
+            .orElseThrow(ValidTicketNotExistsException::new)
+            .use();
+    }
 }

src/main/java/tipitapi/drawmytoday/user/service/ValidateUserService.java

@@ -3,9 +3,6 @@
 import lombok.RequiredArgsConstructor;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
-import tipitapi.drawmytoday.adreward.service.UseAdRewardService;
-import tipitapi.drawmytoday.common.exception.BusinessException;
-import tipitapi.drawmytoday.common.exception.ErrorCode;
 import tipitapi.drawmytoday.user.domain.SocialCode;
 import tipitapi.drawmytoday.user.domain.User;
 import tipitapi.drawmytoday.user.exception.UserAccessDeniedException;
@@ -18,7 +15,6 @@
 public class ValidateUserService {
 
     private final UserRepository userRepository;
-    private final UseAdRewardService useAdRewardService;
 
     public User validateUserById(Long userId) {
         return userRepository.findByUserId(userId)
@@ -32,18 +28,6 @@ public User validateRegisteredUserByEmail(String email, SocialCode socialCode) {
             .orElse(null);
     }
 
-    public User validateUserWithDrawLimit(Long userId) {
-        User user = validateUserById(userId);
-        if (user.checkDrawLimit()) {
-            return user;
-        } else {
-            if (useAdRewardService.useReward(userId)) {
-                return user;
-            }
-            throw new BusinessException(ErrorCode.USER_ALREADY_DRAW_DIARY);
-        }
-    }
-
     public User validateAdminUserById(Long userId) {
         User user = validateUserById(userId);
         if (user.isAdmin()) {

src/test/java/tipitapi/drawmytoday/diary/service/CreateDiaryServiceTest.java

@@ -32,6 +32,7 @@
 import tipitapi.drawmytoday.diary.repository.DiaryRepository;
 import tipitapi.drawmytoday.emotion.domain.Emotion;
 import tipitapi.drawmytoday.emotion.service.ValidateEmotionService;
+import tipitapi.drawmytoday.ticket.service.ValidateTicketService;
 import tipitapi.drawmytoday.user.domain.User;
 import tipitapi.drawmytoday.user.service.ValidateUserService;
 
@@ -49,6 +50,10 @@ class CreateDiaryServiceTest {
     @Mock
     private ValidateEmotionService validateEmotionService;
     @Mock
+    private ValidateDiaryService validateDiaryService;
+    @Mock
+    private ValidateTicketService validateTicketService;
+    @Mock
     private DallEService dallEService;
     @Mock
     private PromptService promptService;
@@ -85,7 +90,7 @@ void exception_throw_then_create_fail_prompt(Class<? extends Throwable> exceptio
                 Emotion emotion = TestEmotion.createEmotionWithId(EMOTION_ID);
                 String prompt = "test prompt";
 
-                given(validateUserService.validateUserWithDrawLimit(USER_ID)).willReturn(user);
+                given(validateUserService.validateUserById(USER_ID)).willReturn(user);
                 given(validateEmotionService.validateEmotionById(EMOTION_ID)).willReturn(emotion);
                 given(promptTextService.createPromptText(emotion, KEYWORD)).willReturn(prompt);
                 given(dallEService.getImageAsUrl(eq(prompt))).willThrow(exceptionClass);
@@ -115,7 +120,7 @@ void success_then_create_diary() throws Exception {
                 Emotion emotion = TestEmotion.createEmotionWithId(EMOTION_ID);
                 Diary diary = TestDiary.createDiaryWithId(diaryId, user, emotion);
 
-                given(validateUserService.validateUserWithDrawLimit(USER_ID)).willReturn(user);
+                given(validateUserService.validateUserById(USER_ID)).willReturn(user);
                 given(validateEmotionService.validateEmotionById(EMOTION_ID)).willReturn(emotion);
                 given(promptTextService.createPromptText(emotion, KEYWORD)).willReturn(prompt);
                 given(dallEService.getImageAsUrl(prompt)).willReturn(image);
@@ -160,7 +165,7 @@ void not_draw_image() throws Exception {
             Emotion emotion = TestEmotion.createEmotionWithId(emotionId);
             Diary diary = TestDiary.createDiaryWithId(diaryId, user, emotion);
 
-            given(validateUserService.validateUserWithDrawLimit(userId)).willReturn(user);
+            given(validateUserService.validateAdminUserById(userId)).willReturn(user);
             given(validateEmotionService.validateEmotionById(emotionId)).willReturn(emotion);
             given(encryptor.encrypt(notes)).willReturn("암호화된 노트");
             given(diaryRepository.save(any(Diary.class))).willReturn(diary);

src/test/java/tipitapi/drawmytoday/ticket/service/ValidateTicketServiceTest.java

@@ -1,6 +1,7 @@
 package tipitapi.drawmytoday.ticket.service;
 
 import static org.assertj.core.api.Assertions.assertThat;
+import static org.assertj.core.api.Assertions.assertThatThrownBy;
 import static org.mockito.ArgumentMatchers.anyLong;
 import static org.mockito.BDDMockito.given;
 import static tipitapi.drawmytoday.common.testdata.TestUser.createUserWithId;
@@ -15,6 +16,7 @@
 import org.mockito.junit.jupiter.MockitoExtension;
 import tipitapi.drawmytoday.ticket.domain.Ticket;
 import tipitapi.drawmytoday.ticket.domain.TicketType;
+import tipitapi.drawmytoday.ticket.exception.ValidTicketNotExistsException;
 import tipitapi.drawmytoday.ticket.repository.TicketRepository;
 import tipitapi.drawmytoday.user.domain.User;
 
@@ -63,4 +65,41 @@ void return_ticket() {
             }
         }
     }
+
+    @Nested
+    @DisplayName("findAndUseTicket 메소드 테스트")
+    class FindAndUseTicketTest {
+
+        @Nested
+
+        @DisplayName("유효한 티켓이 존재하지 않을 경우")
+        class If_no_valid_ticket_exists {
+
+            @Test
+            @DisplayName("null를 반환한다.")
+            void throws_ValidTicketNotExistsException() {
+                given(ticketRepository.findValidTicket(anyLong())).willReturn(Optional.empty());
+
+                assertThatThrownBy(() -> validateTicketService.findAndUseTicket(1L))
+                    .isInstanceOf(ValidTicketNotExistsException.class);
+            }
+        }
+
+        @Nested
+        @DisplayName("유효한 티켓이 존재할 경우")
+        class If_valid_ticket_exists {
+
+            @Test
+            @DisplayName("티켓을 사용한다.")
+            void use_ticket() {
+                User user = createUserWithId(1L);
+                Ticket ticket = Ticket.of(user, TicketType.JOIN);
+                given(ticketRepository.findValidTicket(anyLong())).willReturn(Optional.of(ticket));
+
+                validateTicketService.findAndUseTicket(user.getUserId());
+
+                assertThat(ticket.getUsedAt()).isNotNull();
+            }
+        }
+    }
 }