fix/feat: flyway V5 DML이 적용되지 않는 문제 해결 + 테스트 컨테이너 적용

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

@@ -9,8 +9,9 @@ on:
 
 jobs:
   build-and-push:
-
     runs-on: ubuntu-latest
+    env:
+      TZ: 'Asia/Seoul'
 
     defaults:
       run:
@@ -25,6 +26,11 @@ jobs:
           java-version: '17'
           distribution: 'temurin'
 
+      - name: Check system timezone
+        run: |
+          echo "Current date and time: $(date)"
+          echo "TZ environment variable: $TZ"
+
       - name: Setup Gradle
         uses: gradle/actions/setup-gradle@v3
 

.github/workflows/backend-ci-prod.yml

@@ -1,4 +1,4 @@
-name: backend-ci-dev
+name: backend-ci-prod
 
 on:
   pull_request:
@@ -9,8 +9,9 @@ on:
 
 jobs:
   build-and-push:
-
     runs-on: ubuntu-latest
+    env:
+      TZ: 'Asia/Seoul'
 
     defaults:
       run:

backend/build.gradle

@@ -1,76 +1,80 @@
 plugins {
-	id 'java'
-	id 'jacoco' //테스트 커버리지 검증 라이브러리 추가
-	id 'org.springframework.boot' version '3.3.1'
-	id 'io.spring.dependency-management' version '1.1.5'
+    id 'java'
+    id 'jacoco' //테스트 커버리지 검증 라이브러리 추가
+    id 'org.springframework.boot' version '3.3.1'
+    id 'io.spring.dependency-management' version '1.1.5'
+    id 'com.palantir.docker-compose' version '0.36.0'
 }
 
 group = 'com.ody'
 version = '0.0.1-SNAPSHOT'
 
 java {
-	toolchain {
-		languageVersion = JavaLanguageVersion.of(17)
-	}
+    toolchain {
+        languageVersion = JavaLanguageVersion.of(17)
+    }
+}
+
+dockerCompose {
+    dockerComposeFile 'docker-compose-local.yml'
 }
 
 jacoco {
-	toolVersion = '0.8.8'
+    toolVersion = '0.8.8'
 }
 
 jacocoTestReport {
-	jacocoTestReport {
-		reports {
-			xml.required.set(true)
-			csv.required.set(false)
-			html.required.set(true)
-		}
-	}
+    reports {
+        xml.required.set(true)
+        csv.required.set(false)
+        html.required.set(true)
+    }
 }
 
 configurations {
-	compileOnly {
-		extendsFrom annotationProcessor
-	}
+    compileOnly {
+        extendsFrom annotationProcessor
+    }
 }
 
 repositories {
-	mavenCentral()
+    mavenCentral()
 }
 
 dependencies {
-	implementation 'com.google.firebase:firebase-admin:9.2.0'
-	implementation 'org.springdoc:springdoc-openapi-starter-webmvc-ui:2.5.0'
-	implementation 'com.github.ulisesbocchio:jasypt-spring-boot-starter:3.0.5'
-	implementation 'org.springframework.boot:spring-boot-starter'
-	implementation 'org.springframework.boot:spring-boot-starter-web'
-	implementation 'org.springframework.boot:spring-boot-starter-data-jpa'
-	implementation 'org.springframework.boot:spring-boot-starter-validation'
-	implementation "io.jsonwebtoken:jjwt:0.9.1"
-	implementation 'javax.xml.bind:jaxb-api:2.3.1'
-	implementation 'org.springframework.boot:spring-boot-starter-actuator'
-
-	runtimeOnly 'com.mysql:mysql-connector-j:8.4.0'
-	runtimeOnly 'com.h2database:h2'
+    implementation 'com.google.firebase:firebase-admin:9.2.0'
+    implementation 'org.springdoc:springdoc-openapi-starter-webmvc-ui:2.5.0'
+    implementation 'com.github.ulisesbocchio:jasypt-spring-boot-starter:3.0.5'
+    implementation 'org.springframework.boot:spring-boot-starter'
+    implementation 'org.springframework.boot:spring-boot-starter-web'
+    implementation 'org.springframework.boot:spring-boot-starter-data-jpa'
+    implementation 'org.springframework.boot:spring-boot-starter-validation'
+    implementation "io.jsonwebtoken:jjwt:0.9.1"
+    implementation 'javax.xml.bind:jaxb-api:2.3.1'
+    implementation 'org.springframework.boot:spring-boot-starter-actuator'
+    implementation 'org.flywaydb:flyway-mysql'
+    implementation 'org.flywaydb:flyway-core'
+    implementation 'org.testcontainers:testcontainers-bom:1.20.2'
 
-	testImplementation 'org.springframework.boot:spring-boot-starter-test'
-	testImplementation 'io.rest-assured:rest-assured:5.3.1'
+    runtimeOnly 'com.mysql:mysql-connector-j:8.4.0'
 
-	testRuntimeOnly 'org.junit.platform:junit-platform-launcher'
-	testRuntimeOnly 'com.h2database:h2'
+    testImplementation 'org.springframework.boot:spring-boot-starter-test'
+    testImplementation 'io.rest-assured:rest-assured:5.3.1'
+    testImplementation "org.testcontainers:junit-jupiter"
+    testImplementation 'org.testcontainers:mysql'
 
-	annotationProcessor 'org.projectlombok:lombok'
-	compileOnly 'org.projectlombok:lombok'
+    testRuntimeOnly 'org.junit.platform:junit-platform-launcher'
+    testRuntimeOnly 'com.h2database:h2'
 
-	implementation 'org.flywaydb:flyway-mysql'
-	implementation 'org.flywaydb:flyway-core'
+    annotationProcessor 'org.projectlombok:lombok'
+    compileOnly 'org.projectlombok:lombok'
 }
 
 tasks.named('test') {
-	useJUnitPlatform()
-	finalizedBy jacocoTestReport
+    useJUnitPlatform()
+    finalizedBy jacocoTestReport
 }
 
 configurations.all {
-	exclude group: 'commons-logging', module: 'commons-logging'
+    exclude group: 'commons-logging', module: 'commons-logging'
 }

