From cc44375726abba9cc4e191a52f79362e66025165 Mon Sep 17 00:00:00 2001 From: midday2612 Date: Wed, 11 Jun 2025 15:32:32 +0900 Subject: [PATCH 1/3] =?UTF-8?q?KW-650/feat:=20pass=20=EC=A1=B0=ED=9A=8C=20?= =?UTF-8?q?api=EC=97=90=20=EC=B6=9C=EC=9E=85=20=EA=B0=80=EB=8A=A5=20?= =?UTF-8?q?=EA=B5=AC=EC=97=AD=20=EC=BD=94=EB=93=9C=20=EC=B6=94=EA=B0=80?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../domain/pass/dto/response/MemberPassInfoResponse.java | 1 + .../passservice/domain/pass/service/PassServiceImpl.java | 3 +++ 2 files changed, 4 insertions(+) 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..982e102 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 @@ -13,6 +13,7 @@ public record MemberPassInfoResponse( Long memberId, Long hospitalId, List accessAreaNames, + List accessAreaCodes, 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..b28e3fb 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 @@ -58,6 +58,7 @@ public class PassServiceImpl implements PassService { public List getAllMemberPassInfo(Long memberId) { List passes = passRepository.findAllByMemberId(memberId); List responses = new ArrayList<>(); + List areaCodes = new ArrayList<>(); for (Pass pass : passes) { List passAreas = passAreaRepository.findAllByPass(pass); List areaNames = new ArrayList<>(); @@ -68,6 +69,7 @@ public List getAllMemberPassInfo(Long memberId) { passArea.getTenantId(), passArea.getAreaCode()) .getAreaFullName(); areaNames.add(areaName); + areaCodes.add(passArea.getAreaCode()); } Long patientId = pass.getPatientId(); PatientResponse patient = patientClient.getPatientById(patientId); @@ -90,6 +92,7 @@ public List getAllMemberPassInfo(Long memberId) { pass.getMemberId(), pass.getHospitalId(), areaNames, + areaCodes, pass.getVisitCategory(), patientId, patient.getName(), From 4c50aafc5f7445959f9c2485fadbcc6f870ae8d4 Mon Sep 17 00:00:00 2001 From: midday2612 Date: Wed, 11 Jun 2025 15:50:56 +0900 Subject: [PATCH 2/3] =?UTF-8?q?KW-650/refactor:=20accessAreaNames/areaCode?= =?UTF-8?q?s=20=EA=B5=AC=EC=A1=B0=EB=A5=BC=20AccessAreaInfoResponse?= =?UTF-8?q?=EB=A1=9C=20=ED=86=B5=ED=95=A9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../pass/dto/response/AccessAreaInfoResponse.java | 3 +++ .../pass/dto/response/MemberPassInfoResponse.java | 3 +-- .../domain/pass/service/PassServiceImpl.java | 11 +++++------ 3 files changed, 9 insertions(+), 8 deletions(-) create mode 100644 src/main/java/com/doubleo/passservice/domain/pass/dto/response/AccessAreaInfoResponse.java diff --git a/src/main/java/com/doubleo/passservice/domain/pass/dto/response/AccessAreaInfoResponse.java b/src/main/java/com/doubleo/passservice/domain/pass/dto/response/AccessAreaInfoResponse.java new file mode 100644 index 0000000..512d7f3 --- /dev/null +++ b/src/main/java/com/doubleo/passservice/domain/pass/dto/response/AccessAreaInfoResponse.java @@ -0,0 +1,3 @@ +package com.doubleo.passservice.domain.pass.dto.response; + +public record AccessAreaInfoResponse(String code, String name) {} 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 982e102..17236af 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 @@ -12,8 +12,7 @@ public record MemberPassInfoResponse( Long passId, Long memberId, Long hospitalId, - List accessAreaNames, - List accessAreaCodes, + 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 b28e3fb..56da22e 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 @@ -7,6 +7,7 @@ import com.doubleo.passservice.domain.pass.domain.Pass; import com.doubleo.passservice.domain.pass.domain.PassArea; import com.doubleo.passservice.domain.pass.dto.GuardianInfo; +import com.doubleo.passservice.domain.pass.dto.response.AccessAreaInfoResponse; import com.doubleo.passservice.domain.pass.dto.response.MemberPassInfoResponse; import com.doubleo.passservice.domain.pass.dto.response.PassCreateResponse; import com.doubleo.passservice.domain.pass.dto.response.PendingPassResponse; @@ -58,18 +59,17 @@ public class PassServiceImpl implements PassService { public List getAllMemberPassInfo(Long memberId) { List passes = passRepository.findAllByMemberId(memberId); List responses = new ArrayList<>(); - List areaCodes = 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); - areaCodes.add(passArea.getAreaCode()); + accessAreas.add(new AccessAreaInfoResponse(passArea.getAreaCode(), areaName)); } Long patientId = pass.getPatientId(); PatientResponse patient = patientClient.getPatientById(patientId); @@ -91,8 +91,7 @@ public List getAllMemberPassInfo(Long memberId) { pass.getId(), pass.getMemberId(), pass.getHospitalId(), - areaNames, - areaCodes, + accessAreas, pass.getVisitCategory(), patientId, patient.getName(), From b6f0d37c80ded774f550db711599943581f1504e Mon Sep 17 00:00:00 2001 From: midday2612 Date: Wed, 11 Jun 2025 16:00:47 +0900 Subject: [PATCH 3/3] =?UTF-8?q?KW-650/refactor:=20=EC=A4=91=EB=B3=B5=20?= =?UTF-8?q?=ED=8C=8C=EC=9D=BC=20=EC=A0=9C=EA=B1=B0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../domain/pass/dto/response/AccessAreaInfoResponse.java | 3 --- .../domain/pass/dto/response/MemberPassInfoResponse.java | 3 ++- .../passservice/domain/pass/service/PassServiceImpl.java | 6 +++--- 3 files changed, 5 insertions(+), 7 deletions(-) delete mode 100644 src/main/java/com/doubleo/passservice/domain/pass/dto/response/AccessAreaInfoResponse.java diff --git a/src/main/java/com/doubleo/passservice/domain/pass/dto/response/AccessAreaInfoResponse.java b/src/main/java/com/doubleo/passservice/domain/pass/dto/response/AccessAreaInfoResponse.java deleted file mode 100644 index 512d7f3..0000000 --- a/src/main/java/com/doubleo/passservice/domain/pass/dto/response/AccessAreaInfoResponse.java +++ /dev/null @@ -1,3 +0,0 @@ -package com.doubleo.passservice.domain.pass.dto.response; - -public record AccessAreaInfoResponse(String code, String name) {} 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 17236af..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 accessAreas, + 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 56da22e..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,8 +6,8 @@ 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.AccessAreaInfoResponse; import com.doubleo.passservice.domain.pass.dto.response.MemberPassInfoResponse; import com.doubleo.passservice.domain.pass.dto.response.PassCreateResponse; import com.doubleo.passservice.domain.pass.dto.response.PendingPassResponse; @@ -62,14 +62,14 @@ public List getAllMemberPassInfo(Long memberId) { for (Pass pass : passes) { List passAreas = passAreaRepository.findAllByPass(pass); - List accessAreas = new ArrayList<>(); + List accessAreas = new ArrayList<>(); for (PassArea passArea : passAreas) { String areaName = areaClient .getAreaFullNameByCode( passArea.getTenantId(), passArea.getAreaCode()) .getAreaFullName(); - accessAreas.add(new AccessAreaInfoResponse(passArea.getAreaCode(), areaName)); + accessAreas.add(new AreaInfo(passArea.getAreaCode(), areaName)); } Long patientId = pass.getPatientId(); PatientResponse patient = patientClient.getPatientById(patientId);