From d879a23b8d34928bdb5bc4aec6e4c6e1920f3c02 Mon Sep 17 00:00:00 2001 From: Haebin Date: Fri, 22 Mar 2024 03:31:49 +0900 Subject: [PATCH] =?UTF-8?q?feat:=20=EC=A0=84=EC=B2=B4=20=EB=B0=B1=EC=8B=A0?= =?UTF-8?q?=20=EB=8B=A8=EC=88=9C=20=EC=A1=B0=ED=9A=8C=20-=20=EC=A0=91?= =?UTF-8?q?=EC=A2=85=EC=99=84=EB=A3=8C=20Response=20=EC=B6=94=EA=B0=80?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../auth/dto/response/HealthConditionResponse.kt | 10 +++++----- .../application/inoculation/dto/InoculationService.kt | 5 +++-- .../dto/response/InoculationSimpleResponse.kt | 1 + 3 files changed, 9 insertions(+), 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 index a1606bd..35700f4 100644 --- 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 index 7c80569..656e0ac 100644 --- 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/src/main/kotlin/com/vacgom/backend/application/inoculation/dto/response/InoculationSimpleResponse.kt b/src/main/kotlin/com/vacgom/backend/application/inoculation/dto/response/InoculationSimpleResponse.kt index c3ec319..043a7b4 100644 --- a/src/main/kotlin/com/vacgom/backend/application/inoculation/dto/response/InoculationSimpleResponse.kt +++ b/src/main/kotlin/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? )