diff --git a/src/main/java/com/doubleo/passservice/domain/pass/dto/response/MemberPassInfoResponse.java b/src/main/java/com/doubleo/passservice/domain/pass/dto/response/MemberPassInfoResponse.java index a7b3b69..e8a47cd 100644 --- a/src/main/java/com/doubleo/passservice/domain/pass/dto/response/MemberPassInfoResponse.java +++ b/src/main/java/com/doubleo/passservice/domain/pass/dto/response/MemberPassInfoResponse.java @@ -1,5 +1,6 @@ package com.doubleo.passservice.domain.pass.dto.response; +import com.doubleo.passservice.domain.pass.dto.AreaInfo; import com.doubleo.passservice.domain.pass.dto.GuardianInfo; import com.doubleo.passservice.domain.pass.enums.IssuanceStatus; import com.doubleo.passservice.domain.pass.enums.VisitCategory; @@ -12,7 +13,7 @@ public record MemberPassInfoResponse( Long passId, Long memberId, Long hospitalId, - List accessAreaNames, + List accessAreas, VisitCategory visitCategory, Long patientId, String patientName, diff --git a/src/main/java/com/doubleo/passservice/domain/pass/service/PassServiceImpl.java b/src/main/java/com/doubleo/passservice/domain/pass/service/PassServiceImpl.java index a9e14ef..de428e7 100644 --- a/src/main/java/com/doubleo/passservice/domain/pass/service/PassServiceImpl.java +++ b/src/main/java/com/doubleo/passservice/domain/pass/service/PassServiceImpl.java @@ -6,6 +6,7 @@ import com.doubleo.passservice.domain.notification.service.FcmService; import com.doubleo.passservice.domain.pass.domain.Pass; import com.doubleo.passservice.domain.pass.domain.PassArea; +import com.doubleo.passservice.domain.pass.dto.AreaInfo; import com.doubleo.passservice.domain.pass.dto.GuardianInfo; import com.doubleo.passservice.domain.pass.dto.response.MemberPassInfoResponse; import com.doubleo.passservice.domain.pass.dto.response.PassCreateResponse; @@ -58,16 +59,17 @@ public class PassServiceImpl implements PassService { public List getAllMemberPassInfo(Long memberId) { List passes = passRepository.findAllByMemberId(memberId); List responses = new ArrayList<>(); + for (Pass pass : passes) { List passAreas = passAreaRepository.findAllByPass(pass); - List areaNames = new ArrayList<>(); + List accessAreas = new ArrayList<>(); for (PassArea passArea : passAreas) { String areaName = areaClient .getAreaFullNameByCode( passArea.getTenantId(), passArea.getAreaCode()) .getAreaFullName(); - areaNames.add(areaName); + accessAreas.add(new AreaInfo(passArea.getAreaCode(), areaName)); } Long patientId = pass.getPatientId(); PatientResponse patient = patientClient.getPatientById(patientId); @@ -89,7 +91,7 @@ public List getAllMemberPassInfo(Long memberId) { pass.getId(), pass.getMemberId(), pass.getHospitalId(), - areaNames, + accessAreas, pass.getVisitCategory(), patientId, patient.getName(),