Merge pull request #223 from School-of-Company/feature/222-modify-tra…

…ining-part-api 🔀 :: (#222) - Training 부분 API 변동사항을 수정했습니다.
School-of-Company · Nov 30, 2024 · 531432e · 531432e
2 parents da30b95 + c31a9e5
commit 531432e
Show file tree

Hide file tree

Showing 3 changed files with 15 additions and 25 deletions.
diff --git a/...ain/java/com/school_of_company/model/entity/training/TrainingProgramListResponseEntity.kt b/...ain/java/com/school_of_company/model/entity/training/TrainingProgramListResponseEntity.kt
@@ -1,12 +1,9 @@
 package com.school_of_company.model.entity.training
 
 data class TrainingProgramListResponseEntity(
-    val essential: List<Training>,
-    val choice: List<Training>
-) {
-    data class Training(
-        val title: String,
-        val startedAt: String,
-        val endedAt: String,
-    )
-}
+    val id: Long,
+    val title: String,
+    val startedAt: String,
+    val endedAt: String,
+    val category: String
+)
diff --git a/...n/java/com/school_of_company/network/dto/training/response/TrainingProgramListResponse.kt b/...n/java/com/school_of_company/network/dto/training/response/TrainingProgramListResponse.kt
@@ -5,12 +5,9 @@ import com.squareup.moshi.JsonClass
 
 @JsonClass(generateAdapter = true)
 data class TrainingProgramListResponse(
-    @Json(name = "essential") val essential: List<Training>,
-    @Json(name = "choice") val choice: List<Training>
-) {
-    data class Training(
-        @Json(name = "title") val title: String,
-        @Json(name = "startedAt") val startedAt: String,
-        @Json(name = "endedAt") val endedAt: String
-    )
-}
+    @Json(name = "id") val id: Long,
+    @Json(name = "title") val title: String,
+    @Json(name = "startedAt") val startedAt: String,
+    @Json(name = "endedAt") val endedAt: String,
+    @Json(name = "category") val category: String,
+)
diff --git a/...m/school_of_company/network/mapper/training/response/TrainingProgramListResponseMapper.kt b/...m/school_of_company/network/mapper/training/response/TrainingProgramListResponseMapper.kt
@@ -6,13 +6,9 @@ import com.squareup.moshi.Json
 
 fun TrainingProgramListResponse.toEntity(): TrainingProgramListResponseEntity =
     TrainingProgramListResponseEntity(
-        essential = this.essential.map { it.toEntity() },
-        choice = this.choice.map { it.toEntity() }
-    )
-
-fun TrainingProgramListResponse.Training.toEntity(): TrainingProgramListResponseEntity.Training =
-    TrainingProgramListResponseEntity.Training(
+        id = this.id,
         title = this.title,
         startedAt = this.startedAt,
-        endedAt = this.endedAt
+        endedAt = this.endedAt,
+        category = this.category
     )