test: 테스트 코드 수정

softeerbootcamp4th · Aug 22, 2024 · 3693238 · 3693238
1 parent 530bd70
commit 3693238
Show file tree

Hide file tree

Showing 4 changed files with 8 additions and 38 deletions.
diff --git a/src/main/java/com/softeer/backend/fo_domain/mainpage/dto/MainPageEventInfoResponseDto.java b/src/main/java/com/softeer/backend/fo_domain/mainpage/dto/MainPageEventInfoResponseDto.java
@@ -27,9 +27,6 @@ public class MainPageEventInfoResponseDto {
 
     private String fcfsHint;
 
-    @JsonProperty("isFcfsAvailable")
-    private boolean isFcfsAvailable;
-
     @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
-    private LocalDateTime nextFcfsStartTime;
+    private LocalDateTime fcfsStartTime;
 }
diff --git a/src/main/java/com/softeer/backend/fo_domain/mainpage/service/MainPageService.java b/src/main/java/com/softeer/backend/fo_domain/mainpage/service/MainPageService.java
@@ -105,13 +105,6 @@ public MainPageEventInfoResponseDto getEventPageInfo() {
 
         int remainDrawCount = totalDrawWinner - (int) drawRepository.count();
 
-        String fcfsTime = "";
-        if(firstFcfsSetting.getStartTime().getMinute() != 0){
-            fcfsTime = firstFcfsSetting.getStartTime().format(fcfsTimeFormatter);
-        }
-        else
-            fcfsTime = firstFcfsSetting.getStartTime().format(fcfsTimeMinFormatter);
-
         String fcfsTime = "";
         if(firstFcfsSetting.getStartTime().getMinute() != 0){
             fcfsTime = firstFcfsSetting.getStartTime().format(fcfsTimeFormatter);

diff --git a/src/test/java/com/softeer/backend/fo_domain/draw/service/DrawServiceTest.java b/src/test/java/com/softeer/backend/fo_domain/draw/service/DrawServiceTest.java
@@ -12,6 +12,7 @@
 import com.softeer.backend.fo_domain.draw.dto.history.DrawHistoryLoserResponseDto;
 import com.softeer.backend.fo_domain.draw.dto.history.DrawHistoryResponseDto;
 import com.softeer.backend.fo_domain.draw.dto.history.DrawHistoryWinnerResponseDto;
+import com.softeer.backend.fo_domain.draw.exception.DrawException;
 import com.softeer.backend.fo_domain.draw.repository.DrawParticipationInfoRepository;
 import com.softeer.backend.fo_domain.draw.repository.DrawRepository;
 import com.softeer.backend.fo_domain.draw.util.DrawAttendanceCountUtil;
@@ -40,8 +41,7 @@
 import static org.assertj.core.api.Assertions.*;
 import static org.mockito.ArgumentMatchers.anyInt;
 import static org.mockito.ArgumentMatchers.anyList;
-import static org.mockito.Mockito.lenient;
-import static org.mockito.Mockito.when;
+import static org.mockito.Mockito.*;
 
 
 @Transactional
@@ -135,7 +135,7 @@ void getDrawMainPageFullAttend() {
 
         when(shareInfoRepository.findShareInfoByUserId(userId)).thenReturn(Optional.ofNullable(shareInfo));
 
-        when(drawAttendanceCountUtil.handleAttendanceCount(userId, drawParticipationInfo)).thenReturn(7);
+        lenient().when(drawAttendanceCountUtil.handleAttendanceCount(userId, drawParticipationInfo)).thenReturn(7);
 
         DrawMainFullAttendResponseDto expectedResponse = DrawMainFullAttendResponseDto
                 .builder()
@@ -215,29 +215,9 @@ void participateDrawEventZero() {
 
         when(shareInfoRepository.findShareInfoByUserId(userId)).thenReturn(Optional.ofNullable(shareInfo));
 
-        ArrayList<String> images = new ArrayList<>();
-        images.add("left");
-        images.add("left");
-        images.add("right");
-
-        DrawLoseModalResponseDto drawLoseModalResponseDto = DrawLoseModalResponseDto.builder()
-                .isDrawWin(false)
-                .images(images)
-                .shareUrl("https://softeer.site/share/of8w")
-                .build();
-
-        when(drawResponseGenerateUtil.generateDrawLoserResponse(userId)).thenReturn(drawLoseModalResponseDto);
-
-        // when
-        DrawModalResponseDto actualResponse = drawService.participateDrawEvent(userId);
-
-        // then
-        assertThat(actualResponse).isNotNull();
-        assertThat(actualResponse.isDrawWin()).isEqualTo(false);
-        assertThat(((DrawLoseModalResponseDto) actualResponse).getShareUrl()).isEqualTo("https://softeer.site/share/of8w");
-        assertThat(actualResponse.getImages().get(0)).isEqualTo("left");
-        assertThat(actualResponse.getImages().get(1)).isEqualTo("left");
-        assertThat(actualResponse.getImages().get(2)).isEqualTo("right");
+        // When & Then
+        assertThatThrownBy(() -> drawService.participateDrawEvent(userId))
+                .isInstanceOf(DrawException.class);
     }
 
     @Test

diff --git a/src/test/java/com/softeer/backend/fo_domain/mainpage/service/MainPageServiceTest.java b/src/test/java/com/softeer/backend/fo_domain/mainpage/service/MainPageServiceTest.java
@@ -139,7 +139,7 @@ void testGetEventPageInfo() {
         assertThat(response.getStartDate()).isEqualTo("2024.08.01");
         assertThat(response.getEndDate()).isEqualTo("2024.08.31");
         assertThat(response.getFcfsHint()).isEqualTo("퀴즈 힌트");
-        assertThat(response.getNextFcfsStartTime()).isEqualTo(LocalDateTime.of(2024, 8, 22, 11, 0));
+        assertThat(response.getFcfsStartTime()).isEqualTo(LocalDateTime.of(2024, 8, 22, 11, 0));
     }
 
     @Test