diff --git a/src/main/kotlin/com/vacgom/backend/inoculation/application/InoculationService.kt b/src/main/kotlin/com/vacgom/backend/inoculation/application/InoculationService.kt index 315f6f7..97a6e66 100644 --- a/src/main/kotlin/com/vacgom/backend/inoculation/application/InoculationService.kt +++ b/src/main/kotlin/com/vacgom/backend/inoculation/application/InoculationService.kt @@ -40,10 +40,12 @@ class InoculationService( ): List { val vaccinations = if (request.vaccinations.isEmpty()) { - vaccinationRepository.findAll() + vaccinationRepository.findAll().filter { + it.vaccinationType == request.type + } } else { vaccinationRepository.findAll().filter { - it.vaccineName in request.vaccinations + it.vaccineName in request.vaccinations && it.vaccinationType == request.type } } diff --git a/src/main/kotlin/com/vacgom/backend/inoculation/presentation/dto/InoculationSimpleRequest.kt b/src/main/kotlin/com/vacgom/backend/inoculation/presentation/dto/InoculationSimpleRequest.kt index a6342a2..24a91b8 100644 --- a/src/main/kotlin/com/vacgom/backend/inoculation/presentation/dto/InoculationSimpleRequest.kt +++ b/src/main/kotlin/com/vacgom/backend/inoculation/presentation/dto/InoculationSimpleRequest.kt @@ -1,5 +1,8 @@ package com.vacgom.backend.inoculation.presentation.dto +import com.vacgom.backend.inoculation.domain.constants.VaccinationType + data class InoculationSimpleRequest( + val type: VaccinationType, val vaccinations: List, )