[DEPLOY] V2.2.1 배포

.github/workflows/Dev_CD.yml

@@ -16,7 +16,7 @@ jobs:
 
       - name: Setting dev-secret.yml
         run: |
-          echo "${{ secrets.DEV_SECRET_YML }}" > ./src/main/resources/dev-secret.yml
+          echo "${{ secrets.DEV_SECRET_TEMP_YML }}" > ./src/main/resources/dev-secret.yml
 
       - name: Set up JDK 17
         uses: actions/setup-java@v4
@@ -52,7 +52,7 @@ jobs:
 
   deploy:
     needs: build
-    runs-on: dev
+    runs-on: dev-temp
 
     steps:
       - name: Download artifact file

.github/workflows/Prod_CD.yml

@@ -16,7 +16,7 @@ jobs:
 
       - name: Setting prod-secret.yml
         run: |
-          echo "${{ secrets.PROD_SECRET_YML }}" > ./src/main/resources/prod-secret.yml
+          echo "${{ secrets.PROD_SECRET_TEMP_YML }}" > ./src/main/resources/prod-secret.yml
 
       - name: Set up JDK 17
         uses: actions/setup-java@v4
@@ -52,7 +52,7 @@ jobs:
 
   deploy:
     needs: build
-    runs-on: prod
+    runs-on: prod-temp
 
     steps:
       - name: Download artifact file

scripts/dev/zero-downtime-deploy.sh

@@ -163,7 +163,7 @@ switch_nginx_upstream() {
     log "Switching nginx upstream to port $new_port"
     sudo cp "$nginx_conf" "$backup_conf"
 
-    sed "s/server 127\.0\.0\.1:[0-9]\+;/server 127.0.0.1:$new_port;/" "$nginx_conf" > "$temp_conf"
+    sed "s|proxy_pass http://127\.0\.0\.1:[0-9]\+;|proxy_pass http://127.0.0.1:$new_port;|" "$nginx_conf" > "$temp_conf"
     sudo cp "$temp_conf" "$nginx_conf"
 
     if ! sudo nginx -t 2>/dev/null; then

scripts/nginx-switch-port.sh

@@ -33,7 +33,7 @@ log "Backing up current nginx configuration"
 sudo cp "$NGINX_CONF" "$BACKUP_CONF"
 
 log "Updating nginx upstream to port $NEW_PORT"
-sed "s/server 127\.0\.0\.1:[0-9]\+;/server 127.0.0.1:$NEW_PORT;/" "$NGINX_CONF" > "$TEMP_CONF"
+sed "s|proxy_pass http://127\.0\.0\.1:[0-9]\+;|proxy_pass http://127.0.0.1:$NEW_PORT;|" "$NGINX_CONF" > "$TEMP_CONF"
 
 log "Configuration changes:"
 diff "$NGINX_CONF" "$TEMP_CONF" || true

scripts/prod/zero-downtime-deploy.sh

@@ -163,7 +163,7 @@ switch_nginx_upstream() {
     log "Switching nginx upstream to port $new_port"
     sudo cp "$nginx_conf" "$backup_conf"
 
-    sed "s/server 127\.0\.0\.1:[0-9]\+;/server 127.0.0.1:$new_port;/" "$nginx_conf" > "$temp_conf"
+    sed "s|proxy_pass http://127\.0\.0\.1:[0-9]\+;|proxy_pass http://127.0.0.1:$new_port;|" "$nginx_conf" > "$temp_conf"
     sudo cp "$temp_conf" "$nginx_conf"
 
     if ! sudo nginx -t 2>/dev/null; then

src/main/java/com/debatetimer/config/sharing/WebSocketAuthMemberResolver.java

@@ -34,7 +34,7 @@ public Object resolveArgument(MethodParameter parameter, Message<?> message) {
             throw new DTClientErrorException(ClientErrorCode.UNAUTHORIZED_MEMBER);
         }
 
-        String email = authManager.resolveAccessToken(token);
+        String email = authManager.resolveChairmanToken(token);
         return authService.getMember(email);
     }
 }

src/main/java/com/debatetimer/config/sharing/WebSocketConfig.java

@@ -1,11 +1,14 @@
 package com.debatetimer.config.sharing;
 
 import com.debatetimer.config.CorsProperties;
