fix(core): apply type selection as a whole when querying (#1056)

stellio-hub · Dec 2, 2023 · cc96958 · cc96958
1 parent 4dc1319
commit cc96958
Show file tree

Hide file tree

Showing 2 changed files with 20 additions and 4 deletions.
diff --git a/search-service/src/main/kotlin/com/egm/stellio/search/service/EntityPayloadService.kt b/search-service/src/main/kotlin/com/egm/stellio/search/service/EntityPayloadService.kt
@@ -335,7 +335,7 @@ class EntityPayloadService(
             if (!entitiesQuery.idPattern.isNullOrEmpty())
                 "entity_payload.entity_id ~ '${entitiesQuery.idPattern}'"
             else null
-        val formattedType = entitiesQuery.typeSelection?.let { buildTypeQuery(it) }
+        val formattedType = entitiesQuery.typeSelection?.let { "(" + buildTypeQuery(it) + ")" }
         val formattedAttrs =
             if (entitiesQuery.attrs.isNotEmpty())
                 entitiesQuery.attrs.joinToString(

diff --git a/search-service/src/test/kotlin/com/egm/stellio/search/service/EntityQueryServiceTests.kt b/search-service/src/test/kotlin/com/egm/stellio/search/service/EntityQueryServiceTests.kt
@@ -141,19 +141,35 @@ class EntityQueryServiceTests : WithTimescaleContainer, WithKafkaContainer {
     }
 
     @Test
-    fun `it should retrieve entities according to ids and types and attrs`() = runTest {
+    fun `it should retrieve entities according to ids and a type`() = runTest {
         val entitiesIds =
             entityPayloadService.queryEntities(
                 EntitiesQuery(
-                    ids = setOf(entity02Uri, entity01Uri),
+                    ids = setOf(entity02Uri),
                     typeSelection = BEEHIVE_TYPE,
                     paginationQuery = PaginationQuery(limit = 2, offset = 0),
                     context = APIC_COMPOUND_CONTEXT
                 )
             ) { null }
 
+        assertEquals(1, entitiesIds.size)
+        assertThat(entitiesIds).contains(entity02Uri)
+    }
+
+    @Test
+    fun `it should retrieve entities according to ids and a selection of types`() = runTest {
+        val entitiesIds =
+            entityPayloadService.queryEntities(
+                EntitiesQuery(
+                    ids = setOf(entity02Uri, entity05Uri),
+                    typeSelection = "$APIARY_TYPE|$BEEHIVE_TYPE",
+                    paginationQuery = PaginationQuery(limit = 2, offset = 0),
+                    context = APIC_COMPOUND_CONTEXT
+                )
+            ) { null }
+
         assertEquals(2, entitiesIds.size)
-        assertThat(entitiesIds).contains(entity01Uri, entity02Uri)
+        assertThat(entitiesIds).contains(entity02Uri, entity05Uri)
     }
 
     @Test