diff --git a/backend/src/main/java/com/coffee/backend/domain/match/dto/IsMatchingDto.java b/backend/src/main/java/com/coffee/backend/domain/match/dto/IsMatchingDto.java index 92852b07f3..04de6e9d4b 100644 --- a/backend/src/main/java/com/coffee/backend/domain/match/dto/IsMatchingDto.java +++ b/backend/src/main/java/com/coffee/backend/domain/match/dto/IsMatchingDto.java @@ -10,7 +10,7 @@ public class IsMatchingDto { private String matchId; private String isMatching; - private Long partner; + private String matchPosition; private SenderInfoDto senderInfo; private ReceiverInfoDto receiverInfo; } \ No newline at end of file diff --git a/backend/src/main/java/com/coffee/backend/domain/match/service/MatchService.java b/backend/src/main/java/com/coffee/backend/domain/match/service/MatchService.java index 28882ad0ec..2af493565e 100644 --- a/backend/src/main/java/com/coffee/backend/domain/match/service/MatchService.java +++ b/backend/src/main/java/com/coffee/backend/domain/match/service/MatchService.java @@ -414,8 +414,10 @@ public IsMatchingDto isMatching(Long userId) { User receiver = userRepository.findByUserId(receiverId).orElseThrow(); SenderInfoDto senderInfo = mapper.map(sender, SenderInfoDto.class); + senderInfo.setSenderId(senderId); senderInfo.setCompany(customMapper.toCompanyDto(sender.getCompany())); ReceiverInfoDto receiverInfo = mapper.map(receiver, ReceiverInfoDto.class); + receiverInfo.setReceiverId(receiverId); receiverInfo.setCompany(customMapper.toCompanyDto(receiver.getCompany())); IsMatchingDto response = mapper.map(isMatchingInfo, IsMatchingDto.class); @@ -423,9 +425,9 @@ public IsMatchingDto isMatching(Long userId) { response.setReceiverInfo(receiverInfo); if (userId.equals(senderId)) { - response.setPartner(receiverId); + response.setMatchPosition("sender"); } else if (userId.equals(receiverId)) { - response.setPartner(senderId); + response.setMatchPosition("receiver"); } return response; } diff --git a/backend/src/main/java/com/coffee/backend/domain/user/dto/SenderInfoDto.java b/backend/src/main/java/com/coffee/backend/domain/user/dto/SenderInfoDto.java index 3d25e8613c..b7a03fed70 100644 --- a/backend/src/main/java/com/coffee/backend/domain/user/dto/SenderInfoDto.java +++ b/backend/src/main/java/com/coffee/backend/domain/user/dto/SenderInfoDto.java @@ -7,7 +7,7 @@ @Getter @Setter public class SenderInfoDto { - private Long userId; + private Long senderId; private String nickname; private CompanyDto company; private String position;