Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
Original file line number Diff line number Diff line change
Expand Up @@ -17,5 +17,6 @@ public static class RandomPartnerResponseDTO {
private String partnerDetailAddress;
private String partnerName;
private String partnerUrl;
private String partnerPhone;
}
}
Original file line number Diff line number Diff line change
Expand Up @@ -58,6 +58,7 @@ public AdminResponseDTO.RandomPartnerResponseDTO suggestRandomPartner(Long admin
.partnerAddress(picked.getAddress())
.partnerDetailAddress(picked.getDetailAddress())
.partnerUrl(picked.getMember().getProfileUrl())
.partnerPhone(picked.getMember().getPhoneNum())
.build();
}

Expand Down

This file was deleted.

Original file line number Diff line number Diff line change
Expand Up @@ -38,6 +38,7 @@ public static BlockResponseDTO.BlockMemberDTO toBlockedMemberDTO(Block block) {
return BlockResponseDTO.BlockMemberDTO.builder()
.memberId(blockedMember.getId())
.name(blockedName) // 또는 getNickname() 등 실제 필드명 사용
.blockDate(block.getCreatedAt())
.build();
}

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
import lombok.Getter;
import lombok.NoArgsConstructor;

import java.util.List;
import java.time.LocalDateTime;

public class BlockResponseDTO {

Expand All @@ -16,6 +16,7 @@ public class BlockResponseDTO {
public static class BlockMemberDTO {
private Long memberId;
private String name;
private LocalDateTime blockDate;
}

@Getter
Expand All @@ -28,12 +29,4 @@ public static class CheckBlockMemberDTO {
private boolean blocked;
}

@Getter
@Builder
@AllArgsConstructor
@NoArgsConstructor
public static class BlockedMemberListDTO {
List<BlockMemberDTO> blockedMembers;
}

}
Original file line number Diff line number Diff line change
Expand Up @@ -24,6 +24,7 @@ public static class PartnerMapResponseDTO {
private Double latitude;
private Double longitude;
private String profileUrl;
private String phoneNumber;
}

@Getter
Expand All @@ -41,6 +42,7 @@ public static class AdminMapResponseDTO {
private Double latitude;
private Double longitude;
private String profileUrl;
private String phoneNumber;
}

@Getter
Expand All @@ -64,6 +66,7 @@ public static class StoreMapResponseDTO {
private Double latitude;
private Double longitude;
private String profileUrl;
private String phoneNumber;

}

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -73,6 +73,7 @@ public List<MapResponseDTO.PartnerMapResponseDTO> getPartners(MapRequestDTO.View
.latitude(p.getLatitude())
.longitude(p.getLongitude())
.profileUrl(url)
.phoneNumber(p.getMember().getPhoneNum())
.build();
}).toList();
}
Expand Down Expand Up @@ -100,6 +101,7 @@ public List<MapResponseDTO.AdminMapResponseDTO> getAdmins(MapRequestDTO.ViewOnMa
.latitude(a.getLatitude())
.longitude(a.getLongitude())
.profileUrl(url)
.phoneNumber(a.getMember().getPhoneNum())
.build();
}).toList();
}
Expand Down Expand Up @@ -160,6 +162,7 @@ public List<MapResponseDTO.StoreMapResponseDTO> getStores(MapRequestDTO.ViewOnMa
.latitude(s.getLatitude())
.longitude(s.getLongitude())
.profileUrl(profileUrl)
.phoneNumber(s.getPartner().getMember().getPhoneNum())
.build();
}).toList();
}
Expand Down Expand Up @@ -220,6 +223,7 @@ else if (content.getOptionType() == OptionType.SERVICE) {
.latitude(s.getLatitude())
.longitude(s.getLongitude())
.profileUrl(url)
.phoneNumber(s.getPartner().getMember().getPhoneNum())
.build();
}).toList();
}
Expand Down Expand Up @@ -247,6 +251,7 @@ public List<MapResponseDTO.PartnerMapResponseDTO> searchPartner(String keyword,
.latitude(p.getLatitude())
.longitude(p.getLongitude())
.profileUrl(url)
.phoneNumber(p.getMember().getPhoneNum())
.build();
}).toList();
}
Expand Down Expand Up @@ -274,6 +279,7 @@ public List<MapResponseDTO.AdminMapResponseDTO> searchAdmin(String keyword, Long
.latitude(a.getLatitude())
.longitude(a.getLongitude())
.profileUrl(url)
.phoneNumber(a.getMember().getPhoneNum())
.build();
}).toList();
}
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -27,5 +27,6 @@ public static class AdminLiteDTO {
private String adminDetailAddress;
private String adminName;
private String adminUrl;
private String adminPhone;
}
}
Original file line number Diff line number Diff line change
Expand Up @@ -48,6 +48,7 @@ public PartnerResponseDTO.RandomAdminResponseDTO getRandomAdmin(Long partnerId)
.adminDetailAddress(a.getDetailAddress())
.adminName(a.getName())
.adminUrl(a.getMember().getProfileUrl())
.adminPhone(a.getMember().getPhoneNum())
.build())
.collect(Collectors.toList());

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -445,7 +445,7 @@ public PartnershipResponseDTO.AdminPartnershipWithPartnerResponseDTO checkPartne
Partner partner = partnerRepository.findById(partnerId)
.orElseThrow(() -> new DatabaseException(ErrorStatus.NO_SUCH_PARTNER));

List<ActivationStatus> targetStatuses = List.of(ActivationStatus.ACTIVE, ActivationStatus.SUSPEND);
List<ActivationStatus> targetStatuses = List.of(ActivationStatus.ACTIVE, ActivationStatus.SUSPEND, ActivationStatus.BLANK);
boolean isPartnered = paperRepository.existsByAdmin_IdAndPartner_IdAndIsActivatedIn(adminId, partnerId, targetStatuses);

Long paperId = null;
Expand Down