refactor: 자기 자신에겐 지도에서 보이도록 수정

Author: pizzazoa

src/main/java/org/devkor/apu/saerok_server/domain/collection/core/repository/CollectionRepository.java

@@ -57,14 +57,12 @@ public List<UserBirdCollection> findNearby(Point ref, double radiusMeters, Long
             String sqlMineOnly = """
             SELECT c.*
             FROM user_bird_collection c
-            LEFT JOIN bird b ON b.id = c.bird_id
             WHERE ST_DWithin(
                   c.location::geography,
                   CAST(:refPoint AS geography),
                   :radius
                 )
               AND c.user_id = :userId
-              AND (c.bird_id IS NULL OR b.conservation_grade = 'NONE')
             ORDER BY ST_Distance(
                      c.location::geography,
                      CAST(:refPoint AS geography)
@@ -93,7 +91,11 @@ WHERE ST_DWithin(
                    c.access_level = 'PUBLIC'
                 OR (CAST(:userId AS bigint) IS NOT NULL AND c.user_id = :userId)
               )
-              AND (c.bird_id IS NULL OR b.conservation_grade = 'NONE')
+              AND (
+                   c.bird_id IS NULL
+                OR b.conservation_grade = 'NONE'
+                OR (CAST(:userId AS bigint) IS NOT NULL AND c.user_id = :userId)
+              )
             ORDER BY ST_Distance(
                      c.location::geography,
                      CAST(:refPoint AS geography)
@@ -115,14 +117,12 @@ public long countNearbyCandidates(Point ref, double radiusMeters, Long userId, b
             String sql = """
             SELECT COUNT(*)
             FROM user_bird_collection c
-            LEFT JOIN bird b ON b.id = c.bird_id
             WHERE ST_DWithin(
                   c.location::geography,
                   CAST(:refPoint AS geography),
                   :radius
                 )
               AND c.user_id = :userId
-              AND (c.bird_id IS NULL OR b.conservation_grade = 'NONE')
             """;
 
             var query = em.createNativeQuery(sql)
@@ -146,7 +146,11 @@ WHERE ST_DWithin(
                    c.access_level = 'PUBLIC'
                 OR (CAST(:userId AS bigint) IS NOT NULL AND c.user_id = :userId)
               )
-              AND (c.bird_id IS NULL OR b.conservation_grade = 'NONE')
+              AND (
+                   c.bird_id IS NULL
+                OR b.conservation_grade = 'NONE'
+                OR (CAST(:userId AS bigint) IS NOT NULL AND c.user_id = :userId)
+              )
             """;
 
         var query = em.createNativeQuery(sql)
@@ -177,14 +181,12 @@ WITH candidates AS (
                        ST_Distance(c.location::geography, CAST(:refPoint AS geography)) AS dist,
                        ST_SnapToGrid(ST_Transform(c.location, 3857), :gridSize, :gridSize) AS cell_id
                 FROM user_bird_collection c
-                LEFT JOIN bird b ON b.id = c.bird_id
                 WHERE ST_DWithin(
                       c.location::geography,
                       CAST(:refPoint AS geography),
                       :radius
                     )
                   AND c.user_id = :userId
-                  AND (c.bird_id IS NULL OR b.conservation_grade = 'NONE')
             ), ranked AS (
                 SELECT id,
                        dist,
@@ -223,7 +225,11 @@ WHERE ST_DWithin(
                    c.access_level = 'PUBLIC'
                 OR (CAST(:userId AS bigint) IS NOT NULL AND c.user_id = :userId)
               )
-              AND (c.bird_id IS NULL OR b.conservation_grade = 'NONE')
+              AND (
+                   c.bird_id IS NULL
+                OR b.conservation_grade = 'NONE'
+                OR (CAST(:userId AS bigint) IS NOT NULL AND c.user_id = :userId)
+              )
         ), ranked AS (
             SELECT id,
                    dist,

src/test/java/org/devkor/apu/saerok_server/domain/collection/core/repository/CollectionRepositoryTest.java

@@ -210,8 +210,8 @@ void findNearby_excludesProtectedBirdCollections() throws Exception {
     }
 
     @Test
-    @DisplayName("mineOnly 주변 조회도 보호등급 새 컬렉션을 결과에서 제외한다")
-    void findNearby_mineOnly_excludesProtectedBirdCollections() throws Exception {
+    @DisplayName("mineOnly 주변 조회는 내 보호등급 새 컬렉션도 결과에 포함한다")
+    void findNearby_mineOnly_includesMyProtectedBirdCollections() throws Exception {
         // given
         User owner = newUser();
         Point ref = gf.createPoint(new Coordinate(126.9780, 37.5665));
@@ -235,11 +235,46 @@ void findNearby_mineOnly_excludesProtectedBirdCollections() throws Exception {
         List<UserBirdCollection> result = collectionRepository.findNearby(ref, 1_000, owner.getId(), true, null);
         long candidateCount = collectionRepository.countNearbyCandidates(ref, 1_000, owner.getId(), true);
 
+        // then
+        assertEquals(2, result.size());
+        assertEquals(2L, candidateCount);
+        assertTrue(result.stream().anyMatch(c -> c.getId().equals(normalCollection.getId())));
+        assertTrue(result.stream().anyMatch(c -> c.getId().equals(protectedCollection.getId())));
+    }
+
+    @Test
+    @DisplayName("로그인 주변 조회는 내 보호등급 새 컬렉션만 포함하고 타인의 보호등급 새 컬렉션은 제외한다")
+    void findNearby_all_includesMyProtectedBirdCollectionsOnly() throws Exception {
+        // given
+        User me = newUser();
+        User other = newUser();
+        Point ref = gf.createPoint(new Coordinate(126.9780, 37.5665));
+        Point near = gf.createPoint(new Coordinate(126.9781, 37.5664));
+
+        Bird myProtectedBird = new BirdBuilder(em)
+                .korName("my-protected-nearby-" + System.nanoTime())
+                .conservationGrade(ConservationGrade.GRADE_I)
+                .build();
+        Bird otherProtectedBird = new BirdBuilder(em)
+                .korName("other-protected-nearby-" + System.nanoTime())
+                .conservationGrade(ConservationGrade.GRADE_II)
+                .build();
+
+        UserBirdCollection myProtectedCollection = newCollection(me, myProtectedBird, near, AccessLevelType.PRIVATE);
+        UserBirdCollection otherProtectedCollection = newCollection(other, otherProtectedBird, near, AccessLevelType.PUBLIC);
+
+        em.flush();
+        em.clear();
+
+        // when
+        List<UserBirdCollection> result = collectionRepository.findNearby(ref, 1_000, me.getId(), false, null);
+        long candidateCount = collectionRepository.countNearbyCandidates(ref, 1_000, me.getId(), false);
+
         // then
         assertEquals(1, result.size());
         assertEquals(1L, candidateCount);
-        assertTrue(result.stream().anyMatch(c -> c.getId().equals(normalCollection.getId())));
-        assertFalse(result.stream().anyMatch(c -> c.getId().equals(protectedCollection.getId())));
+        assertTrue(result.stream().anyMatch(c -> c.getId().equals(myProtectedCollection.getId())));
+        assertFalse(result.stream().anyMatch(c -> c.getId().equals(otherProtectedCollection.getId())));
     }
 
     @Test
@@ -317,4 +352,37 @@ void findNearbyEven_excludesProtectedBirdCollections() throws Exception {
         assertTrue(result.stream().anyMatch(c -> c.getId().equals(normalCollection.getId())));
         assertFalse(result.stream().anyMatch(c -> c.getId().equals(protectedCollection.getId())));
     }
+
+    @Test
+    @DisplayName("findNearbyEven mineOnly는 내 보호등급 새 컬렉션도 결과에 포함한다")
+    void findNearbyEven_mineOnly_includesMyProtectedBirdCollections() throws Exception {
+        // given
+        User owner = newUser();
+        Point ref = gf.createPoint(new Coordinate(126.9780, 37.5665));
+        Point near = gf.createPoint(new Coordinate(126.9781, 37.5664));
+
+        Bird protectedBird = new BirdBuilder(em)
+                .korName("protected-even-mine-nearby-" + System.nanoTime())
+                .conservationGrade(ConservationGrade.GRADE_I)
+                .build();
+
+        UserBirdCollection protectedCollection = newCollection(owner, protectedBird, near, AccessLevelType.PRIVATE);
+
+        em.flush();
+        em.clear();
+
+        // when
+        List<UserBirdCollection> result = collectionRepository.findNearbyEven(
+                ref,
+                1_000,
+                owner.getId(),
+                true,
+                10,
+                80
+        );
+
+        // then
+        assertEquals(1, result.size());
+        assertTrue(result.stream().anyMatch(c -> c.getId().equals(protectedCollection.getId())));
+    }
 }