Merge pull request #116 from AdultOfNineteen/develop

Api-Release-v0.0.4-3
AdultOfNineteen · Nov 7, 2024 · b772af6 · b772af6
2 parents bb84e3f + 7f74d32
commit b772af6
Showing 1 changed file with 2 additions and 3 deletions.
diff --git a/...c/main/java/com/example/wineydomain/tastingNote/repository/TastingNoteRepositoryImpl.java b/...c/main/java/com/example/wineydomain/tastingNote/repository/TastingNoteRepositoryImpl.java
@@ -93,7 +93,6 @@ public Page<TastingNote> findTastingNotesByWine(Wine wine, User user, Integer pa
                 qTastingNote.wine.eq(wine)
                     .and(qTastingNote.isDeleted.eq(false))
                     .and(qTastingNote.isPublic.eq(true)
-                        .or(qTastingNote.user.eq(user))
                     ).and(qTastingNote.user.ne(user))
             )
             .orderBy(qTastingNote.id.desc());
@@ -107,8 +106,8 @@ public Page<TastingNote> findTastingNotesByWine(Wine wine, User user, Integer pa
             qTastingNote.wine.eq(wine)
                 .and(qTastingNote.isDeleted.eq(false))
                 .and(qTastingNote.isPublic.eq(true)
-                    .or(qTastingNote.user.eq(user))
-                )
+                ).and(qTastingNote.user.ne(user)
+        )
         ).fetchCount();
 
         return new PageImpl<>(results, pageable, total);