[FEAT] 화면공유 DTO 변경

src/main/java/com/debatetimer/controller/sharing/SharingController.java

@@ -1,9 +1,8 @@
 package com.debatetimer.controller.sharing;
 
-import com.debatetimer.controller.auth.AuthMember;
-import com.debatetimer.domain.member.Member;
 import com.debatetimer.dto.sharing.request.SharingRequest;
 import com.debatetimer.dto.sharing.response.SharingResponse;
+import jakarta.validation.Valid;
 import org.springframework.messaging.handler.annotation.DestinationVariable;
 import org.springframework.messaging.handler.annotation.MessageMapping;
 import org.springframework.messaging.handler.annotation.Payload;
@@ -16,10 +15,9 @@ public class SharingController {
     @MessageMapping("/event/{roomId}")
     @SendTo("/room/{roomId}")
     public SharingResponse share(
-            @AuthMember Member member,
             @DestinationVariable(value = "roomId") long roomId,
-            @Payload SharingRequest request
+            @Valid @Payload SharingRequest request
     ) {
-        return new SharingResponse(request.time());
+        return new SharingResponse(request.eventType(), request.toTimerEventInfo());
     }
 }

src/main/java/com/debatetimer/domain/sharing/TimerEventInfo.java

@@ -0,0 +1,16 @@
+package com.debatetimer.domain.sharing;
+
+import com.debatetimer.domain.customize.CustomizeBoxType;
+import com.debatetimer.domain.customize.Stance;
+import lombok.Getter;
+import lombok.RequiredArgsConstructor;
+
+@Getter
+@RequiredArgsConstructor
+public class TimerEventInfo {
+
+    private final CustomizeBoxType timerType;
+    private final int sequence;
+    private final Stance currentTeam;
+    private final long remainingTime;
+}

src/main/java/com/debatetimer/domain/sharing/TimerEventType.java

@@ -0,0 +1,12 @@
+package com.debatetimer.domain.sharing;
+
+public enum TimerEventType {
+
+    NEXT,
+    BEFORE,
+    STOP,
+    PLAY,
+    RESET,
+    TEAM_SWITCH,
+    FINISHED
+}

src/main/java/com/debatetimer/dto/sharing/request/SharingRequest.java

@@ -1,9 +1,18 @@
 package com.debatetimer.dto.sharing.request;
 
-import java.time.LocalDateTime;
+import com.debatetimer.domain.sharing.TimerEventInfo;
+import com.debatetimer.domain.sharing.TimerEventType;
+import jakarta.validation.Valid;
 
 public record SharingRequest(
-        LocalDateTime time
+        TimerEventType eventType,
+        @Valid TimerEventInfoRequest data
 ) {
 
+    public TimerEventInfo toTimerEventInfo() {
+        if (data == null) {
+            return null;
+        }
+        return data.toTimerEventInfo();
+    }
 }

src/main/java/com/debatetimer/dto/sharing/request/TimerEventInfoRequest.java

@@ -0,0 +1,24 @@
+package com.debatetimer.dto.sharing.request;
+
+import com.debatetimer.domain.customize.CustomizeBoxType;
+import com.debatetimer.domain.customize.Stance;
+import com.debatetimer.domain.sharing.TimerEventInfo;
+import jakarta.annotation.Nullable;
+import jakarta.validation.constraints.NotNull;
+
+public record TimerEventInfoRequest(
+        @NotNull CustomizeBoxType timerType,
+        int sequence,
+        @Nullable Stance currentTeam,
+        long time
+) {
+
+    public TimerEventInfo toTimerEventInfo() {
+        return new TimerEventInfo(
+                timerType,
+                sequence,
+                currentTeam,
+                time
+        );
+    }
+}

src/main/java/com/debatetimer/dto/sharing/response/SharingResponse.java

@@ -1,9 +1,18 @@
 package com.debatetimer.dto.sharing.response;
 
-import java.time.LocalDateTime;
+import com.debatetimer.domain.sharing.TimerEventInfo;
+import com.debatetimer.domain.sharing.TimerEventType;
 
 public record SharingResponse(
-        LocalDateTime time
+        TimerEventType eventType,
+        TimerEventInfoResponse data
 ) {
 
+    public SharingResponse(TimerEventType eventType, TimerEventInfo timerEventInfo) {
+        this(
+                eventType,
+                new TimerEventInfoResponse(timerEventInfo)
+        );
+    }
+
 }

src/main/java/com/debatetimer/dto/sharing/response/TimerEventInfoResponse.java

@@ -0,0 +1,25 @@
+package com.debatetimer.dto.sharing.response;
+
+
+import com.debatetimer.domain.customize.CustomizeBoxType;
+import com.debatetimer.domain.customize.Stance;
+import com.debatetimer.domain.sharing.TimerEventInfo;
+import jakarta.annotation.Nullable;
+import jakarta.validation.constraints.NotNull;
+
+public record TimerEventInfoResponse(
+        @NotNull CustomizeBoxType timerType,
+        int sequence,
+        @Nullable Stance currentTeam,
+        long time
+) {
+
+    public TimerEventInfoResponse(TimerEventInfo timerEventInfo) {
+        this(
+                timerEventInfo.getTimerType(),
+                timerEventInfo.getSequence(),
+                timerEventInfo.getCurrentTeam(),
+                timerEventInfo.getRemainingTime()
+        );
+    }
+}

