[REVIEW] V2 대비 리팩토링 리뷰

.github/workflows/cd.yml

@@ -1,57 +1,108 @@
-name: CD Pipeline
-
-on:
-  push:
-    branches: [ main ]
-
-jobs:
-  cd:
-    runs-on: ubuntu-latest
-
-    steps:
-      - uses: actions/checkout@v4
-
-      - name: Create application-secret.yml
-        run: |
-          mkdir -p ./temp_secret
-          echo "${{ secrets.APPLICATION_SECRET }}" > ./temp_secret/application-secret.yml
-        shell: bash
-
-      - name: Copy application-secret.yml to EC2
-        uses: appleboy/[email protected]
-        with:
-          username: ubuntu
-          host: ${{ secrets.EC2_HOST }}
-          key: ${{ secrets.EC2_SSH_KEY }}
-          source: ./temp_secret/application-secret.yml
-          target: /home/ubuntu/secret/
-
-      - name: Copy docker-compose.yml
-        uses: appleboy/[email protected]
-        with:
-          username: ubuntu
-          host: ${{ secrets.EC2_HOST }}
-          key: ${{ secrets.EC2_SSH_KEY }}
-          source: ./docker-compose.yml
-          target: /home/ubuntu/cicd/
-
-      - name: Upload deploy.sh to EC2
-        uses: appleboy/[email protected]
-        with:
-          host: ${{ secrets.EC2_HOST }}
-          username: ${{ secrets.EC2_USER }}
-          key: ${{ secrets.EC2_SSH_KEY }}
-          source: ./deploy.sh
-          target: /home/ubuntu/cicd/
-
-      - name: SSH and Deploy
-        uses: appleboy/[email protected]
-        with:
-          host: ${{ secrets.EC2_HOST }}
-          username: ${{ secrets.EC2_USER }}
-          key: ${{ secrets.EC2_SSH_KEY }}
-          script: |
-            echo ${{ secrets.DOCKERHUB_TOKEN }} | docker login -u ${{ secrets.DOCKERHUB_USERNAME }} --password-stdin
-            docker pull ${{ secrets.DOCKERHUB_USERNAME }}/assu-app:latest
-            sudo chmod +x /home/ubuntu/cicd/deploy.sh
+name: CD Pipeline
+
+on:
+  push:
+    branches: [ main ]
+
+jobs:
+  cd:
+    runs-on: ubuntu-latest
+
+    steps:
+      - uses: actions/checkout@v4
+
+      - name: Set up Docker Buildx
+        uses: docker/setup-buildx-action@v3
+        with:
+          install: true
+
+      - name: Create buildx builder
+        run: |
+          docker buildx create --use --name mybuilder
+          docker buildx inspect --bootstrap
+
+      - name: Login to DockerHub
+        uses: docker/login-action@v2
+        with:
+          username: ${{ secrets.DOCKERHUB_USERNAME }}
+          password: ${{ secrets.DOCKERHUB_TOKEN }}
+
+      - name: Build & Push Dependency Cache
+        run: |
+          docker buildx build \
+          --builder mybuilder \
+          --platform linux/amd64 \
+          --push \
+          --file Dockerfile \
+          --tag ${{ secrets.DOCKERHUB_USERNAME }}/assu-app:dependency-cache \
+          --target dependencies \
+          --cache-to type=registry,ref=${{ secrets.DOCKERHUB_USERNAME }}/assu-app:dependency-cache,mode=max \
+          .
+
+      - name: Build & Push Final App Image
+        run: |
+          docker buildx build \
+            --builder mybuilder \
+            --platform linux/amd64 \
+            --push \
+            --file Dockerfile \
+            --tag ${{ secrets.DOCKERHUB_USERNAME }}/assu-app:latest \
+            --build-arg DEPENDENCY_IMAGE=${{ secrets.DOCKERHUB_USERNAME }}/assu-app:dependency-cache \
+            --cache-from type=registry,ref=${{ secrets.DOCKERHUB_USERNAME }}/assu-app:dependency-cache \
+            .
+
+      - name: Create application-secret.yml
+        run: echo "${{ secrets.APPLICATION_SECRET }}" > ./application-secret.yml
+        shell: bash
+
+      - name: Create service-account.json
+        run: echo "${{ secrets.SERVICE_ACCOUNT_B64 }}" | base64 -d > ./service-account.json
+        shell: bash
+
+      - name: Copy application-secret.yml to EC2
+        uses: appleboy/[email protected]
+        with:
+          username: ubuntu
+          host: ${{ secrets.EC2_HOST }}
+          key: ${{ secrets.EC2_SSH_KEY }}
+          source: ./application-secret.yml
+          target: /home/ubuntu/secret/
+
+      - name: Copy service-account.json to EC2
+        uses: appleboy/[email protected]
+        with:
+          username: ubuntu
+          host: ${{ secrets.EC2_HOST }}
+          key: ${{ secrets.EC2_SSH_KEY }}
+          source: ./service-account.json
+          target: /home/ubuntu/secret/
+
+      - name: Copy docker-compose.yml
+        uses: appleboy/[email protected]
+        with:
+          username: ubuntu
+          host: ${{ secrets.EC2_HOST }}
+          key: ${{ secrets.EC2_SSH_KEY }}
+          source: ./docker-compose.yml
+          target: /home/ubuntu/cicd/
+
+      - name: Upload deploy.sh to EC2
+        uses: appleboy/[email protected]
+        with:
+          host: ${{ secrets.EC2_HOST }}
+          username: ${{ secrets.EC2_USER }}
+          key: ${{ secrets.EC2_SSH_KEY }}
+          source: ./deploy.sh
+          target: /home/ubuntu/cicd/
+
+      - name: SSH and Deploy
+        uses: appleboy/[email protected]
+        with:
+          host: ${{ secrets.EC2_HOST }}
+          username: ${{ secrets.EC2_USER }}
+          key: ${{ secrets.EC2_SSH_KEY }}
+          script: |
+            echo ${{ secrets.DOCKERHUB_TOKEN }} | docker login -u ${{ secrets.DOCKERHUB_USERNAME }} --password-stdin
+            docker pull ${{ secrets.DOCKERHUB_USERNAME }}/assu-app:latest
+            sudo chmod +x /home/ubuntu/cicd/deploy.sh
             sudo /home/ubuntu/cicd/deploy.sh

