Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. Weโ€™ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

๐Ÿ”จ [Refactor] Multi module ์ ์šฉ #587

Merged
merged 33 commits into from
Feb 23, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
33 commits
Select commit Hold shift + click to select a range
e1e1f1e
๐Ÿ”จ [Refactor] Item entity์— dto ์˜์กด์„ฑ ์ œ๊ฑฐ (#586)
Kimhan-nah Feb 20, 2024
f981cea
๐Ÿ”จ [Refactor] game entity ์— dto ์˜์กด์„ฑ ์ œ๊ฑฐ (#585)
AYoungSn Feb 20, 2024
de61578
[REFACT] prototype v1
wken5577 Feb 20, 2024
7076c2e
๐Ÿ”จ [Refactor] admin repo import error ํ•ด๊ฒฐ (#591)
AYoungSn Feb 20, 2024
31dc017
๐Ÿ”จ [Refactor] pingpong-repo module์— ๋Œ€ํ•œ import error ์ˆ˜์ • (#592)
Kimhan-nah Feb 20, 2024
43db413
[FIX] #593 game, match ์žฌ์ˆ˜์ • (#595)
AYoungSn Feb 20, 2024
deb238a
๐Ÿ”จ [Refactor] user, store, noti data module์— ๋Œ€ํ•œ ์ˆ˜์ • (#596)
Kimhan-nah Feb 21, 2024
0c68667
590 refactoring api module import (#598)
wken5577 Feb 21, 2024
1afbc85
#597 refactoring api module user ๋ถ€๋ถ„ import ์ˆ˜์ • (#600)
AYoungSn Feb 21, 2024
c471f8d
599 refactoring multi module api admin dir (#601)
wken5577 Feb 21, 2024
2a086c4
[FIX] git
wken5577 Feb 21, 2024
60da860
[FIX] checkstyle ์˜ˆ์™ธ์ฒ˜๋ฆฌ, checkstyle ์˜ค๋ฅ˜ ์ˆ˜์ •
AYoungSn Feb 21, 2024
61f02a0
[TEST] admin dir test fix (#604)
wken5577 Feb 21, 2024
5d14d99
[FIX] test import error fix (#606)
AYoungSn Feb 21, 2024
2fab4a3
[FIX] test Fixtures ์ถ”๊ฐ€ (#607)
wken5577 Feb 21, 2024
e1715c1
[FIX] test code fix
wken5577 Feb 21, 2024
d1de61c
[FIX] #568 ๋ณ€๊ฒฝ ์žฌ๋ฐ˜์˜
AYoungSn Feb 21, 2024
5ff9833
[TEST] unit test fix (#609)
wken5577 Feb 21, 2024
b7d29ff
[TEST] multimodule test ci fix (#611)
wken5577 Feb 22, 2024
c7400da
[FIX] workflow
wken5577 Feb 22, 2024
79b8ce6
[FIX] toList rollback
AYoungSn Feb 22, 2024
98026c7
Merge branch 'multi-module' of https://github.com/42organization/42ggโ€ฆ
AYoungSn Feb 22, 2024
f557b54
[FIX] gradle fix
wken5577 Feb 22, 2024
453aa13
[FIX] fix codecov.yml
wken5577 Feb 22, 2024
fc9c2d7
[Refactoring] #612 multi module dir ๊ตฌ์กฐ ๋ณ€๊ฒฝ (#613)
wken5577 Feb 22, 2024
51412a2
[FIX] checkstyle error fix
AYoungSn Feb 22, 2024
d8a050a
[REFACT] user api module ํด๋” ๊ตฌ์กฐ ๋ณ€๊ฒฝ
AYoungSn Feb 23, 2024
6189943
#616 refactoring api module package ๊ตฌ์กฐ ๊ฐœ์„  (#617)
AYoungSn Feb 23, 2024
bbfd183
[REFACT] admin api package megaphone ์œ„์น˜ ์ˆ˜์ •
AYoungSn Feb 23, 2024
d073ae7
[REFACT] repo module dir fix (#620)
wken5577 Feb 23, 2024
1219acd
[REFACT] admin repo module dir ๊ตฌ์กฐ ์ˆ˜์ • (#621)
wken5577 Feb 23, 2024
b5a13bb
#619 refactoring gradle dependency ์ˆ˜์ • (#623)
AYoungSn Feb 23, 2024
f0802a6
[Refactor] gg-pingpong-data module ๋””๋ ‰ํ† ๋ฆฌ ๊ตฌ์กฐ ์ˆ˜์ • (#624)
Kimhan-nah Feb 23, 2024
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
The table of contents is too big for display.
Diff view
Diff view
  •  
  •  
  •  
22 changes: 14 additions & 8 deletions .github/workflows/test-code-validation.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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
9 changes: 2 additions & 7 deletions .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -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

Expand Down Expand Up @@ -54,4 +49,4 @@ pingping.pem
./logs/*

### git commit message convention file ###
.gitmessage.txt
.gitmessage.txt
2 changes: 1 addition & 1 deletion Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -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} .

Expand Down
Loading
Loading