src/test/java/com/debatetimer/BaseStompTest.java

@@ -10,6 +10,7 @@
 import java.util.concurrent.TimeoutException;
 import org.junit.jupiter.api.AfterEach;
 import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.extension.ExtendWith;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.boot.test.context.SpringBootTest;
 import org.springframework.boot.test.web.server.LocalServerPort;
@@ -23,6 +24,7 @@
 import org.springframework.web.socket.sockjs.client.Transport;
 import org.springframework.web.socket.sockjs.client.WebSocketTransport;
 
+@ExtendWith(DataBaseCleaner.class)
 @SpringBootTest(webEnvironment = SpringBootTest.WebEnvironment.RANDOM_PORT)
 public abstract class BaseStompTest {
 

src/test/java/com/debatetimer/controller/sharing/SharingControllerTest.java

@@ -1,18 +1,24 @@
 package com.debatetimer.controller.sharing;
 
 import static org.assertj.core.api.Assertions.assertThat;
+import static org.assertj.core.api.Assertions.assertThatThrownBy;
+import static org.junit.jupiter.api.Assertions.assertAll;
 
 import com.debatetimer.BaseStompTest;
 import com.debatetimer.MessageFrameHandler;
+import com.debatetimer.domain.customize.CustomizeBoxType;
 import com.debatetimer.domain.member.Member;
+import com.debatetimer.domain.sharing.TimerEventType;
 import com.debatetimer.dto.sharing.request.SharingRequest;
+import com.debatetimer.dto.sharing.request.TimerEventInfoRequest;
 import com.debatetimer.dto.sharing.response.SharingResponse;
-import java.time.LocalDateTime;
 import java.util.concurrent.ExecutionException;
 import java.util.concurrent.TimeUnit;
 import java.util.concurrent.TimeoutException;
 import org.junit.jupiter.api.Nested;
 import org.junit.jupiter.api.Test;
+import org.junit.jupiter.params.ParameterizedTest;
+import org.junit.jupiter.params.provider.NullSource;
 import org.springframework.messaging.simp.stomp.StompHeaders;
 
 class SharingControllerTest extends BaseStompTest {
@@ -23,17 +29,57 @@ class Share {
         @Test
         void 사회자가_발생시킨_이벤트를_청중이_공유받는다() throws ExecutionException, InterruptedException, TimeoutException {
             long roomId = 1L;
-            LocalDateTime time = LocalDateTime.now();
             MessageFrameHandler<SharingResponse> handler = new MessageFrameHandler<>(SharingResponse.class);
             Member member = memberGenerator.generate("example@email.com");
             StompHeaders headers = headerGenerator.generateAccessTokenHeader("/app/event/" + roomId, member);
+            SharingRequest request = new SharingRequest(
+                    TimerEventType.NEXT,
+                    new TimerEventInfoRequest(
+                            CustomizeBoxType.NORMAL,
+                            2,
+                            null,
+                            30
+                    )
+            );
             stompSession.subscribe("/room/" + roomId, handler); //청중의 구독
 
-            stompSession.send(headers, new SharingRequest(time)); //사회자의 이벤트 발생
+            stompSession.send(headers, request); //사회자의 이벤트 발생
 
             SharingResponse response = handler.getCompletableFuture()
                     .get(3L, TimeUnit.SECONDS);
-            assertThat(response.time()).isEqualTo(time);
+
+            assertAll(
+                    () -> assertThat(response.eventType()).isEqualTo(request.eventType()),
+                    () -> assertThat(response.data().timerType()).isEqualTo(request.data().timerType()),
+                    () -> assertThat(response.data().sequence()).isEqualTo(request.data().sequence()),
+                    () -> assertThat(response.data().currentTeam()).isEqualTo(request.data().currentTeam()),
+                    () -> assertThat(response.data().time()).isEqualTo(request.data().time())
+            );
+        }
+
+        @ParameterizedTest
+        @NullSource
+        void 타이머_타입은_빈_값일_수_없다(CustomizeBoxType boxType) {
+            long roomId = 1L;
+            MessageFrameHandler<SharingResponse> handler = new MessageFrameHandler<>(SharingResponse.class);
+            Member member = memberGenerator.generate("example@email.com");
+            StompHeaders headers = headerGenerator.generateAccessTokenHeader("/app/event/" + roomId, member);
+            SharingRequest request = new SharingRequest(
+                    TimerEventType.NEXT,
+                    new TimerEventInfoRequest(
+                            boxType,
+                            2,
+                            null,
+                            30
+                    )
+            );
+            stompSession.subscribe("/room/" + roomId, handler); //청중의 구독
+
+            stompSession.send(headers, request); //사회자의 이벤트 발생
+
+            assertThatThrownBy(() -> handler.getCompletableFuture()
+                    .get(2L, TimeUnit.SECONDS))
+                    .isInstanceOf(TimeoutException.class);
         }
     }
 }