.github/workflows/ci.yml

@@ -3,6 +3,8 @@ name: CI Pipeline
 on:
   push:
     branches: [ develop ]
+  pull_request:
+    branches: [ develop ]
 
 jobs:
   ci:
@@ -32,44 +34,4 @@ jobs:
         run: chmod +x ./gradlew
 
       - name: Build and Test
-        run: ./gradlew clean build test
-
-      - name: Set up Docker Buildx
-        uses: docker/setup-buildx-action@v3
-        with:
-          install: true
-
-      - name: Create buildx builder
-        run: |
-          docker buildx create --use --name mybuilder
-          docker buildx inspect --bootstrap
-
-      - name: Login to DockerHub
-        uses: docker/login-action@v2
-        with:
-          username: ${{ secrets.DOCKERHUB_USERNAME }}
-          password: ${{ secrets.DOCKERHUB_TOKEN }}
-
-      - name: Build & Push Dependency Cache
-        run: |
-          docker buildx build \
-          --builder mybuilder \
-          --platform linux/amd64 \
-          --push \
-          --file Dockerfile \
-          --tag ${{ secrets.DOCKERHUB_USERNAME }}/assu-app:dependency-cache \
-          --target dependencies \
-          --cache-to type=registry,ref=${{ secrets.DOCKERHUB_USERNAME }}/assu-app:dependency-cache,mode=max \
-          .
-
-      - name: Build & Push Final App Image
-        run: |
-          docker buildx build \
-            --builder mybuilder \
-            --platform linux/amd64 \
-            --push \
-            --file Dockerfile \
-            --tag ${{ secrets.DOCKERHUB_USERNAME }}/assu-app:latest \
-            --build-arg DEPENDENCY_IMAGE=${{ secrets.DOCKERHUB_USERNAME }}/assu-app:dependency-cache \
-            --cache-from type=registry,ref=${{ secrets.DOCKERHUB_USERNAME }}/assu-app:dependency-cache \
-            .
+        run: ./gradlew clean build test --no-build-cache

.gitignore

@@ -44,5 +44,6 @@ out/
 
 ### Secret ###
 src/main/resources/application-secret.yml
-src/test/resources/application-test.yml
-src/test/resources/application-secret.yml
+
+### Firebase ###
+src/main/resources/firebase/

build.gradle

