Skip to content

Commit

Permalink
[fix] 매칭중 매칭포지션 수정
Browse files Browse the repository at this point in the history
  • Loading branch information
tmdtmdqorekf committed May 22, 2024
1 parent 093b196 commit 8159f70
Show file tree
Hide file tree
Showing 3 changed files with 6 additions and 4 deletions.
Original file line number Diff line number Diff line change
Expand Up @@ -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;
}
Original file line number Diff line number Diff line change
Expand Up @@ -414,18 +414,20 @@ 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);
response.setSenderInfo(senderInfo);
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;
}
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@
@Getter
@Setter
public class SenderInfoDto {
private Long userId;
private Long senderId;
private String nickname;
private CompanyDto company;
private String position;
Expand Down

0 comments on commit 8159f70

Please sign in to comment.