fix : wantedTime응답으로 변경

Author: csbiy

.github/workflows/CD-api-develop.yml

@@ -21,10 +21,10 @@ jobs:
 
     steps:
     - uses: actions/checkout@v4
-    - name: Set up JDK 17
+    - name: Set up JDK 21
       uses: actions/setup-java@v3
       with:
-        java-version: '17'
+        java-version: '21'
         distribution: 'adopt'
 
     - name: Cache Gradle packages

.github/workflows/CD-api-prod.yml

@@ -21,10 +21,10 @@ jobs:
 
     steps:
       - uses: actions/checkout@v4
-      - name: Set up JDK 17
+      - name: Set up JDK 21
         uses: actions/setup-java@v3
         with:
-          java-version: '17'
+          java-version: '21'
           distribution: 'adopt'
 
       - name: Cache Gradle packages

.github/workflows/CD-consumer-develop.yml

@@ -21,10 +21,10 @@ jobs:
 
     steps:
     - uses: actions/checkout@v4
-    - name: Set up JDK 17
+    - name: Set up JDK 21
       uses: actions/setup-java@v3
       with:
-        java-version: '17'
+        java-version: '21'
         distribution: 'adopt'
 
     - name: Cache Gradle packages

.github/workflows/CD-consumer-prod.yml

@@ -22,10 +22,10 @@ jobs:
 
     steps:
       - uses: actions/checkout@v4
-      - name: Set up JDK 17
+      - name: Set up JDK 21
         uses: actions/setup-java@v3
         with:
-          java-version: '17'
+          java-version: '21'
           distribution: 'adopt'
 
       - name: Cache Gradle packages

.github/workflows/CI-develop.yml

@@ -15,10 +15,10 @@ jobs:
 
     steps:
       - uses: actions/checkout@v4
-      - name: Set up JDK 17
+      - name: Set up JDK 21
         uses: actions/setup-java@v3
         with:
-          java-version: '17'
+          java-version: '21'
           distribution: 'adopt'
 
       - name: Cache Gradle packages

.github/workflows/CI-prod.yml

@@ -16,10 +16,10 @@ jobs:
 
     steps:
       - uses: actions/checkout@v4
-      - name: Set up JDK 17
+      - name: Set up JDK 21
         uses: actions/setup-java@v3
         with:
-          java-version: '17'
+          java-version: '21'
           distribution: 'adopt'
 
       - name: Cache Gradle packages

api/build.gradle.kts

@@ -29,6 +29,7 @@ tasks.register("generateTypeScriptClient") {
 }
 
 
+
 jib {
     val repositoryUsername = "y-edu"
     val repositoryToken = System.getenv("DEPLOY_TOKEN")
@@ -37,7 +38,7 @@ jib {
 
 
     from {
-        image = "amazoncorretto:17"
+        image = "amazoncorretto:21"
     }
     to {
         image = "ghcr.io/$repositoryUsername/${project.name}:${project.version}"
@@ -61,7 +62,7 @@ dependencies {
     implementation(project(":shared:discord-support"))
     implementation(project(":shared:rabbitmq-support"))
     implementation(project(":shared:sheet-support"))
-    implementation(project(":shared:paymint-api"))
+    implementation(group = "com.yedu", name = "payment-interface", version = "1.0.0-SNAPSHOT", classifier = "plain")
 
 
     implementation("org.springframework.boot:spring-boot-starter-graphql")
@@ -117,3 +118,4 @@ val bootJar: org.springframework.boot.gradle.tasks.bundling.BootJar by tasks
 
 bootJar.enabled = true
 jar.enabled = true
+

api/src/main/java/com/yedu/api/domain/matching/application/dto/res/ApplicationFormResponse.java

@@ -22,6 +22,7 @@ public class ApplicationFormResponse {
   private List<AvailableTime> availableTimes;
   private Parents parent;
   private Teacher teacher;
+  private String wantedTime;
   private String matchingStatus;
   private String matchingRefuseReason;
   private ClassManagement classManagement;

api/src/main/java/com/yedu/api/domain/matching/application/dto/res/ClassMatchingForTeacherResponse.java

@@ -18,6 +18,7 @@ public record ClassMatchingForTeacherResponse(
     String dong,
     List<String> goals,
     String favoriteStyle,
-    List<DayTime> parentDayTimes,
+//    List<DayTime> parentDayTimes,
+    String wantedTime,
     List<DayTime> teacherDayTimes,
     MatchingStatus matchStatus) {}

api/src/main/java/com/yedu/api/domain/matching/application/mapper/ClassMatchingMapper.java

@@ -30,7 +30,7 @@ public static ClassMatchingForTeacherResponse mapToApplicationFormToTeacherRespo
         applicationForm.getDong(),
         goals,
         applicationForm.getFavoriteStyle(),
-        parentDayTimes,
+        applicationForm.getWantTime(),
         teacherDayTimes,
         classMatching.getMatchStatus());
   }