backend/docker-compose-local.yml

@@ -0,0 +1,12 @@
+services:
+  db:
+    image: mysql:8.0.35
+    container_name: mysql-local-db
+    restart: always
+    ports:
+      - "53306:3306"
+    environment:
+      MYSQL_ROOT_HOST: '%'
+      MYSQL_ROOT_PASSWORD: 1234
+      MYSQL_DATABASE: ody
+      TZ: Asia/seoul

backend/src/main/java/com/ody/eta/repository/EtaRepository.java

@@ -11,10 +11,10 @@ public interface EtaRepository extends JpaRepository<Eta, Long> {
     Optional<Eta> findByMateId(Long id);
 
     @Query("""
-                    select e from Eta e
-                    join Mate ma on e.mate.id = ma.id
-                    join Meeting  me on e.mate.meeting.id = me.id
-                    where me.id = :meetingId
+            select e from Eta e
+            join Mate ma on e.mate.id = ma.id
+            join Meeting  me on e.mate.meeting.id = me.id
+            where me.id = :meetingId
             """)
     List<Eta> findAllByMeetingId(Long meetingId);
 }

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

@@ -2,14 +2,13 @@ spring:
   jpa:
     hibernate:
       ddl-auto: validate
-  sql:
-    init:
-      mode: never
   datasource:
     driver-class-name: com.mysql.cj.jdbc.Driver
     url: ENC(KUJNgDMlvi/imeVHjCO2QekgI4DNxZT9IrW0QlVVkJXJUUQ2DAUOqI91FVH7aFhXVCsfXtf0EUmF/JqN3GpXa/mVj3o4BNbqS3QsU50BgwEEodko+VwHY2ebDHUxlKA1/FXBSmu6p+Rd3rcNEzoBIA==)
     username: ENC(jNYhZN6xMCmPQ7GZM+Hu3A==)
     password: ENC(VRtr3RjM+XnPvRdLjrPMHyTSzDlEjR7o)
+  flyway:
+    baseline-version: 2
 
 log:
   file:

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

@@ -1,22 +1,17 @@
 spring:
-  h2:
-    console:
-      enabled: true
-      path: /h2-console
-      settings:
-        web-allow-others: true
   datasource:
-    driver-class-name: org.h2.Driver
-    url: jdbc:h2:mem:database?serverTimezone=Asia/Seoul;MODE=MYSQL;DB_CLOSE_DELAY=-1;DATABASE_TO_LOWER=TRUE
-    username: sa
-    password:
+    driver-class-name: com.mysql.cj.jdbc.Driver
+    url: jdbc:mysql://localhost:53306/ody
+    username: root
+    password: 1234
+  flyway:
+    url: jdbc:mysql://localhost:53306/ody
+    user: root
+    password: 1234
+    connect-retries: 30
   jpa:
     hibernate:
       ddl-auto: validate
-      dialect: org.hibernate.dialect.MySQLDialect
-  sql:
-    init:
-      mode: always
 
 log:
   file:

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

@@ -13,6 +13,8 @@ spring:
       jdbc-url: jdbc:mysql://database-project.cluster-ro-cqsc6pyqhwww.ap-northeast-2.rds.amazonaws.com:3306/ody
       username: ody
       password: ENC(2n3gUzzFjknXpHDYwuF4d5BQw6XqLdsX)
