Skip to content

[KW-650] feat: pass 조회 api에 출입 가능 구역 코드 추가 #53

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
midday2612 merged 3 commits into from
Jun 11, 2025
Merged

[KW-650] feat: pass 조회 api에 출입 가능 구역 코드 추가 #53

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
cc44375
KW-650/feat: pass 조회 api에 출입 가능 구역 코드 추가
midday2612 Jun 11, 2025
4c50aaf
KW-650/refactor: accessAreaNames/areaCodes 구조를 AccessAreaInfoResponse…
midday2612 Jun 11, 2025
b6f0d37
KW-650/refactor: 중복 파일 제거
midday2612 Jun 11, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 2 additions & 1 deletion src/main/java/com/doubleo/passservice/domain/pass/dto/response/MemberPassInfoResponse.java
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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;
Expand All @@ -12,7 +13,7 @@ public record MemberPassInfoResponse(
Long passId,
Long memberId,
Long hospitalId,
List<String> accessAreaNames,
List<AreaInfo> accessAreas,
VisitCategory visitCategory,
Long patientId,
String patientName,
Expand Down
8 changes: 5 additions & 3 deletions src/main/java/com/doubleo/passservice/domain/pass/service/PassServiceImpl.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down Expand Up @@ -58,16 +59,17 @@ public class PassServiceImpl implements PassService {
public List<MemberPassInfoResponse> getAllMemberPassInfo(Long memberId) {
List<Pass> passes = passRepository.findAllByMemberId(memberId);
List<MemberPassInfoResponse> responses = new ArrayList<>();

for (Pass pass : passes) {
List<PassArea> passAreas = passAreaRepository.findAllByPass(pass);
List<String> areaNames = new ArrayList<>();
List<AreaInfo> 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);
Expand All @@ -89,7 +91,7 @@ public List<MemberPassInfoResponse> getAllMemberPassInfo(Long memberId) {
pass.getId(),
pass.getMemberId(),
pass.getHospitalId(),
areaNames,
accessAreas,
pass.getVisitCategory(),
patientId,
patient.getName(),
Expand Down