Merge pull request #96 from Team-B1ND/Refactor/#95

Team-B1ND · Aug 13, 2024 · cf61e5c · cf61e5c
2 parents d35f0a7 + 318ffce
commit cf61e5c
Show file tree

Hide file tree

Showing 451 changed files with 3,213 additions and 3,199 deletions.
diff --git a/.github/workflows/deploy.yml b/.github/workflows/deploy.yml
@@ -22,7 +22,7 @@ jobs:
  - name: Set yml file 
  uses: microsoft/variable-substitution@v1
  with:
- files: dodam-api/src/main/resources/application.yml
+ files: dodam-application/dodam-rest-api/src/main/resources/application.yml
  env:
  spring.datasource.url: ${{ secrets.DB_URL }} 
  spring.datasource.username: ${{ secrets.DB_USERNAME }} 
@@ -61,7 +61,7 @@ jobs:
  cloud.aws.storage.bucket: ${{ secrets.S3_BUCKET }}
 
  - name: Build with Gradle
- run: ./gradlew :dodam-api:build -x test --parallel
+ run: ./gradlew :dodam-application:dodam-rest-api:build -x test --parallel
 
  - name: Build Docker Image For Spring
  run: |

diff --git a/build.gradle b/build.gradle
@@ -45,4 +45,4 @@ subprojects {
 
 tasks.named('test') {
  useJUnitPlatform()
-}
+}
diff --git a/dockerfile b/dockerfile
@@ -1,4 +1,4 @@
 FROM openjdk:17
-COPY dodam-api/build/libs/dodam-api-0.0.1-SNAPSHOT.jar app.jar
+COPY dodam-application/dodam-rest-api/build/libs/dodam-rest-api-0.0.1-SNAPSHOT.jar app.jar
 ENV TZ=Asia/Seoul
 ENTRYPOINT ["java","-jar","/app.jar","-Duser.timezone=Asia/Seoul"]
diff --git a/dodam-api/build.gradle b/dodam-api/build.gradle
diff --git a/dodam-api/src/main/java/b1nd/dodamapi/auth/handler/AuthController.java b/dodam-api/src/main/java/b1nd/dodamapi/auth/handler/AuthController.java
diff --git a/dodam-api/src/main/java/b1nd/dodamapi/auth/usecase/AuthUseCase.java b/dodam-api/src/main/java/b1nd/dodamapi/auth/usecase/AuthUseCase.java
diff --git a/dodam-api/src/main/java/b1nd/dodamapi/banner/BannerController.java b/dodam-api/src/main/java/b1nd/dodamapi/banner/BannerController.java
diff --git a/dodam-api/src/main/java/b1nd/dodamapi/bus/usecase/dto/res/BusMemberRes.java b/dodam-api/src/main/java/b1nd/dodamapi/bus/usecase/dto/res/BusMemberRes.java
diff --git a/dodam-api/src/main/java/b1nd/dodamapi/conference/handler/ConferenceController.java b/dodam-api/src/main/java/b1nd/dodamapi/conference/handler/ConferenceController.java
diff --git a/dodam-api/src/main/java/b1nd/dodamapi/conference/usecase/ConferenceUseCase.java b/dodam-api/src/main/java/b1nd/dodamapi/conference/usecase/ConferenceUseCase.java
diff --git a/dodam-api/src/main/java/b1nd/dodamapi/meal/MealController.java b/dodam-api/src/main/java/b1nd/dodamapi/meal/MealController.java
diff --git a/dodam-api/src/main/java/b1nd/dodamapi/member/usecase/req/UpdateMemberInfoReq.java b/dodam-api/src/main/java/b1nd/dodamapi/member/usecase/req/UpdateMemberInfoReq.java
diff --git a/dodam-api/src/main/java/b1nd/dodamapi/member/usecase/req/UpdatePasswordReq.java b/dodam-api/src/main/java/b1nd/dodamapi/member/usecase/req/UpdatePasswordReq.java
diff --git a/dodam-api/src/main/java/b1nd/dodamapi/member/usecase/req/UpdateStudentInfoReq.java b/dodam-api/src/main/java/b1nd/dodamapi/member/usecase/req/UpdateStudentInfoReq.java
diff --git a/dodam-api/src/main/java/b1nd/dodamapi/nightstudy/usecase/dto/req/RejectNightStudyReq.java b/dodam-api/src/main/java/b1nd/dodamapi/nightstudy/usecase/dto/req/RejectNightStudyReq.java
diff --git a/dodam-api/src/main/java/b1nd/dodamapi/outgoing/usecase/dto/req/RejectOutGoingReq.java b/dodam-api/src/main/java/b1nd/dodamapi/outgoing/usecase/dto/req/RejectOutGoingReq.java
diff --git a/dodam-api/src/main/java/b1nd/dodamapi/outsleeping/usecase/dto/req/RejectOutSleepingReq.java b/dodam-api/src/main/java/b1nd/dodamapi/outsleeping/usecase/dto/req/RejectOutSleepingReq.java
diff --git a/dodam-api/src/main/java/b1nd/dodamapi/point/usecase/dto/req/ModifyPointReasonReq.java b/dodam-api/src/main/java/b1nd/dodamapi/point/usecase/dto/req/ModifyPointReasonReq.java