Skip to content

[fix/#398] 임장 나누기 화면에서 bcode null일 경우 나오지 않도록 쿼리 fix #405

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 3 commits into from
Jun 9, 2025
Merged

[fix/#398] 임장 나누기 화면에서 bcode null일 경우 나오지 않도록 쿼리 fix #405

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
0e51863
fix : 임장 나누기 화면에서 bcode null일 경우 조회 안되도록 쿼리에 조건절 추가 #398
PicturePark1101 Jun 6, 2025
1e81a68
fix : 임장 둘러보기 화면에서 삭제된 임장은 나오지 않도록 쿼리에 조건절 추가 #398
PicturePark1101 Jun 6, 2025
4999a3c
fix : 좋아요한 노트, 공유한 노트에서 삭제된 임장은 나오지 않도록 쿼리에 조건절 추가 #398
PicturePark1101 Jun 6, 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
6 changes: 6 additions & 0 deletions src/main/java/umc/th/juinjang/api/limjang/service/NoteFinder.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -38,4 +38,10 @@ protected List<Limjang> getAllByMemberWithAddressAndNotePriceWhereIsSharableIsTr
return limjangRepository.findAllByMemberWithAddressAndNotePriceWhereIsSharableIsTrueAndDeletedIsFalse(
member);
}

protected List<Limjang> getAllByMemberWithAddressAndNotePriceWhereIsSharableIsTrueAndDeletedIsFalseAndAddressBcodeIsNotNull(
Member member) {
return limjangRepository.findAllByMemberWithAddressAndNotePriceWhereIsSharableIsTrueAndDeletedIsFalseAndAddressBcodeIsNotNull(
member);
}
}
2 changes: 1 addition & 1 deletion src/main/java/umc/th/juinjang/api/limjang/service/NoteQueryServiceV2.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -68,7 +68,7 @@ public UserNotesShareableGetResponse findNotesShareable(Member member) {
}

private List<Limjang> findUnsharedSharableNotes(Member member) {
List<Limjang> notes = noteFinder.getAllByMemberWithAddressAndNotePriceWhereIsSharableIsTrueAndDeletedIsFalse(
List<Limjang> notes = noteFinder.getAllByMemberWithAddressAndNotePriceWhereIsSharableIsTrueAndDeletedIsFalseAndAddressBcodeIsNotNull(
member);
Set<Long> noteIdInSharedNotes = sharedNoteFinder.findLimjangIdsByDeletedAtIsNullAndLimjang(notes);

Expand Down
4 changes: 4 additions & 0 deletions src/main/java/umc/th/juinjang/domain/limjang/repository/LimjangRepository.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -63,4 +63,8 @@ Optional<Limjang> findByLimjangIdAndMemberIdWithLimjangPriceAndDeletedIsFalse(@P
@Query("SELECT l FROM Limjang l join fetch l.addressEntity join fetch l.limjangPrice left join fetch l.report WHERE l.memberId = :member AND l.deleted = false AND l.isSharable = true")
List<Limjang> findAllByMemberWithAddressAndNotePriceWhereIsSharableIsTrueAndDeletedIsFalse(
@Param("member") Member member);

@Query("SELECT l FROM Limjang l join fetch l.addressEntity join fetch l.limjangPrice left join fetch l.report WHERE l.memberId = :member AND l.deleted = false AND l.addressEntity.bcode is not null AND l.isSharable = true")
List<Limjang> findAllByMemberWithAddressAndNotePriceWhereIsSharableIsTrueAndDeletedIsFalseAndAddressBcodeIsNotNull(
@Param("member") Member member);
}
3 changes: 2 additions & 1 deletion ...a/umc/th/juinjang/domain/note/liked/model/repository/LikedNoteQueryDSLRepositoryImpl.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -44,7 +44,8 @@ public List<LikedNote> findAllByMemberAndDynamicWhereDeletedAtIsNull(Member user
getWhereByPropertyType(propertyType),
getWhereByPriceType(priceType),
keywordCondition(keyword),
sharedNote.deletedAt.isNull()
sharedNote.deletedAt.isNull(),
limjang.deleted.isFalse()
)
.orderBy(likedNote.likedNoteId.desc())
.fetch();
Expand Down
5 changes: 3 additions & 2 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 @@ -55,7 +55,8 @@ public Page<SharedNote> findSharedNoteInExployer(List<String> code, ExploreSortT
getWhereByPropertyType(propertyType),
getWhereByPriceType(priceType),
keywordCondition(keyword),
sharedNote.deletedAt.isNull()
sharedNote.deletedAt.isNull(),
limjang.deleted.isFalse()
)
.orderBy(getOrderBySortOptions(sort))
.offset(pageable.getOffset())
Expand Down Expand Up @@ -109,7 +110,7 @@ private OrderSpecifier<?>[] getOrderByNoteType(NoteType noteType) {
private BooleanExpression getWhereByNoteType(Member user, NoteType noteType, List<Long> ids) {
return switch (noteType) {
case OWNED -> sharedNote.sharedNoteId.in(ids);
case SHARED -> sharedNote.member.eq(user).and(sharedNote.deletedAt.isNull());
case SHARED -> sharedNote.member.eq(user).and(sharedNote.deletedAt.isNull()).and(limjang.deleted.isFalse());
default -> null;
};
}
Expand Down
2 changes: 1 addition & 1 deletion src/main/java/umc/th/juinjang/domain/note/shared/repository/SharedNoteRepository.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -47,6 +47,6 @@ public interface SharedNoteRepository extends JpaRepository<SharedNote, Long>, S

boolean existsByDeletedAtIsNullAndLimjang(Limjang limjang);

@Query("SELECT s.limjang.limjangId FROM SharedNote s WHERE s.limjang in :limjangs AND s.deletedAt is null ")
@Query("SELECT s.limjang.limjangId FROM SharedNote s WHERE s.limjang in :limjangs AND s.deletedAt is null")
Set<Long> findLimjangIdsByDeletedAtIsNullAndLimjang(@Param("limjangs") List<Limjang> limjangs);
}