[RELEASE] v1.1.1

.github/workflows/fe-cd-storybook.yml

@@ -46,7 +46,7 @@ jobs:
           API_BASE_URL: ${{ secrets.API_BASE_URL }}
 
       - name: build storybook
-        run: npm run build-storybook
+        run: npm run build:storybook
 
       - name: upload storybook
         uses: peaceiris/actions-gh-pages@v3

.github/workflows/fe-ci-dev.yml

@@ -39,7 +39,7 @@ jobs:
             ${{ runner.os }}-node-
 
       - name: Build
-        run: npm run build-dev
+        run: npm run build:dev
         working-directory: ./frontend
 
       - name: Test

backend/src/main/java/ddangkong/aop/logging/RequestLoggingAspect.java → backend/src/main/java/ddangkong/aop/logging/ControllerLoggingAspect.java

@@ -13,7 +13,7 @@
 import org.springframework.web.context.request.ServletRequestAttributes;
 
 @Slf4j
-abstract class RequestLoggingAspect {
+abstract class ControllerLoggingAspect {
 
     @Pointcut("execution(* ddangkong.controller..*Controller.*(..))")
     public void allController() {
@@ -27,11 +27,7 @@ public void polling() {
     public void allControllerWithoutPolling() {
     }
 
-    protected void logController(JoinPoint joinPoint) {
-        logRequest(joinPoint);
-    }
-
-    private void logRequest(JoinPoint joinPoint) {
+    protected void logControllerRequest(JoinPoint joinPoint) {
         HttpServletRequest request = getHttpServletRequest();
         String uri = request.getRequestURI();
         String httpMethod = request.getMethod();
@@ -41,6 +37,14 @@ private void logRequest(JoinPoint joinPoint) {
         log.info("Request Logging: {} {} body - {} parameters - {}", httpMethod, uri, body, queryParameters);
     }
 
+    protected void logControllerResponse(JoinPoint joinPoint, Object responseBody) {
+        HttpServletRequest request = getHttpServletRequest();
+        String uri = request.getRequestURI();
+        String httpMethod = request.getMethod();
+
+        log.info("Response Logging: SUCCESS {} {} Body: {}", httpMethod, uri, responseBody);
+    }
+
     private HttpServletRequest getHttpServletRequest() {
         ServletRequestAttributes requestAttributes = (ServletRequestAttributes) RequestContextHolder.currentRequestAttributes();
         return requestAttributes.getRequest();

backend/src/main/java/ddangkong/aop/logging/DevControllerLoggingAspect.java

@@ -0,0 +1,25 @@
+package ddangkong.aop.logging;
+
+
+import org.aspectj.lang.JoinPoint;
+import org.aspectj.lang.annotation.AfterReturning;
+import org.aspectj.lang.annotation.Aspect;
+import org.aspectj.lang.annotation.Before;
+import org.springframework.context.annotation.Profile;
+import org.springframework.stereotype.Component;
+
+@Aspect
+@Component
+@Profile({"dev", "local"})
+public class DevControllerLoggingAspect extends ControllerLoggingAspect {
+
+    @Before("allController()")
+    public void logControllerRequest(JoinPoint joinPoint) {
+        super.logControllerRequest(joinPoint);
+    }
+
+    @AfterReturning(pointcut = "allController()", returning = "responseBody")
+    protected void logControllerResponse(JoinPoint joinPoint, Object responseBody) {
+        super.logControllerResponse(joinPoint, responseBody);
+    }
+}

backend/src/main/java/ddangkong/aop/logging/ProdRequestLoggingAspect.java → backend/src/main/java/ddangkong/aop/logging/ProdControllerLoggingAspect.java

@@ -10,9 +10,10 @@
 @Aspect
 @Component
 @Profile("prod")
-public class ProdRequestLoggingAspect extends RequestLoggingAspect {
+public class ProdControllerLoggingAspect extends ControllerLoggingAspect {
+
     @Before("allControllerWithoutPolling()")
-    public void logController(JoinPoint joinPoint) {
-        super.logController(joinPoint);
+    public void logControllerRequest(JoinPoint joinPoint) {
+        super.logControllerRequest(joinPoint);
     }
 }

backend/src/main/java/ddangkong/config/sql/DataSourceConfig.java

@@ -0,0 +1,54 @@
+package ddangkong.config.sql;
+
+import ddangkong.config.sql.type.DataSourceType;
+import java.util.HashMap;
+import java.util.Map;
+import javax.sql.DataSource;
+import org.springframework.boot.context.properties.ConfigurationProperties;
+import org.springframework.boot.jdbc.DataSourceBuilder;
+import org.springframework.context.annotation.Bean;
+import org.springframework.context.annotation.Configuration;
+import org.springframework.context.annotation.Primary;
+import org.springframework.context.annotation.Profile;
+import org.springframework.jdbc.datasource.LazyConnectionDataSourceProxy;
+
+@Profile("prod")
+@Configuration
+public class DataSourceConfig {
+
+    @Bean
+    @ConfigurationProperties(prefix = "spring.datasource.source")
+    public DataSource sourceDataSource() {
+        return DataSourceBuilder.create()
+                .build();
+    }
+
+    @Bean
+    @ConfigurationProperties(prefix = "spring.datasource.replica")
+    public DataSource replicaDataSource() {
+        return DataSourceBuilder.create()
+                .build();
+    }
+
+    @Bean
+    public DataSource routingDataSource(
+            DataSource sourceDataSource,
+            DataSource replicaDataSource
+    ) {
+        Map<Object, Object> dataSources = new HashMap<>();
+        dataSources.put(DataSourceType.SOURCE, sourceDataSource);
+        dataSources.put(DataSourceType.REPLICA, replicaDataSource);
+
+        RoutingDataSource routingDataSource = new RoutingDataSource();
+        routingDataSource.setDefaultTargetDataSource(dataSources.get(DataSourceType.SOURCE));
+        routingDataSource.setTargetDataSources(dataSources);
+
+        return routingDataSource;
+    }
+
+    @Primary
+    @Bean
+    public DataSource dataSource() {
+        return new LazyConnectionDataSourceProxy(routingDataSource(sourceDataSource(), replicaDataSource()));
+    }
+}

backend/src/main/java/ddangkong/config/sql/RoutingDataSource.java

@@ -0,0 +1,18 @@
+package ddangkong.config.sql;
+
+import ddangkong.config.sql.type.DataSourceType;
+import org.springframework.jdbc.datasource.lookup.AbstractRoutingDataSource;
+import org.springframework.transaction.support.TransactionSynchronizationManager;
+
+public class RoutingDataSource extends AbstractRoutingDataSource {
+
+    @Override
+    protected Object determineCurrentLookupKey() {
+        boolean isReadOnly = TransactionSynchronizationManager.isCurrentTransactionReadOnly();
+        if (isReadOnly) {
+            return DataSourceType.REPLICA;
+        } else {
+            return DataSourceType.SOURCE;
+        }
+    }
+}

backend/src/main/java/ddangkong/config/sql/type/DataSourceType.java

@@ -0,0 +1,7 @@
+package ddangkong.config.sql.type;
+
+public enum DataSourceType {
+    SOURCE,
+    REPLICA,
+    ;
+}

backend/src/main/java/ddangkong/domain/room/balance/roomcontent/RoomContent.java

@@ -24,6 +24,9 @@
 public class RoomContent {
 
     private static final int DELAY_MSEC = 2_000; // TODO SEC로 변경
+    private static final int GAME_START_WAITING_MSEC = 3_000; // TODO SEC로 변경
+    private static final int FIRST_ROUND = 1;
+    private static final int MSEC = 1_000;
 
     @Id
     @GeneratedValue(strategy = GenerationType.IDENTITY)
@@ -58,7 +61,11 @@ public void updateVoteDeadline(LocalDateTime now, int timeLimit) {
             throw new VoteDeadlineConfiguredException();
         }
 
-        int afterSec = (timeLimit + DELAY_MSEC) / 1_000;
+        int afterSec = (timeLimit + DELAY_MSEC) / MSEC;
+        if (round == FIRST_ROUND) {
+            afterSec += GAME_START_WAITING_MSEC / MSEC;
+        }
+
         voteDeadline = now.plusSeconds(afterSec);
     }
 

backend/src/main/resources/application-prod.yml

@@ -7,11 +7,11 @@ spring:
       username: ${secret.datasource.source.username}
       password: ${secret.datasource.source.password}
       jdbc-url: jdbc:mysql://${secret.datasource.source.host}:${secret.datasource.source.port}/${secret.datasource.database}?serverTimezone=Asia/Seoul&characterEncoding=UTF-8&allowPublicKeyRetrieval=true&useSSL=false
-    replica1:
+    replica:
       driver-class-name: com.mysql.cj.jdbc.Driver
-      username: ${secret.datasource.replica1.username}
-      password: ${secret.datasource.replica1.password}
-      jdbc-url: jdbc:mysql://${secret.datasource.replica1.host}:${secret.datasource.replica1.port}/${secret.datasource.database}?serverTimezone=Asia/Seoul&characterEncoding=UTF-8&allowPublicKeyRetrieval=true&useSSL=false
+      username: ${secret.datasource.replica.username}
+      password: ${secret.datasource.replica.password}
+      jdbc-url: jdbc:mysql://${secret.datasource.replica.host}:${secret.datasource.replica.port}/${secret.datasource.database}?serverTimezone=Asia/Seoul&characterEncoding=UTF-8&allowPublicKeyRetrieval=true&useSSL=false
 
   sql:
     init:

backend/src/test/java/ddangkong/domain/room/balance/roomcontent/RoomContentTest.java

@@ -2,6 +2,7 @@
 
 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 ddangkong.domain.balance.content.BalanceContent;
 import ddangkong.domain.balance.content.Category;
@@ -25,7 +26,7 @@ class 투표_마감_시간_설정 {
         @Test
         void 투표_마감_시간을_설정한다() {
             // given
-            int currentRound = 1;
+            int currentRound = 2;
             int timeLimit = 10_000;
             RoomSetting roomSetting = new RoomSetting(5, timeLimit, Category.IF);
 
@@ -62,7 +63,7 @@ class 투표_마감_시간_지남_여부 {
 
         private static final Room ROOM = Room.createNewRoom();
         private static final BalanceContent BALANCE_CONTENT = new BalanceContent(Category.IF, "치킨 vs 피자");
-        private static final int ROUND = 1;
+        private static final int ROUND = 2;
 
         @Test
         void 투표_마감_시간보다_이전_시간이면_투표가_마감되지_않은_것이다() {
@@ -100,4 +101,31 @@ class 투표_마감_시간_지남_여부 {
                     .isExactlyInstanceOf(MismatchRoundException.class);
         }
     }
+
+    @Nested
+    class 게임_대기_시간_포함_투표_마감_시간_지남_여부 {
+
+        private static final Room ROOM = Room.createNewRoom();
+        private static final BalanceContent BALANCE_CONTENT = new BalanceContent(Category.IF, "치킨 vs 피자");
+        private static final int START_ROUND = 1;
+
+        @Test
+        void 첫_라운드는_투표_마감_시간에는_게임_대기_시간을_추가된다() {
+            // given
+            LocalDateTime voteDeadline = LocalDateTime.parse("2024-08-03T20:00:03");
+            RoomContent roomContent = RoomContent.newRoomContent(ROOM, BALANCE_CONTENT, START_ROUND);
+            int timeLimit = 3;
+            LocalDateTime inTime = LocalDateTime.parse("2024-08-03T20:00:08");
+            LocalDateTime overTime = LocalDateTime.parse("2024-08-03T20:00:09");
+
+            // when
+            roomContent.updateVoteDeadline(voteDeadline, timeLimit);
+
+            // then
+            assertAll(
+                    () -> assertThat(roomContent.isOverVoteDeadline(inTime, START_ROUND)).isFalse(),
+                    () -> assertThat(roomContent.isOverVoteDeadline(overTime, START_ROUND)).isTrue()
+            );
+        }
+    }
 }