+import java.time.Duration;
 import java.util.List;
 import lombok.RequiredArgsConstructor;
+import org.springframework.context.annotation.Bean;
 import org.springframework.context.annotation.Configuration;
 import org.springframework.messaging.handler.invocation.HandlerMethodArgumentResolver;
 import org.springframework.messaging.simp.config.MessageBrokerRegistry;
+import org.springframework.scheduling.concurrent.ThreadPoolTaskScheduler;
 import org.springframework.web.socket.config.annotation.EnableWebSocketMessageBroker;
 import org.springframework.web.socket.config.annotation.StompEndpointRegistry;
 import org.springframework.web.socket.config.annotation.WebSocketMessageBrokerConfigurer;
@@ -15,6 +18,12 @@
 @EnableWebSocketMessageBroker
 public class WebSocketConfig implements WebSocketMessageBrokerConfigurer {
 
+    private static final long SERVER_TO_CLIENT_HEARTBEAT_DURATION = Duration.ofSeconds(10).toMillis();
+    private static final long CLIENT_TO_SERVER_HEARTBEAT_DURATION = Duration.ofSeconds(10).toMillis();
+    private static final long SOCKJS_HEART_BEAT_DURATION = Duration.ofSeconds(10).toMillis();
+    private static final String HEART_BEAT_THREAD_PREFIX = "wss-heartbeat-";
+    private static final int HEART_BEAT_THREAD_COUNT = 1;
+
     private final CorsProperties corsProperties;
     private final WebSocketAuthMemberResolver webSocketAuthMemberResolver;
 
@@ -25,14 +34,26 @@ public void addArgumentResolvers(List<HandlerMethodArgumentResolver> resolvers)
 
     @Override
     public void configureMessageBroker(MessageBrokerRegistry registry) {
-        registry.enableSimpleBroker("/room", "/chairman");
+        registry.enableSimpleBroker("/room", "/chairman")
+                .setHeartbeatValue(new long[]{SERVER_TO_CLIENT_HEARTBEAT_DURATION, CLIENT_TO_SERVER_HEARTBEAT_DURATION})
+                .setTaskScheduler(heartBeatScheduler());
         registry.setApplicationDestinationPrefixes("/app");
     }
 
     @Override
     public void registerStompEndpoints(StompEndpointRegistry registry) {
         registry.addEndpoint("/ws")
                 .setAllowedOriginPatterns(corsProperties.getCorsOrigin())
-                .withSockJS();
+                .withSockJS()
+                .setHeartbeatTime(SOCKJS_HEART_BEAT_DURATION);
+    }
+
+    @Bean
+    public ThreadPoolTaskScheduler heartBeatScheduler() {
+        ThreadPoolTaskScheduler scheduler = new ThreadPoolTaskScheduler();
+        scheduler.setPoolSize(HEART_BEAT_THREAD_COUNT);
+        scheduler.setThreadNamePrefix(HEART_BEAT_THREAD_PREFIX);
+        scheduler.initialize();
+        return scheduler;
     }
 }

src/main/java/com/debatetimer/controller/customize/CustomizeController.java

@@ -39,7 +39,7 @@ public CustomizeTableResponse getTable(
             @PathVariable Long tableId,
             @AuthMember Member member
     ) {
-        return customizeService.findTable(tableId, member);
+        return customizeService.findMemberTable(tableId, member);
     }
 
     @PutMapping("/api/table/customize/{tableId}")

src/main/java/com/debatetimer/controller/organization/OrganizationController.java

@@ -1,10 +1,12 @@
 package com.debatetimer.controller.organization;
 
+import com.debatetimer.domain.organization.Language;
 import com.debatetimer.dto.organization.OrganizationResponses;
 import com.debatetimer.service.organization.OrganizationService;
 import lombok.RequiredArgsConstructor;
 import org.springframework.http.ResponseEntity;
 import org.springframework.web.bind.annotation.GetMapping;
+import org.springframework.web.bind.annotation.RequestParam;
 import org.springframework.web.bind.annotation.RestController;
 
 @RestController