@@ -2,6 +2,7 @@ plugins {
 	id 'java'
 	id 'org.springframework.boot' version '3.5.3'
 	id 'io.spring.dependency-management' version '1.1.7'
+    id 'org.jetbrains.kotlin.jvm'
 }
 
 group = 'com.assu'
@@ -20,28 +21,89 @@ configurations {
 }
 
 repositories {
+	google()
 	mavenCentral()
 }
 
 dependencies {
-	implementation 'org.springframework.boot:spring-boot-starter-amqp'
-	implementation 'org.springframework.boot:spring-boot-starter-batch'
+	// Spring boot
 	implementation 'org.springframework.boot:spring-boot-starter-data-jpa'
-	implementation 'org.springframework.boot:spring-boot-starter-security'
 	implementation 'org.springframework.boot:spring-boot-starter-validation'
 	implementation 'org.springframework.boot:spring-boot-starter-web'
-	compileOnly 'org.projectlombok:lombok'
-	developmentOnly 'org.springframework.boot:spring-boot-docker-compose'
 
-	runtimeOnly 'org.mariadb.jdbc:mariadb-java-client'
-	annotationProcessor 'org.projectlombok:lombok'
-	testImplementation 'org.springframework.boot:spring-boot-starter-test'
+	// spring security
+	implementation 'org.springframework.boot:spring-boot-starter-security'
+	testImplementation 'org.springframework.security:spring-security-test'
+
+	// redis
+	implementation 'org.springframework.boot:spring-boot-starter-data-redis'
+
+	// rabbit mq
+	implementation 'org.springframework.boot:spring-boot-starter-amqp'
 	testImplementation 'org.springframework.amqp:spring-rabbit-test'
+
+	// webflux; webclient
+	implementation 'org.springframework.boot:spring-boot-starter-webflux'
+
+	// batch
+	implementation 'org.springframework.boot:spring-boot-starter-batch'
 	testImplementation 'org.springframework.batch:spring-batch-test'
-	testImplementation 'org.springframework.security:spring-security-test'
+
+	//Jwt
+	implementation 'io.jsonwebtoken:jjwt-api:0.11.5'
+	implementation 'io.jsonwebtoken:jjwt-impl:0.11.5'
+	implementation 'io.jsonwebtoken:jjwt-jackson:0.11.5'
+
+	// GSON
+	implementation 'com.google.code.gson:gson:2.11.0'
+
+	// S3
+	implementation platform('software.amazon.awssdk:bom:2.25.33')
+	implementation 'software.amazon.awssdk:s3'
+
+	// jsoup (crawl)
+	implementation 'org.jsoup:jsoup:1.21.1'
+
+	// lombok
+	compileOnly 'org.projectlombok:lombok'
+	annotationProcessor 'org.projectlombok:lombok'
+
+	// Swagger 3 (SpringDoc OpenAPI)
+	implementation 'org.springdoc:springdoc-openapi-starter-webmvc-ui:2.8.4'
+
+    // chatting
+    implementation 'org.springframework.boot:spring-boot-starter-websocket'
+
+	// maria db
+	implementation 'org.mariadb.jdbc:mariadb-java-client:3.4.1'
+
+	// spring test
+	testImplementation 'org.springframework.boot:spring-boot-starter-test'
+
+	// junit
 	testRuntimeOnly 'org.junit.platform:junit-platform-launcher'
 
+	// h2 db (test)
 	runtimeOnly 'com.h2database:h2'
+
+	// JSON 처리
+	implementation 'com.fasterxml.jackson.core:jackson-databind'
+    implementation group: 'org.javassist', name: 'javassist', version: '3.15.0-GA'
+    implementation "org.jetbrains.kotlin:kotlin-stdlib-jdk8"
+
+	// 공간 데이터
+	implementation("org.hibernate.orm:hibernate-spatial")
+	implementation("org.locationtech.jts:jts-core:1.19.0")
+
+	// fcm
+	implementation 'com.squareup.okhttp3:okhttp:4.10.0'
+	//implementation 'com.fasterxml.jackson.core:jackson-databind'
+	implementation 'com.google.auth:google-auth-library-oauth2-http:1.18.0'
+	implementation 'com.google.firebase:firebase-admin:9.2.0'
+
+	// amqp
+	implementation("org.springframework.boot:spring-boot-starter-amqp")
+	implementation("com.fasterxml.jackson.core:jackson-databind")
 }
 
 tasks.named('test') {