feat: 전체 백신 단순 조회 - 접종완료 Response 추가

9oormthon-univ · Mar 21, 2024 · d879a23 · d879a23
1 parent ee71212
commit d879a23
Show file tree

Hide file tree

Showing 3 changed files with 9 additions and 7 deletions.
diff --git a/src/main/kotlin/com/vacgom/backend/application/auth/dto/response/HealthConditionResponse.kt b/src/main/kotlin/com/vacgom/backend/application/auth/dto/response/HealthConditionResponse.kt
@@ -1,16 +1,16 @@
 package com.vacgom.backend.application.auth.dto.response
 
-import com.vacgom.backend.domain.member.constants.HealthCondition
+import com.vacgom.backend.domain.disease.HealthCondition
 
 class HealthConditionResponse(
-    val code: String,
-    val description: String,
+        val code: String,
+        val description: String,
 ) {
     companion object {
         fun of(healthCondition: HealthCondition): HealthConditionResponse {
             return HealthConditionResponse(
-                code = healthCondition.name,
-                description = healthCondition.description,
+                    code = healthCondition.name,
+                    description = healthCondition.description,
             )
         }
     }

diff --git a/src/main/kotlin/com/vacgom/backend/application/inoculation/dto/InoculationService.kt b/src/main/kotlin/com/vacgom/backend/application/inoculation/dto/InoculationService.kt
@@ -30,8 +30,9 @@ class InoculationService(
         }
 
         return vaccinations.map { vaccination ->
-            val vaccineOrders = hashMap[vaccination.vaccineName]?.toHashSet()?.toList()
-            InoculationSimpleResponse(vaccination.diseaseName, vaccination.vaccineName, vaccination.minOrder, vaccination.maxOrder, vaccineOrders)
+            val vaccineOrders = hashMap[vaccination.vaccineName]?.toHashSet()?.toList() ?: listOf()
+            val isCompleted = vaccineOrders.any { order -> order == vaccination.maxOrder }
+            InoculationSimpleResponse(vaccination.diseaseName, vaccination.vaccineName, vaccination.minOrder, vaccination.maxOrder, isCompleted, vaccineOrders)
         }.toList()
     }
 }
diff --git a/...tlin/com/vacgom/backend/application/inoculation/dto/response/InoculationSimpleResponse.kt b/...tlin/com/vacgom/backend/application/inoculation/dto/response/InoculationSimpleResponse.kt
@@ -5,5 +5,6 @@ data class InoculationSimpleResponse(
         val vaccineName: String,
         val minOrder: Long,
         val maxOrder: Long,
+        val isCompleted: Boolean,
         val inoculationOrders: List<Long>?
 )