@@ -14,7 +16,8 @@ public class OrganizationController {
     private final OrganizationService organizationService;
 
     @GetMapping("/api/organizations/templates")
-    public ResponseEntity<OrganizationResponses> getOrganizationTemplates() {
-        return ResponseEntity.ok(organizationService.findAll());
+    public ResponseEntity<OrganizationResponses> getOrganizationTemplates(
+            @RequestParam(defaultValue = "KO_KR") Language language) {
+        return ResponseEntity.ok(organizationService.findAll(language));
     }
 }

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

@@ -0,0 +1,40 @@
+package com.debatetimer.controller.sharing;
+
+import com.debatetimer.controller.auth.AuthMember;
+import com.debatetimer.controller.tool.jwt.AuthManager;
+import com.debatetimer.domain.member.Member;
+import com.debatetimer.dto.customize.response.CustomizeTableResponse;
+import com.debatetimer.dto.sharing.response.ChairmanTokenResponse;
+import com.debatetimer.service.customize.CustomizeService;
+import lombok.RequiredArgsConstructor;
+import org.springframework.http.HttpStatus;
+import org.springframework.web.bind.annotation.GetMapping;
+import org.springframework.web.bind.annotation.PathVariable;
+import org.springframework.web.bind.annotation.ResponseStatus;
+import org.springframework.web.bind.annotation.RestController;
+
+@RestController
+@RequiredArgsConstructor
+public class SharingRestController {
+
+    private final CustomizeService customizeService;
+    private final AuthManager authManager;
+
+    @GetMapping("/api/live/{tableId}/chairman-token")
+    public ChairmanTokenResponse issueChairmanToken(
+            @AuthMember Member member,
+            @PathVariable("tableId") long tableId
+    ) {
+        long debateTime = customizeService.findDebateTime(tableId, member);
+        String chairmanToken = authManager.issueChairmanToken(member, debateTime * 2);
+        return new ChairmanTokenResponse(chairmanToken);
+    }
+
+    @GetMapping("/api/live/table/customize/{tableId}")
+    @ResponseStatus(HttpStatus.OK)
+    public CustomizeTableResponse getTable(
+            @PathVariable long tableId
+    ) {
+        return customizeService.findTable(tableId);
+    }
+}

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

@@ -4,22 +4,28 @@
 import com.debatetimer.domain.member.Member;
 import com.debatetimer.dto.sharing.request.SharingRequest;
 import com.debatetimer.dto.sharing.response.SharingResponse;
+import com.debatetimer.service.sharing.SharingService;
+import jakarta.validation.Valid;
+import lombok.RequiredArgsConstructor;
 import org.springframework.messaging.handler.annotation.DestinationVariable;
 import org.springframework.messaging.handler.annotation.MessageMapping;
 import org.springframework.messaging.handler.annotation.Payload;
 import org.springframework.messaging.handler.annotation.SendTo;
 import org.springframework.stereotype.Controller;
 
 @Controller
-public class SharingController {
+@RequiredArgsConstructor
+public class SharingWebSocketController {
+
+    private final SharingService sharingService;
 
     @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 sharingService.share(request);
     }
 }

src/main/java/com/debatetimer/controller/tool/jwt/AuthManager.java

@@ -1,5 +1,6 @@
 package com.debatetimer.controller.tool.jwt;
 
+import com.debatetimer.domain.member.Member;
 import com.debatetimer.dto.member.JwtTokenResponse;
 import com.debatetimer.dto.member.MemberInfo;
 import java.time.Duration;
@@ -20,6 +21,11 @@ public JwtTokenResponse issueToken(MemberInfo memberInfo) {
         return new JwtTokenResponse(accessToken, refreshToken, refreshTokenExpiration);
     }
 
+    public String issueChairmanToken(Member member, long expiration) {
+        MemberInfo memberInfo = new MemberInfo(member.getEmail());
+        return jwtTokenProvider.createChairmanToken(memberInfo, expiration);
+    }
+
     public JwtTokenResponse reissueToken(String refreshToken) {
         String email = jwtTokenResolver.resolveRefreshToken(refreshToken);
         MemberInfo memberInfo = new MemberInfo(email);
@@ -37,4 +43,8 @@ public String resolveAccessToken(String accessToken) {
     public String resolveRefreshToken(String refreshToken) {
         return jwtTokenResolver.resolveRefreshToken(refreshToken);
     }
+
+    public String resolveChairmanToken(String chairmanToken) {
+        return jwtTokenResolver.resolveChairmanToken(chairmanToken);
+    }
 }

src/main/java/com/debatetimer/controller/tool/jwt/JwtTokenProvider.java

@@ -23,6 +23,10 @@ public String createRefreshToken(MemberInfo memberInfo) {
         return createToken(memberInfo, refreshTokenExpiration, TokenType.REFRESH_TOKEN);
     }
 
+    public String createChairmanToken(MemberInfo memberInfo, long expirationSeconds) {
+        return createToken(memberInfo, Duration.ofSeconds(expirationSeconds), TokenType.CHAIRMAN_TOKEN);
+    }
+
     private String createToken(MemberInfo memberInfo, Duration expiration, TokenType tokenType) {
         Date now = new Date();
         Date expiredDate = new Date(now.getTime() + expiration.toMillis());

src/main/java/com/debatetimer/controller/tool/jwt/JwtTokenResolver.java

@@ -23,6 +23,10 @@ public String resolveRefreshToken(String refreshToken) {
         return resolveToken(refreshToken, TokenType.REFRESH_TOKEN);
     }
 
+    public String resolveChairmanToken(String chairmanToken) {
+        return resolveToken(chairmanToken, TokenType.CHAIRMAN_TOKEN);
+    }
+
     private String resolveToken(String token, TokenType tokenType) {
         try {
             Claims claims = Jwts.parserBuilder()

src/main/java/com/debatetimer/controller/tool/jwt/TokenType.java

@@ -3,5 +3,6 @@
 public enum TokenType {
 
     ACCESS_TOKEN,
-    REFRESH_TOKEN
+    REFRESH_TOKEN,
+    CHAIRMAN_TOKEN
 }

src/main/java/com/debatetimer/domain/organization/Language.java

@@ -0,0 +1,7 @@
+package com.debatetimer.domain.organization;
+
+public enum Language {
+    US_EN,
+    KO_KR,
+    ;
+}

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

@@ -0,0 +1,28 @@
+package com.debatetimer.domain.sharing;
+
+import jakarta.annotation.Nullable;
+import jakarta.validation.constraints.NotNull;
+import lombok.Getter;
+
+@Getter
+public class TimerEvent {
+
+    @NotNull
+    private final TimerEventType eventType;
+
+    @Nullable
+    private final TimerEventData timerEventData;
+
+    public TimerEvent(
+            TimerEventType eventType,
+            @Nullable TimerEventData timerEventData
+    ) {
+        eventType.validateEventData(timerEventData);
+        this.eventType = eventType;
+        this.timerEventData = timerEventData;
+    }
+
+    public TimerEvent(TimerEventType eventType) {
+        this(eventType, null);
+    }
+}

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

@@ -0,0 +1,46 @@
+package com.debatetimer.domain.sharing;
+
+import com.debatetimer.domain.customize.CustomizeBoxType;
+import com.debatetimer.domain.customize.Stance;
+import com.debatetimer.exception.custom.DTClientErrorException;
+import com.debatetimer.exception.errorcode.ClientErrorCode;
+import jakarta.annotation.Nullable;
+import jakarta.validation.constraints.NotNull;
+import lombok.Getter;
+
+@Getter
+public class TimerEventData {
+
+    @NotNull
+    private final CustomizeBoxType timerType;
+
+    private final int sequence;
+
+    @Nullable
+    private final Stance currentTeam;
+
+    private final long remainingTime;
+
+    public TimerEventData(
+            CustomizeBoxType timerType,
+            int sequence,
+            @Nullable Stance currentTeam,
+            long remainingTime
+    ) {
+        validateCurrentTeam(timerType, currentTeam);
+        this.timerType = timerType;
+        this.sequence = sequence;
+        this.currentTeam = currentTeam;
+        this.remainingTime = remainingTime;
+    }
+
+    private void validateCurrentTeam(CustomizeBoxType timerType, Stance currentTeam) {
+        if (timerType.isTimeBased() && currentTeam == null) {
+            throw new DTClientErrorException(ClientErrorCode.INVALID_TIME_BASED_TIMER_EVENT_DATA);
+        }
+
+        if (!timerType.isTimeBased() && currentTeam != null) {
+            throw new DTClientErrorException(ClientErrorCode.INVALID_NORMAL_TIMER_EVENT_DATA);
+        }
+    }
+}