Merge pull request #405 from Juinjang/fix/#398

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

Author: PicturePark1101

src/main/java/umc/th/juinjang/api/limjang/service/NoteFinder.java

@@ -38,4 +38,10 @@ protected List<Limjang> getAllByMemberWithAddressAndNotePriceWhereIsSharableIsTr
 		return limjangRepository.findAllByMemberWithAddressAndNotePriceWhereIsSharableIsTrueAndDeletedIsFalse(
 			member);
 	}
+
+	protected List<Limjang> getAllByMemberWithAddressAndNotePriceWhereIsSharableIsTrueAndDeletedIsFalseAndAddressBcodeIsNotNull(
+		Member member) {
+		return limjangRepository.findAllByMemberWithAddressAndNotePriceWhereIsSharableIsTrueAndDeletedIsFalseAndAddressBcodeIsNotNull(
+			member);
+	}
 }

src/main/java/umc/th/juinjang/api/limjang/service/NoteQueryServiceV2.java

@@ -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);
 

src/main/java/umc/th/juinjang/domain/limjang/repository/LimjangRepository.java

@@ -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);
 }

src/main/java/umc/th/juinjang/domain/note/liked/model/repository/LikedNoteQueryDSLRepositoryImpl.java

@@ -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();

src/main/java/umc/th/juinjang/domain/note/shared/repository/SharedNoteQueryDSLRepositoryImpl.java

@@ -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())
@@ -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;
 		};
 	}

src/main/java/umc/th/juinjang/domain/note/shared/repository/SharedNoteRepository.java

@@ -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);
 }