fix: InocluationSimple 조회에 type 기준을 되돌리자

9oormthon-univ · May 14, 2024 · 1549b90 · 1549b90
1 parent f5bec5a
commit 1549b90
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 2 deletions.
diff --git 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<InoculationSimpleResponse> {
         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
@@ -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<String>,
 )