Merge pull request #1134 from woowacourse-teams/BE/dev

JiHyeonL · web-flow · commit 63bc7f8c1e23 · 2025-02-19T14:24:23.000+09:00
[BE] 카테고리 &amp; 페어룸 버그 수정 테스트 서버로 이동
diff --git a/backend/src/main/java/site/coduo/pairroom/domain/PairRoomStatus.java b/backend/src/main/java/site/coduo/pairroom/domain/PairRoomStatus.java
@@ -13,13 +13,13 @@
 @Getter
 public enum PairRoomStatus {
 
-    IN_PROGRESS("in_progress"),
-    COMPLETED("completed"),
-    DELETED("deleted");
+    IN_PROGRESS("IN_PROGRESS"),
+    COMPLETED("COMPLETED"),
+    DELETED("DELETED");
 
     private static final Map<String, PairRoomStatus> STATUS = Arrays.stream(values())
             .collect(Collectors.toMap(PairRoomStatus::name, Function.identity()));
-    private final String name;
+    private final String message;
 
     public static PairRoomStatus findByName(String value) {
         if (STATUS.containsKey(value)) {
diff --git a/backend/src/main/java/site/coduo/pairroom/service/PairRoomService.java b/backend/src/main/java/site/coduo/pairroom/service/PairRoomService.java
@@ -173,7 +173,7 @@ public void completePairRoom(final String accessCode) {
         final PairRoomEntity pairRoomEntity = pairRoomRepository.fetchByAccessCode(accessCode);
         checkPairRoomIsActive(pairRoomEntity);
         pairRoomEntity.updateStatus(PairRoomStatus.COMPLETED);
-        pairRoomStompManager.send(accessCode, PairRoomStatus.COMPLETED);
+        pairRoomStompManager.sendStatus(accessCode, PairRoomStatus.COMPLETED);
     }
 
     private void checkPairRoomIsDeleted(final PairRoomEntity pairRoomEntity) {
diff --git a/backend/src/main/java/site/coduo/pairroom/service/PairRoomStompManager.java b/backend/src/main/java/site/coduo/pairroom/service/PairRoomStompManager.java
@@ -15,10 +15,10 @@ public class PairRoomStompManager {
 
     private final SimpMessagingTemplate simpMessagingTemplate;
 
-    public void send(final String accessCode, final PairRoomStatus pairRoomStatus) {
+    public void sendStatus(final String accessCode, final PairRoomStatus pairRoomStatus) {
         simpMessagingTemplate.convertAndSend(
                 String.format(STATUS_DESTINATION, accessCode),
-                new PairRoomStatusResponse(pairRoomStatus.getName())
+                new PairRoomStatusResponse(pairRoomStatus.getMessage())
         );
     }
 }
diff --git a/backend/src/main/java/site/coduo/referencelink/service/CategoryService.java b/backend/src/main/java/site/coduo/referencelink/service/CategoryService.java
@@ -64,7 +64,7 @@ public CategoryUpdateResponse updateCategoryName(final String accessCode,
         validateDuplicated(request.value(), pairRoomEntity);
         final CategoryEntity categoryEntity = categoryRepository.fetchByPairRoomAndCategoryId(pairRoomEntity,
                 categoryId);
-        final Category category = new Category(categoryEntity.getCategoryName());
+        final Category category = new Category(request.value());
         categoryEntity.updateCategoryName(category);
         return new CategoryUpdateResponse(categoryEntity.getCategoryName());
     }
diff --git a/backend/src/main/java/site/coduo/timer/controller/TimerController.java b/backend/src/main/java/site/coduo/timer/controller/TimerController.java
@@ -24,14 +24,14 @@ public class TimerController implements TimerDocs {
     private final SchedulerService schedulerService;
 
     @PatchMapping("/{accessCode}/timer/start")
-    public ResponseEntity<Void> createTimerStart(@PathVariable("accessCode") final String accessCode) {
+    public ResponseEntity<Void> startTimer(@PathVariable("accessCode") final String accessCode) {
         schedulerService.start(accessCode);
         return ResponseEntity.noContent()
                 .build();
     }
 
-    @PatchMapping("/{accessCode}/timer/stop")
-    public ResponseEntity<Void> createTimerStop(@PathVariable("accessCode") final String accessCode) {
+    @PatchMapping("/{accessCode}/timer/pause")
+    public ResponseEntity<Void> pauseTimer(@PathVariable("accessCode") final String accessCode) {
         schedulerService.pause(accessCode);
         return ResponseEntity.noContent()
                 .build();
diff --git a/backend/src/main/java/site/coduo/timer/controller/docs/TimerDocs.java b/backend/src/main/java/site/coduo/timer/controller/docs/TimerDocs.java
@@ -18,12 +18,12 @@ public interface TimerDocs {
     @Operation(summary = "타이머를 시작한다.")
     @ApiResponse(responseCode = "204", description = "타이머 시작 성공")
     @ApiResponse(responseCode = "4xx", description = "페어룸 시작 실패", content = @Content(mediaType = MediaType.APPLICATION_JSON_VALUE, schema = @Schema(implementation = ApiErrorResponse.class)))
-    ResponseEntity<Void> createTimerStart(String accessCode);
+    ResponseEntity<Void> startTimer(String accessCode);
 
     @Operation(summary = "타이머를 중지한다.")
     @ApiResponse(responseCode = "204", description = "타이머 즁자 성공")
     @ApiResponse(responseCode = "4xx", description = "페어룸 중지 실패", content = @Content(mediaType = MediaType.APPLICATION_JSON_VALUE, schema = @Schema(implementation = ApiErrorResponse.class)))
-    ResponseEntity<Void> createTimerStop(String accessCode);
+    ResponseEntity<Void> pauseTimer(String accessCode);
 
     @Operation(summary = "타이머를 업데이트한다.")
     @ApiResponse(responseCode = "204", description = "타이머 업데이트 성공", content = @Content(mediaType = MediaType.APPLICATION_JSON_VALUE))
diff --git a/backend/src/main/java/site/coduo/timer/domain/TimerStatus.java b/backend/src/main/java/site/coduo/timer/domain/TimerStatus.java
@@ -7,11 +7,11 @@
 @RequiredArgsConstructor
 public enum TimerStatus {
 
-    START("start"),
-    PAUSE("pause"),
-    STOP("stop"),
-    RUNNING("running"),
-    UPDATE("update");
+    START("START"),
+    PAUSE("PAUSE"),
+    STOP("STOP"),
+    RUNNING("RUNNING"),
+    UPDATE("UPDATE");
 
-    private final String name;
+    private final String message;
 }
diff --git a/backend/src/main/java/site/coduo/timer/service/SchedulerService.java b/backend/src/main/java/site/coduo/timer/service/SchedulerService.java
@@ -16,8 +16,6 @@
 import site.coduo.timer.domain.TimerStatus;
 import site.coduo.timer.repository.TimerEntity;
 import site.coduo.timer.repository.TimerRepository;
-import site.coduo.timer.service.dto.TimerStartResponse;
-import site.coduo.timer.service.dto.TimerStatusResponse;
 
 @Transactional
 @Slf4j
@@ -37,7 +35,7 @@ public void start(final String key) {
         if (schedulerRegistry.isActive(key)) {
             return;
         }
-        timerStompManager.send(key, new TimerStatusResponse(TimerStatus.START.getName(), null));
+        timerStompManager.sendStatus(key, TimerStatus.START);
         if (isInitial(key)) {
             final Timer timer = timerRepository.fetchTimerByAccessCode(key)
                     .toDomain();
@@ -61,38 +59,33 @@ private void scheduling(final String key, final Timer timer) {
 
     private void runTimer(final String key, final Timer timer) {
         if (timer.isTimeUp() && schedulerRegistry.has(key)) {
-            stop(key, timer);
+            reset(key, timer);
             return;
         }
-        if (timerStompManager.isTimerIdle(key) && schedulerRegistry.has(key)) {
-            pauseTimer(key);
+        if (timerStompManager.isTimerIdle(key) && schedulerRegistry.isActive(key)) {
+            schedulerRegistry.release(key);
             return;
         }
         timer.decreaseRemainingTime(DELAY_SECOND.toMillis());
-        timerStompManager.send(key, new TimerStartResponse(timer.getRemainingTime()));
+        timerStompManager.sendTime(key, timer.getRemainingTime());
     }
 
-    private void pauseTimer(final String key) {
+    public void pause(final String key) {
         if (schedulerRegistry.isActive(key)) {
             schedulerRegistry.release(key);
         }
+        timerStompManager.sendStatus(key, TimerStatus.PAUSE);
     }
 
-    public void pause(final String key) {
-        pauseTimer(key);
-        timerStompManager.send(key, new TimerStatusResponse(TimerStatus.PAUSE.getName(), null));
-    }
-
-    private void stop(final String key, final Timer timer) {
-        // timerStompManager.send(key, new TimerStatusResponse(TimerStatus.STOP.getName(), null));
+    private void reset(final String key, final Timer timer) {
         schedulerRegistry.release(key);
         final Timer initalTimer = new Timer(timer.getAccessCode(), timer.getDuration(), timer.getDuration());
         timestampRegistry.register(key, initalTimer);
     }
 
     public void notifyTimerStatus(final String key) {
         if (schedulerRegistry.isActive(key)) {
-            timerStompManager.send(key, new TimerStatusResponse(TimerStatus.RUNNING.getName(), null));
+            timerStompManager.sendStatus(key, TimerStatus.RUNNING);
         }
     }
 
diff --git a/backend/src/main/java/site/coduo/timer/service/TimerService.java b/backend/src/main/java/site/coduo/timer/service/TimerService.java
@@ -11,7 +11,6 @@
 import site.coduo.timer.domain.TimerStatus;
 import site.coduo.timer.repository.TimerEntity;
 import site.coduo.timer.repository.TimerRepository;
-import site.coduo.timer.service.dto.TimerStatusResponse;
 import site.coduo.timer.service.dto.TimerUpdateRequest;
 
 @Transactional(readOnly = true)
@@ -45,7 +44,6 @@ public void updateTimer(final String accessCode, final TimerUpdateRequest update
         );
         timerEntity.updateTimer(newTimer);
         timestampRegistry.register(accessCode, newTimer);
-        timerStompManager.send(accessCode,
-                new TimerStatusResponse(TimerStatus.UPDATE.getName(), newTimer.getDuration()));
+        timerStompManager.sendStatusAndTime(accessCode, TimerStatus.UPDATE, newTimer.getDuration());
     }
 }
diff --git a/backend/src/main/java/site/coduo/timer/service/TimerStompManager.java b/backend/src/main/java/site/coduo/timer/service/TimerStompManager.java
@@ -4,6 +4,7 @@
 import org.springframework.stereotype.Component;
 
 import lombok.RequiredArgsConstructor;
+import site.coduo.timer.domain.TimerStatus;
 import site.coduo.timer.service.dto.TimerStartResponse;
 import site.coduo.timer.service.dto.TimerStatusResponse;
 import site.coduo.websocket.stomp.StompSubscriptionService;
@@ -18,12 +19,22 @@ public class TimerStompManager {
     private final StompSubscriptionService stompSubscriptionService;
     private final SimpMessagingTemplate simpMessagingTemplate;
 
-    public void send(final String accessCode, final TimerStatusResponse payload) {
-        simpMessagingTemplate.convertAndSend(String.format(STATUS_DESTINATION, accessCode), payload);
+    public void sendStatus(final String accessCode, final TimerStatus status) {
+        simpMessagingTemplate.convertAndSend(
+                String.format(STATUS_DESTINATION, accessCode),
+                new TimerStatusResponse(status.getMessage(), null)
+        );
     }
 
-    public void send(final String accessCode, final TimerStartResponse payload) {
-        simpMessagingTemplate.convertAndSend(String.format(TIME_DESTINATION, accessCode), payload);
+    public void sendTime(final String accessCode, final long time) {
+        simpMessagingTemplate.convertAndSend(String.format(TIME_DESTINATION, accessCode), new TimerStartResponse(time));
+    }
+
+    public void sendStatusAndTime(final String accessCode, final TimerStatus status, final long time) {
+        simpMessagingTemplate.convertAndSend(
+                String.format(STATUS_DESTINATION, accessCode),
+                new TimerStatusResponse(status.getMessage(), time)
+        );
     }
 
     public boolean isTimerIdle(final String accessCode) {
diff --git a/backend/src/main/java/site/coduo/websocket/stomp/WebSocketBrokerConfig.java b/backend/src/main/java/site/coduo/websocket/stomp/WebSocketBrokerConfig.java
@@ -11,13 +11,13 @@
 public class WebSocketBrokerConfig implements WebSocketMessageBrokerConfigurer {
 
     @Override
-    public void configureMessageBroker(MessageBrokerRegistry config) {
+    public void configureMessageBroker(final MessageBrokerRegistry config) {
         config.enableSimpleBroker("/topic");
         config.setApplicationDestinationPrefixes("/send");
     }
 
     @Override
-    public void registerStompEndpoints(StompEndpointRegistry registry) {
+    public void registerStompEndpoints(final StompEndpointRegistry registry) {
         registry.addEndpoint("/ws")
                 .setAllowedOrigins("http://localhost:3000", "https://coduo.site", "https://test.coduo.site");
     }
diff --git a/backend/src/test/java/site/coduo/acceptance/CategoryAcceptanceTest.java b/backend/src/test/java/site/coduo/acceptance/CategoryAcceptanceTest.java
@@ -2,7 +2,6 @@
 
 import static org.assertj.core.api.Assertions.assertThat;
 
-import org.junit.jupiter.api.Disabled;
 import org.junit.jupiter.api.DisplayName;
 import org.junit.jupiter.api.Test;
 import org.springframework.http.MediaType;
@@ -59,7 +58,6 @@ void show_category() {
                 .statusCode(200);
     }
 
-    @Disabled
     @Test
     @DisplayName("카테고리를 업데이트 한다.")
     void update_category() {

Original file line number	Diff line number	Diff line change
`@@ -173,7 +173,7 @@ public void completePairRoom(final String accessCode) {`
`173`	`173`	`final PairRoomEntity pairRoomEntity = pairRoomRepository.fetchByAccessCode(accessCode);`
`174`	`174`	`checkPairRoomIsActive(pairRoomEntity);`
`175`	`175`	`pairRoomEntity.updateStatus(PairRoomStatus.COMPLETED);`
`176`		`- pairRoomStompManager.send(accessCode, PairRoomStatus.COMPLETED);`
	`176`	`+ pairRoomStompManager.sendStatus(accessCode, PairRoomStatus.COMPLETED);`
`177`	`177`	`}`
`178`	`178`
`179`	`179`	`private void checkPairRoomIsDeleted(final PairRoomEntity pairRoomEntity) {`
Original file line number	Diff line number	Diff line change
`@@ -15,10 +15,10 @@ public class PairRoomStompManager {`
`15`	`15`
`16`	`16`	`private final SimpMessagingTemplate simpMessagingTemplate;`
`17`	`17`
`18`		`- public void send(final String accessCode, final PairRoomStatus pairRoomStatus) {`
	`18`	`+ public void sendStatus(final String accessCode, final PairRoomStatus pairRoomStatus) {`
`19`	`19`	`simpMessagingTemplate.convertAndSend(`
`20`	`20`	`String.format(STATUS_DESTINATION, accessCode),`
`21`		`- new PairRoomStatusResponse(pairRoomStatus.getName())`
	`21`	`+ new PairRoomStatusResponse(pairRoomStatus.getMessage())`
`22`	`22`	`);`
`23`	`23`	`}`
`24`	`24`	`}`
Original file line number	Diff line number	Diff line change
`@@ -64,7 +64,7 @@ public CategoryUpdateResponse updateCategoryName(final String accessCode,`
`64`	`64`	`validateDuplicated(request.value(), pairRoomEntity);`
`65`	`65`	`final CategoryEntity categoryEntity = categoryRepository.fetchByPairRoomAndCategoryId(pairRoomEntity,`
`66`	`66`	`categoryId);`
`67`		`- final Category category = new Category(categoryEntity.getCategoryName());`
	`67`	`+ final Category category = new Category(request.value());`
`68`	`68`	`categoryEntity.updateCategoryName(category);`
`69`	`69`	`return new CategoryUpdateResponse(categoryEntity.getCategoryName());`
`70`	`70`	`}`