Skip to content

[fix/#437] 임장 둘러보기 관련 자잘한 버그 fix #438

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
PicturePark1101 merged 4 commits into from
Jul 12, 2025
Merged

[fix/#437] 임장 둘러보기 관련 자잘한 버그 fix #438

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
1f81020
fix : sigungo, bname1, bname2에서 null 뿐만 아니라 빈배열도 filter #437
PicturePark1101 Jul 12, 2025
ae9ada3
fix : 임장 상세보기에서 도로명 주소만 리턴 #437
PicturePark1101 Jul 12, 2025
3e91846
fix : 임장 주인인 경우 고려하여 isBuyer필드 fix #437
PicturePark1101 Jul 12, 2025
050b6aa
fix : 데이터 갯수 불일치 문제 fix #437
PicturePark1101 Jul 12, 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
13 changes: 9 additions & 4 deletions src/main/java/umc/th/juinjang/api/note/shared/service/SharedNoteQueryService.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -59,22 +59,27 @@ public SharedNoteGetResponse findSharedNote(Member member, Long sharedNoteId) {
SharedNote sharedNote = sharedNoteFinder.findByIdWithNoteAndAddress(sharedNoteId);
Limjang limjang = sharedNote.getLimjang();

boolean isBuyer = usedPencilFinder.existsByMemberAndSharedNoteId(member, sharedNoteId);
boolean isBuyerOrOwner = getIsBuyerOrOwner(member, sharedNote);

long viewCount = getViewCountAndCheckReward(member, sharedNoteId, sharedNote);

Integer countBuyer = makeBuyerCount(usedPencilFinder.countBySharedNoteId(sharedNoteId));
boolean isLiked = likedNoteFinder.existsByMemberAndSharedNote(member, sharedNote);

if (isBuyer) {
return SharedNoteGetResponse.ofPurchased(isBuyer, limjang, limjang.getAddressEntity(), sharedNote,
if (isBuyerOrOwner) {
return SharedNoteGetResponse.ofPurchased(isBuyerOrOwner, limjang, limjang.getAddressEntity(), sharedNote,
sharedNote.getMember(), countBuyer, isLiked, viewCount);
} else {
return SharedNoteGetResponse.ofNotPurchased(isBuyer, limjang, limjang.getAddressEntity(), sharedNote,
return SharedNoteGetResponse.ofNotPurchased(isBuyerOrOwner, limjang, limjang.getAddressEntity(), sharedNote,
sharedNote.getMember(), countBuyer, isLiked, viewCount);
}
}

private boolean getIsBuyerOrOwner(Member requestMember, SharedNote sharedNote) {
return usedPencilFinder.existsByMemberAndSharedNoteId(requestMember, sharedNote.getSharedNoteId()) ||
sharedNote.getMember().getMemberId().equals(requestMember.getMemberId());
}

private long getViewCountAndCheckReward(Member member, Long sharedNoteId, SharedNote sharedNote) {
long viewCount = viewCountService.getRedisViewCount(sharedNote.getSharedNoteId());
if (!viewCountService.isDuplicate(member.getMemberId(), sharedNoteId)) {
Expand Down
4 changes: 2 additions & 2 deletions src/main/java/umc/th/juinjang/api/note/shared/service/response/SharedNoteGetResponse.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -62,7 +62,7 @@ public static SharedNoteGetResponse ofNotPurchased(
limjang.getPriceType(),
buyerCount,
findImagesUrlBySharingStatus(sharedNote.isImageShared(), limjang, 2),
address.getFullAddress(),
address.getRoadAddress(),
address.getShortAddress(),
limjang.getLimjangPrice().getPrice(limjang.getPriceType(), limjang.getPurpose()),
limjang.getPriceType() == LimjangPriceType.MONTHLY_RENT ? limjang.getLimjangPrice().getMonthlyRent() :
Expand Down Expand Up @@ -103,7 +103,7 @@ public static SharedNoteGetResponse ofPurchased(
limjang.getPriceType(),
buyerCount,
findImagesUrlBySharingStatus(sharedNote.isImageShared(), limjang, 3),
address.getFullAddress(),
address.getRoadAddress(),
address.getShortAddress(),
limjang.getLimjangPrice().getPrice(limjang.getPriceType(), limjang.getPurpose()),
limjang.getPriceType() == LimjangPriceType.MONTHLY_RENT ? limjang.getLimjangPrice().getMonthlyRent() :
Expand Down
2 changes: 1 addition & 1 deletion src/main/java/umc/th/juinjang/domain/limjang/model/Address.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -70,7 +70,7 @@ public static Address create(String roadAddress, String addressDetail, String bc

public String getShortAddress() {
return Stream.of(sigungo, bname1, bname2)
.filter(Objects::nonNull)
.filter(s -> s != null && !s.isBlank())
.collect(Collectors.joining(" "));
}

Expand Down
11 changes: 7 additions & 4 deletions .../java/umc/th/juinjang/domain/note/shared/repository/SharedNoteQueryDSLRepositoryImpl.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,6 +10,7 @@
import static umc.th.juinjang.domain.report.model.QReport.*;

import java.util.List;
import java.util.Optional;

import org.springframework.data.domain.Page;
import org.springframework.data.domain.PageImpl;
Expand Down Expand Up @@ -64,19 +65,21 @@ public Page<SharedNote> findSharedNoteInExployer(List<String> code, ExploreSortT
.fetch();

JPAQuery<Long> countQuery = queryFactory
.select(sharedNote.count())
.from(sharedNote)
.select(sharedNote.count()).from(sharedNote)
.join(sharedNote.limjang, limjang)
.join(sharedNote.member, member)
.join(limjang.limjangPrice, limjangPrice)
.join(limjang.addressEntity, address)
.leftJoin(limjang.report, report)
.where(
getBcodesStartsWith(code),
getWhereByPropertyType(propertyType),
getWhereByPriceType(priceType),
keywordCondition(keyword),
sharedNote.deletedAt.isNull()
sharedNote.deletedAt.isNull(),
limjang.deleted.isFalse()
);
long totalCount = countQuery.fetchOne();
long totalCount = Optional.ofNullable(countQuery.fetchOne()).orElse(0L);
return new PageImpl<>(content, pageable, totalCount);
}

Expand Down