fix(#0): Merge 방법 변경

.github/workflows/cd-prod.yml

@@ -0,0 +1,62 @@
+name: CD - PROD
+
+on:
+  push:
+    branches: [ main ]
+
+jobs:
+  deploy:
+    runs-on: ubuntu-latest
+
+    steps:
+      - uses: actions/checkout@v4
+
+      - uses: actions/setup-java@v4
+        with:
+          java-version: "21"
+          distribution: "temurin"
+
+      - uses: gradle/actions/setup-gradle@v3
+
+      - name: Grant execute permission
+        run: chmod +x gradlew
+
+      - name: Build JAR
+        run: ./gradlew build -x test
+
+      - name: Docker Login
+        uses: docker/login-action@v3
+        with:
+          username: ${{ secrets.DOCKERHUB_USERNAME }}
+          password: ${{ secrets.DOCKERHUB_TOKEN }}
+
+      - name: Build & Push
+        uses: docker/build-push-action@v5
+        with:
+          context: .
+          push: true
+          tags: |
+            ${{ secrets.DOCKERHUB_USERNAME }}/realmatch-backend:prod
+            ${{ secrets.DOCKERHUB_USERNAME }}/realmatch-backend:${{ github.sha }}
+
+      - name: Deploy
+        uses: appleboy/ssh-action@v1.0.3
+        with:
+          host: ${{ secrets.PROD_SERVER_IP }}
+          username: ubuntu
+          key: ${{ secrets.PROD_SERVER_SSH_KEY }}
+          script: |
+            cd /home/ubuntu/realmatch
+            git pull origin main
+
+            docker compose pull
+            docker compose up -d
+
+            echo "Waiting for app to start..."
+            sleep 10
+
+            if ! docker compose ps | grep "Up"; then
+              echo "❌ Container is not running"
+              docker compose logs
+              exit 1
+            fi

.github/workflows/pr-check.yml

@@ -8,6 +8,29 @@ jobs:
   build-and-test:
     runs-on: ubuntu-latest
 
+    services:
+      mysql:
+        image: mysql:8.0
+        env:
+          MYSQL_DATABASE: test_db
+          MYSQL_USER: test_user
+          MYSQL_PASSWORD: test
+          MYSQL_ROOT_PASSWORD: test_root
+        ports:
+          - 3306:3306
+        options: >-
+          --health-cmd="mysqladmin ping -h 127.0.0.1 -uroot -ptest_root"
+          --health-interval=10s
+          --health-timeout=5s
+          --health-retries=5
+
+
+    env:
+      SPRING_PROFILES_ACTIVE: test
+      JWT_SECRET: pPmJ9ViYt8f6HAh2q5s36QmEUeyEFRcquPaNpnIGUK8er5DjfTKa4xbDsTFXQ7HRVfTLR2DIYs7s9iGdJ+Yb7Q==
+      JWT_ACCESS_EXPIRE_MS: 600000
+      JWT_REFRESH_EXPIRE_MS: 1209600000
+
     steps:
     - name: Checkout code
       uses: actions/checkout@v4
@@ -19,6 +42,9 @@ jobs:
         distribution: 'temurin'
         cache: gradle
 
+    - name: Setup Gradle
+      uses: gradle/actions/setup-gradle@v3
+
     - name: Grant execute permission for gradlew
       run: chmod +x gradlew
 
@@ -33,12 +59,38 @@ jobs:
       run: ./gradlew test
       continue-on-error: true
 
-    - name: Publish test results
-      uses: EnricoMi/publish-unit-test-result-action@v2
-      if: always()
-      with:
-        files: |
-          build/test-results/**/*.xml
+    - name: Test application startup
+      run: |
+        ./gradlew bootRun > bootrun.log 2>&1 &
+        APP_PID=$!
+        echo "Started bootRun with PID: $APP_PID"
+
+        # 최대 60초 대기하면서 애플리케이션 시작 확인
+        for i in {1..60}; do
+          # 로그에서 시작 완료 메시지 확인
+          if grep -q "Started RealMatchApplication" bootrun.log; then
+            echo "✅ Application started successfully after ${i}s"
+            kill $APP_PID 2>/dev/null || true
+            exit 0
+          fi
+
+          # 프로세스가 죽었는지 확인
+          if ! kill -0 $APP_PID 2>/dev/null; then
+            echo "❌ Application process terminated unexpectedly"
+            echo "=== bootRun log ==="
+            cat bootrun.log
+            exit 1
+          fi
+
+          sleep 1
+        done
+
+        echo "❌ Application failed to start within 60 seconds"
+        echo "=== bootRun log ==="
+        cat bootrun.log
+        kill $APP_PID 2>/dev/null || true
+        exit 1
+      timeout-minutes: 2
 
     - name: Upload build artifacts
       if: failure()

.gitignore

@@ -1,5 +1,12 @@
 # 특정 파일 제외
-src/main/resources/application-*.yml
+#src/main/resources/application-*.yml
+src/main/resources/application.yml
+src/test/resources/application.yml
+src/test/resources/application-*.yml
+
+# 환경 변수
+.env
+.env.*
 
 ### Gradle ###
 .gradle/
@@ -37,3 +44,8 @@ Thumbs.db
 ### Log files ###
 *.log
 logs/
+
+### mysql ###
+mysql_data/
+
+bin/

Docker/Dockerfile

@@ -5,6 +5,8 @@ WORKDIR /app
 ARG JAR_FILE=build/libs/*.jar
 COPY ${JAR_FILE} app.jar
 
-EXPOSE 8080
+EXPOSE 6000
 
-ENTRYPOINT ["java", "-jar", "app.jar"]
+ENV SERVER_PORT=6000
+
+ENTRYPOINT ["java", "-jar", "app.jar"]

README.md

@@ -7,6 +7,11 @@
 git config core.hooksPath .githooks
 ```
 
+아래 명령어를 이용해서 코드 스타일을 준수했는지 확인해주세요
+```bash
+./gradlew checkstyleMain checkstyleTest
+```
+
 아래 명령어를 통해 쉽게 도커 컨테이너에서 사용할 수 있습니다.
 
 ```bash

build.gradle

@@ -2,6 +2,7 @@ plugins {
 	id 'java'
 	id 'org.springframework.boot' version '3.5.9'
 	id 'io.spring.dependency-management' version '1.1.7'
+	id 'checkstyle'
 }
 
 group = 'com.example'
@@ -25,16 +26,55 @@ repositories {
 }
 
 dependencies {
+	implementation 'org.springframework.boot:spring-boot-starter'
+	implementation 'org.springframework.boot:spring-boot-starter-security'
 	implementation 'org.springframework.boot:spring-boot-starter-data-jdbc'
 	implementation 'org.springframework.boot:spring-boot-starter-data-jpa'
 	implementation 'org.springframework.boot:spring-boot-starter-web'
+	implementation 'org.springframework.boot:spring-boot-starter-validation'
 	compileOnly 'org.projectlombok:lombok'
-	runtimeOnly 'com.mysql:mysql-connector-j'
 	annotationProcessor 'org.projectlombok:lombok'
+
+	testImplementation 'org.springframework.boot:spring-boot-starter-test'
+	testRuntimeOnly 'org.junit.platform:junit-platform-launcher'
+
+	// Test dependencies
+	testRuntimeOnly 'com.h2database:h2'
+	testRuntimeOnly 'org.junit.platform:junit-platform-launcher'
 	testImplementation 'org.springframework.boot:spring-boot-starter-test'
+	testImplementation 'org.springframework.security:spring-security-test'
 	testRuntimeOnly 'org.junit.platform:junit-platform-launcher'
+
+	//JWT
+	implementation 'io.jsonwebtoken:jjwt-api:0.12.6'
+	implementation 'io.jsonwebtoken:jjwt-impl:0.12.6'
+	implementation 'io.jsonwebtoken:jjwt-jackson:0.12.6'
+
+	// mySQL
+	runtimeOnly 'com.mysql:mysql-connector-j'
+
+	// swagger
+	implementation 'org.springdoc:springdoc-openapi-starter-webmvc-ui:2.8.9'
 }
 
 tasks.named('test') {
 	useJUnitPlatform()
 }
+
+tasks.withType(JavaCompile) {
+    options.encoding = 'UTF-8'
+}
+
+checkstyle {
+    toolVersion = '10.12.5'
+    configFile = file("${rootProject.projectDir}/config/checkstyle/checkstyle.xml")
+    maxWarnings = 0
+    ignoreFailures = false
+}
+
+tasks.withType(Checkstyle) {
+    reports {
+        xml.required = true
+        html.required = true
+    }
+}

docker-compose.yaml

@@ -6,10 +6,10 @@ services:
     container_name: mysql_db
     restart: always
     environment:
-      MYSQL_DATABASE: myapp_db
-      MYSQL_USER: admin
-      MYSQL_PASSWORD: secret
-      MYSQL_ROOT_PASSWORD: rootsecret
+      MYSQL_DATABASE: ${MYSQL_DATABASE}
+      MYSQL_USER: ${MYSQL_USER}
+      MYSQL_PASSWORD: ${MYSQL_PASSWORD}
+      MYSQL_ROOT_PASSWORD: ${MYSQL_ROOT_PASSWORD}
     ports:
       - "3306:3306"
     volumes:
@@ -30,16 +30,17 @@ services:
       dockerfile: Docker/Dockerfile
     container_name: spring_app
     ports:
-      - "8080:8080"
+      - "6000:6000"
     depends_on:
       - db
       - redis
+    env_file:
+      - .env
     environment:
-      - SPRING_DATASOURCE_URL=jdbc:mysql://db:3306/myapp_db?useSSL=false&allowPublicKeyRetrieval=true&serverTimezone=Asia/Seoul
-      - SPRING_DATASOURCE_USERNAME=admin
-      - SPRING_DATASOURCE_PASSWORD=secret
-      - SPRING_DATASOURCE_DRIVER_CLASS_NAME=com.mysql.cj.jdbc.Driver
-      - SPRING_REDIS_HOST=redis
-      - SPRING_REDIS_PORT=6379
-      - SPRING_PROFILES_ACTIVE=dev
-
+        SPRING_DATASOURCE_URL: ${SPRING_DATASOURCE_URL}
+        SPRING_DATASOURCE_USERNAME: ${SPRING_DATASOURCE_USERNAME}
+        SPRING_DATASOURCE_PASSWORD: ${SPRING_DATASOURCE_PASSWORD}
+        SPRING_DATASOURCE_DRIVER_CLASS_NAME: ${SPRING_DATASOURCE_DRIVER_CLASS_NAME}
+        SPRING_REDIS_HOST: ${SPRING_REDIS_HOST}
+        SPRING_REDIS_PORT: ${SPRING_REDIS_PORT}
+        SPRING_PROFILES_ACTIVE: ${SPRING_PROFILES_ACTIVE}

src/main/java/com/example/RealMatch/RealMatchApplication.java

@@ -6,8 +6,8 @@
 @SpringBootApplication
 public class RealMatchApplication {
 
-	public static void main(String[] args) {
-		SpringApplication.run(RealMatchApplication.class, args);
-	}
+    public static void main(String[] args) {
+        SpringApplication.run(RealMatchApplication.class, args);
+    }
 
 }

src/main/java/com/example/RealMatch/global/common/BaseEntity.java

@@ -0,0 +1,24 @@
+package com.example.RealMatch.global.common;
+
+import java.time.LocalDateTime;
+
+import org.springframework.data.annotation.CreatedDate;
+import org.springframework.data.jpa.domain.support.AuditingEntityListener;
+
+import jakarta.persistence.Column;
+import jakarta.persistence.EntityListeners;
+import jakarta.persistence.MappedSuperclass;
+import lombok.Getter;
+import lombok.NoArgsConstructor;
+
+@Getter
+@MappedSuperclass
+@EntityListeners(AuditingEntityListener.class)
+@NoArgsConstructor(access = lombok.AccessLevel.PROTECTED)
+public abstract class BaseEntity {
+
+    @CreatedDate
+    @Column(name = "created_at", updatable = false, nullable = false)
+    private LocalDateTime createdAt;
+
+}

src/main/java/com/example/RealMatch/global/common/UpdateBaseEntity.java

@@ -0,0 +1,42 @@
+package com.example.RealMatch.global.common;
+
+import java.time.LocalDateTime;
+
+import org.springframework.data.annotation.LastModifiedDate;
+import org.springframework.data.jpa.domain.support.AuditingEntityListener;
+
+import jakarta.persistence.Column;
+import jakarta.persistence.EntityListeners;
+import jakarta.persistence.MappedSuperclass;
+import lombok.Getter;
+
+@Getter
+@MappedSuperclass
+@EntityListeners(AuditingEntityListener.class)
+public abstract class UpdateBaseEntity extends BaseEntity {
+
+    @LastModifiedDate
+    @Column(name = "updated_at")
+    private LocalDateTime updatedAt;
+
+    @Column(name = "deleted_at")
+    private LocalDateTime deletedAt;
+
+    @Column(name = "is_deleted", nullable = false)
+    private boolean isDeleted;
+
+    protected UpdateBaseEntity() {
+        super();
+        this.isDeleted = false;
+    }
+
+    public void softDelete(Integer deletedBy, LocalDateTime deletedAt) {
+        this.isDeleted = true;
+        this.deletedAt = deletedAt;
+    }
+
+    public void restore() {
+        this.isDeleted = false;
+        this.deletedAt = null;
+    }
+}