+  flyway:
+    baseline-version: 2
 
 log:
   file:

backend/src/main/resources/common.yml

@@ -23,7 +23,6 @@ springdoc:
 odsay:
   url: https://api.odsay.com/v1/api/searchPubTransPathT
   api-key: ENC(4+ag02XbL8zS6rWoWHh7WzhKqBj5kaBwBcg04MpLr8nLJefO2PRY8E5o0WpRd3oRtvFv1s9lnWI=)
-  # TODO: 임시로 개인 api-key 추가 -> 팀 key로 변경 필요
 
 google:
   maps:

backend/src/main/resources/db/migration/V2__alter_notification_type_check.sql

@@ -1 +1,3 @@
-ALTER TABLE notification ADD CONSTRAINT notification_chk_1 CHECK (notification.type IN ('DEPARTURE_REMINDER', 'ENTRY', 'NUDGE', 'MEMBER_DELETION', 'ETA_NOTICE'));
+ALTER TABLE notification DROP CONSTRAINT notification_chk_1;
+
+ALTER TABLE notification ADD CONSTRAINT notification_chk_1 CHECK (`type` IN ('DEPARTURE_REMINDER', 'ENTRY', 'NUDGE', 'MEMBER_DELETION', 'ETA_NOTICE'));

backend/src/main/resources/db/migration/V3__alter_character_set.sql

@@ -1,6 +1,6 @@
-/*! ALTER DATABASE ody CHARACTER SET = utf8mb4 COLLATE = utf8mb4_unicode_ci; */
-/*! ALTER TABLE member CONVERT TO CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci; */
-/*! ALTER TABLE meeting CONVERT TO CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci; */
-/*! ALTER TABLE mate CONVERT TO CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci; */
-/*! ALTER TABLE notification CONVERT TO CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci; */
-/*! ALTER TABLE eta CONVERT TO CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci; */
+ALTER DATABASE ody CHARACTER SET = utf8mb4 COLLATE = utf8mb4_unicode_ci;
+ALTER TABLE member CONVERT TO CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci;
+ALTER TABLE meeting CONVERT TO CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci;
+ALTER TABLE mate CONVERT TO CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci;
+ALTER TABLE notification CONVERT TO CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci;
+ALTER TABLE eta CONVERT TO CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci;

backend/src/main/resources/db/migration/V5__alter__timestamp__set-nano.sql

@@ -1,10 +1,10 @@
-/*! ALTER TABLE member MODIFY COLUMN deleted_at timestamp(6); */
-/*! ALTER TABLE meeting MODIFY COLUMN created_at timestamp(6); */
-/*! ALTER TABLE meeting MODIFY COLUMN updated_at timestamp(6); */
-/*! ALTER TABLE mate MODIFY COLUMN deleted_at timestamp(6); */
-/*! ALTER TABLE eta CHANGE COLUMN created_at first_api_call_at timestamp not null; */
-/*! ALTER TABLE eta CHANGE COLUMN updated_at last_api_call_at timestamp not null; */
-/*! ALTER TABLE eta MODIFY COLUMN deleted_at timestamp(6); */
-/*! ALTER TABLE notification MODIFY COLUMN send_at timestamp(6); */
-/*! ALTER TABLE notification MODIFY COLUMN created_at timestamp(6); */
-/*! ALTER TABLE notification MODIFY COLUMN updated_at timestamp(6); */
+ALTER TABLE member MODIFY COLUMN deleted_at timestamp(6);
+ALTER TABLE meeting MODIFY COLUMN created_at timestamp(6);
+ALTER TABLE meeting MODIFY COLUMN updated_at timestamp(6);
+ALTER TABLE mate MODIFY COLUMN deleted_at timestamp(6);
+ALTER TABLE eta CHANGE COLUMN created_at first_api_call_at timestamp not null;
+ALTER TABLE eta CHANGE COLUMN updated_at last_api_call_at timestamp not null;
+ALTER TABLE eta MODIFY COLUMN deleted_at timestamp(6);
+ALTER TABLE notification MODIFY COLUMN send_at timestamp(6);
+ALTER TABLE notification MODIFY COLUMN created_at timestamp(6);
+ALTER TABLE notification MODIFY COLUMN updated_at timestamp(6);

backend/src/test/java/com/ody/common/BaseRepositoryTest.java

@@ -14,8 +14,8 @@
 import org.springframework.test.context.ActiveProfiles;
 
 @Import({JpaAuditingConfig.class, FixtureGeneratorConfig.class, TestAuthConfig.class})
-@ActiveProfiles("test")
 @DataJpaTest
+@ActiveProfiles("test")
 public abstract class BaseRepositoryTest {
 
     @Autowired