feat: add filters for label, subject and originalId

Informasjonsforvaltning · Oct 6, 2023 · f4bbcf1 · f4bbcf1
1 parent 826074d
commit f4bbcf1
Show file tree

Hide file tree

Showing 2 changed files with 31 additions and 2 deletions.
diff --git a/src/main/kotlin/no/fdk/concept_catalog/service/ConceptSearchUtils.kt b/src/main/kotlin/no/fdk/concept_catalog/service/ConceptSearchUtils.kt
@@ -24,5 +24,36 @@ fun SearchFilters.asQueryFilters(orgNumber: String): List<Query> {
                 }
             })
     }
+
+    if (originalId != null) {
+        queryFilters
+            .add(Query.of { queryBuilder ->
+                queryBuilder.terms { termsBuilder ->
+                    termsBuilder.field("originaltBegrep.keyword")
+                        .terms { fieldBuilder -> fieldBuilder.value(originalId.value.map { FieldValue.of(it) }) }
+                }
+            })
+    }
+
+    if (label != null) {
+        queryFilters
+            .add(Query.of { queryBuilder ->
+                queryBuilder.terms { termsBuilder ->
+                    termsBuilder.field("merkelapp.keyword")
+                        .terms { fieldBuilder -> fieldBuilder.value(label.value.map { FieldValue.of(it) }) }
+                }
+            })
+    }
+
+    if (subject != null) {
+        queryFilters
+            .add(Query.of { queryBuilder ->
+                queryBuilder.terms { termsBuilder ->
+                    termsBuilder.field("fagområdeKoder")
+                        .terms { fieldBuilder -> fieldBuilder.value(subject.value.map { FieldValue.of(it) }) }
+                }
+            })
+    }
+
     return queryFilters
 }
diff --git a/src/test/kotlin/no/fdk/concept_catalog/contract/SearchConcepts.kt b/src/test/kotlin/no/fdk/concept_catalog/contract/SearchConcepts.kt
@@ -196,7 +196,6 @@ class SearchConcepts : ApiTestContext() {
     }
 
     @Test
-    @Ignore
     fun `Query with subjects filter returns correct results`() {
         val withSubjectFagomr1Response = authorizedRequest(
             "/begreper/search?orgNummer=111222333",
@@ -272,7 +271,6 @@ class SearchConcepts : ApiTestContext() {
     }
 
     @Test
-    @Ignore
     fun `Query with label filter returns correct results`() {
         val withLabelResponse = authorizedRequest(
             "/begreper/search?orgNummer=123456789",