🔨 [Refactor] Multi module 적용 (#587)

Co-authored-by: yoahn <[email protected]> Co-authored-by: wken5577 <[email protected]> Co-authored-by: Hyunkyu Lee <[email protected]> Co-authored-by: AYoungSn <[email protected]>
42organization · Feb 23, 2024 · 900aa36 · 900aa36
1 parent 62f19e4
commit 900aa36
Show file tree

Hide file tree

Showing 607 changed files with 4,013 additions and 4,248 deletions.
diff --git a/.github/workflows/test-code-validation.yml b/.github/workflows/test-code-validation.yml
@@ -15,29 +15,35 @@ jobs:
           java-version: 11
       - name: Grant execute permission for gradlew
         run: chmod +x gradlew
+
       - name: ️👶 Unit Test with Gradle
-        run: ./gradlew --console verbose clean unitTestCoverage
-      - name: mv for separate report folder
-        run: mv ./build/reports/jacoco/test ./build/reports/jacoco/unitTest
-      - name: mv for separate report name
-        run: mv ./build/reports/jacoco/unitTest/jacocoTestReport.xml ./build/reports/jacoco/unitTest/unitTestReport.xml
+        run: ./gradlew --console verbose clean unitTestCoverage unitTestCoverageReport -x test
+
+      #      - name: mv for separate report folder
+      #        run: mv ./gg-pingpong-utils/build/reports/jacoco/unitTestCoverageReport ./build/reports/jacoco/unitTest
+
+      #      - name: mv for separate report name
+      #        run: mv ./build/reports/jacoco/unitTest/jacocoTestReport.xml ./build/reports/jacoco/unitTest/unitTestReport.xml
+
       - name: 📲 Upload unitTest coverage to Codecov
         uses: codecov/codecov-action@v3
         with:
           token: ${{ secrets.CODECOV_TOKEN }}
           fail_ci_if_error: true
-          files: ./build/reports/jacoco/unitTest/unitTestReport.xml
+          files: ./gg-pingpong-utils/build/reports/jacoco/unitTestCoverageReport/unitTestCoverageReport.xml
           flags: unitTest
           name: codecov-unit
           verbose: true
+
       - name: 👨‍👨‍👧‍👦 Integration Test with Gradle
-        run: ./gradlew --console verbose clean integrationTestCoverage
+        run: ./gradlew --console verbose clean integrationTestCoverage integrationTestCoverageReport -x test
+
       - name: 📲 Upload integrationTest coverage to Codecov
         uses: codecov/codecov-action@v3
         with:
           token: ${{ secrets.CODECOV_TOKEN }}
           fail_ci_if_error: true
-          files: ./build/reports/jacoco/test/jacocoTestReport.xml
+          files: ./gg-pingpong-utils/build/reports/jacoco/integrationTestCoverageReport/integrationTestCoverageReport.xml
           flags: integrationTest
           name: codecov-integration
           verbose: true
diff --git a/.gitignore b/.gitignore
@@ -4,13 +4,8 @@ build/
 !gradle/wrapper/gradle-wrapper.jar
 !**/src/main/**/build/
 !**/src/test/**/build/
-src/main/resources/application.yml
-src/main/resources/application-local.yml
-src/main/resources/application-main.yml
-src/main/resources/application-test.yml
+gg-pingpong-api/src/main/resources/application.yml
 .DS_Store
-src/test/resources/application.yml
-src/test/resources/application-local.yml
 python
 /logs
 
@@ -54,4 +49,4 @@ pingping.pem
 ./logs/*
 
 ### git commit message convention file ###
-.gitmessage.txt
+.gitmessage.txt
diff --git a/Dockerfile b/Dockerfile
@@ -2,7 +2,7 @@ FROM openjdk:11-jdk
 
 WORKDIR /app
 
-ARG JAR_FILE=build/libs/server-42gg.jar
+ARG JAR_FILE=gg-pingpong-api/build/libs/gg-pingpong-api-42gg.jar
 
 COPY ${JAR_FILE} .