Simplifisering av elastic-søk

src/main/kotlin/no/fdk/concept_catalog/elastic/ElasticUpdater.kt

@@ -15,20 +15,17 @@ private val logger = LoggerFactory.getLogger(ElasticUpdater::class.java)
 @Service
 class ElasticUpdater(
     private val conceptRepository: MongoTemplate,
-    private val conceptSearchRepository: ConceptSearchRepository,
     private val currentConceptRepository: CurrentConceptRepository
 ) {
 
     fun reindexElastic() = runBlocking {
         launch {
             try {
-                conceptSearchRepository.deleteAll()
                 currentConceptRepository.deleteAll()
             } catch (_: Exception) { }
 
             conceptRepository.findAll<BegrepDBO>()
                 .forEach {
-                    conceptSearchRepository.save(it)
                     if (it.shouldBeCurrent(currentConceptRepository.findByIdOrNull(it.originaltBegrep))) currentConceptRepository.save(CurrentConcept(it))
                 }
 

src/main/kotlin/no/fdk/concept_catalog/model/Begrep.kt

@@ -3,13 +3,8 @@ package no.fdk.concept_catalog.model
 import com.fasterxml.jackson.annotation.JsonFormat
 import com.fasterxml.jackson.annotation.JsonIgnoreProperties
 import com.fasterxml.jackson.annotation.JsonInclude
-import org.springframework.data.elasticsearch.annotations.Field
-import org.springframework.data.elasticsearch.annotations.FieldType
-import org.springframework.data.elasticsearch.annotations.Mapping
-import org.springframework.data.elasticsearch.annotations.Setting
 import org.springframework.data.mongodb.core.index.CompoundIndex
 import org.springframework.data.mongodb.core.index.CompoundIndexes
-import org.springframework.data.mongodb.core.index.Indexed
 import org.springframework.data.mongodb.core.mapping.Document
 import java.time.Instant
 import java.time.LocalDate
@@ -21,9 +16,6 @@ import java.time.LocalDate
     CompoundIndex(name = "originalt_begrep", def = "{'originaltBegrep' : 1}"),
     CompoundIndex(name = "originalt_begrep_er_publisert", def = "{'originaltBegrep' : 1, 'erPublisert': 1}")
 ])
-@org.springframework.data.elasticsearch.annotations.Document(indexName = "concepts")
-@Setting(settingPath = "/elastic/settings.json")
-@Mapping(mappingPath = "/elastic/mappings.json")
 @JsonInclude(JsonInclude.Include.NON_NULL)
 data class BegrepDBO (
     val id: String,
@@ -34,7 +26,6 @@ data class BegrepDBO (
     val statusURI: String? = null,
     val erPublisert: Boolean = false,
     @JsonFormat(shape = JsonFormat.Shape.STRING, pattern = "yyyy-MM-dd'T'HH:mm:ss.SSSXXX", timezone = "Europe/Oslo")
-    @Field(type = FieldType.Date)
     val publiseringsTidspunkt: Instant? = null,
     val anbefaltTerm: Term?,
     val tillattTerm: Map<String, List<String>>?,
@@ -50,12 +41,9 @@ data class BegrepDBO (
     val fagområdeKoder: List<String>?,
     val omfang: URITekst?,
     val kontaktpunkt: Kontaktpunkt?,
-    @Field(type = FieldType.Date)
     val gyldigFom: LocalDate?,
-    @Field(type = FieldType.Date)
     val gyldigTom: LocalDate?,
     val endringslogelement: Endringslogelement?,
-    @Field(type = FieldType.Date)
     val opprettet: Instant? = null,
     val opprettetAv: String? = null,
     val seOgså: List<String>?,

src/main/kotlin/no/fdk/concept_catalog/model/CurrentConcept.kt

@@ -3,13 +3,13 @@ package no.fdk.concept_catalog.model
 import com.fasterxml.jackson.annotation.JsonFormat
 import com.fasterxml.jackson.annotation.JsonInclude
 import org.springframework.data.annotation.Id
-import org.springframework.data.elasticsearch.annotations.*
+import org.springframework.data.elasticsearch.annotations.Document
+import org.springframework.data.elasticsearch.annotations.Field
+import org.springframework.data.elasticsearch.annotations.FieldType
 import java.time.Instant
 import java.time.LocalDate
 
 @Document(indexName = "concepts-current")
-@Setting(settingPath = "/elastic/settings.json")
-@Mapping(mappingPath = "/elastic/mappings.json")
 @JsonInclude(JsonInclude.Include.NON_NULL)
 data class CurrentConcept(
     val idOfThisVersion: String,

src/main/kotlin/no/fdk/concept_catalog/model/SearchOperation.kt

@@ -26,7 +26,6 @@ class SearchFilters(
     val assignedUser: SearchFilter<List<String>>? = null,
     val status: SearchFilter<List<String>>? = null,
     val published: BooleanFilter? = null,
-    val onlyCurrentVersions: Boolean = true,
     val subject: SearchFilter<List<String>>? = null,
     val originalId: SearchFilter<List<String>>? = null,
     val internalFields: SearchFilter<Map<String, List<String>>>? = null,

src/main/kotlin/no/fdk/concept_catalog/service/ChangeRequestService.kt

@@ -1,6 +1,5 @@
 package no.fdk.concept_catalog.service
 
-import no.fdk.concept_catalog.elastic.ConceptSearchRepository
 import no.fdk.concept_catalog.elastic.CurrentConceptRepository
 import no.fdk.concept_catalog.model.*
 import java.util.UUID
@@ -21,7 +20,6 @@ private val logger = LoggerFactory.getLogger(ChangeRequestService::class.java)
 class ChangeRequestService(
     private val changeRequestRepository: ChangeRequestRepository,
     private val conceptRepository: ConceptRepository,
-    private val conceptSearchRepository: ConceptSearchRepository,
     private val currentConceptRepository: CurrentConceptRepository,
     private val conceptService: ConceptService
 ) {
@@ -82,12 +80,10 @@ class ChangeRequestService(
         val conceptToUpdate = when {
             dbConcept == null -> createNewConcept(Virksomhet(id=catalogId), user)
                 .updateLastChangedAndByWhom(user)
-                .also { conceptSearchRepository.save(it) }
                 .also { currentConceptRepository.save(CurrentConcept(it)) }
                 .let { conceptRepository.save(it) }
             dbConcept.erPublisert -> dbConcept.createNewRevision(user)
                 .updateLastChangedAndByWhom(user)
-                .also { conceptSearchRepository.save(it) }
                 .let { conceptRepository.save(it) }
             else -> dbConcept
         }
@@ -98,7 +94,6 @@ class ChangeRequestService(
             logger.error("update of concept failed when accepting ${changeRequest.id}, reverting acceptation", ex)
             changeRequest.copy(status = ChangeRequestStatus.OPEN).run { changeRequestRepository.save(this) }
             if (conceptToUpdate.id != dbConcept?.id) {
-                conceptSearchRepository.delete(conceptToUpdate)
                 if (conceptToUpdate.id == conceptToUpdate.originaltBegrep) {
                     currentConceptRepository.delete(CurrentConcept(conceptToUpdate))
                 }

src/main/kotlin/no/fdk/concept_catalog/service/ConceptSearchService.kt

@@ -17,13 +17,6 @@ class ConceptSearchService(
     private val elasticsearchOperations: ElasticsearchOperations
 ) {
 
-    fun searchConcepts(orgNumber: String, search: SearchOperation): SearchHits<BegrepDBO> =
-        elasticsearchOperations.search(
-            search.toElasticQuery(orgNumber),
-            BegrepDBO::class.java,
-            IndexCoordinates.of("concepts")
-        )
-
     fun searchCurrentConcepts(orgNumber: String, search: SearchOperation): SearchHits<CurrentConcept> =
         elasticsearchOperations.search(
             search.toElasticQuery(orgNumber),
@@ -76,12 +69,7 @@ class ConceptSearchService(
 
     private fun QueryFields.paths(): List<String> =
         listOf(
-            // Boosting hits in anbefaltTerm
-            if (anbefaltTerm) listOf(
-                "anbefaltTerm.navn.nb^10",
-                "anbefaltTerm.navn.en^5",
-                "anbefaltTerm.navn.nn^5"
-            )
+            if (anbefaltTerm) languagePaths("anbefaltTerm.navn")
             else emptyList(),
 
             if (frarådetTerm) languagePaths("frarådetTerm")
@@ -98,6 +86,6 @@ class ConceptSearchService(
         ).flatten()
 
     private fun languagePaths(basePath: String): List<String> =
-        listOf("$basePath.nb", "$basePath.en", "$basePath.nn")
+        listOf("$basePath.nb")
 
 }

src/main/kotlin/no/fdk/concept_catalog/service/ConceptService.kt

@@ -2,7 +2,6 @@ package no.fdk.concept_catalog.service
 
 import com.fasterxml.jackson.databind.ObjectMapper
 import no.fdk.concept_catalog.configuration.ApplicationProperties
-import no.fdk.concept_catalog.elastic.ConceptSearchRepository
 import no.fdk.concept_catalog.elastic.CurrentConceptRepository
 import no.fdk.concept_catalog.model.*
 import no.fdk.concept_catalog.repository.ConceptRepository
@@ -27,7 +26,6 @@ private val logger = LoggerFactory.getLogger(ConceptService::class.java)
 class ConceptService(
     private val conceptRepository: ConceptRepository,
     private val conceptSearchService: ConceptSearchService,
-    private val conceptSearchRepository: ConceptSearchRepository,
     private val currentConceptRepository: CurrentConceptRepository,
     private val mongoOperations: MongoOperations,
     private val applicationProperties: ApplicationProperties,
@@ -37,7 +35,6 @@ class ConceptService(
 ) {
 
     fun deleteConcept(concept: BegrepDBO) {
-        conceptSearchRepository.delete(concept)
         if (concept.id == concept.originaltBegrep) {
             currentConceptRepository.delete(CurrentConcept(concept))
         }
@@ -168,7 +165,6 @@ class ConceptService(
     ): List<Begrep> {
         val locations = conceptsAndOperations.map { historyService.updateHistory(it.key, it.value, user, jwt) }
         try {
-            conceptSearchRepository.saveAll(conceptsAndOperations.keys)
             conceptsAndOperations.keys
                 .filter { it.id == it.originaltBegrep }
                 .map { CurrentConcept(it) }
@@ -219,25 +215,17 @@ class ConceptService(
             .distinctBy {concept -> concept.originaltBegrep }
             .map { it.toDTO(it.versjonsnr, it.id, findIdOfUnpublishedRevision(it)) }
 
-    fun searchConcepts(orgNumber: String, search: SearchOperation): Paginated =
-        if (search.filters.onlyCurrentVersions) {
-            val hits = conceptSearchService.searchCurrentConcepts(orgNumber, search)
+    fun searchConcepts(orgNumber: String, search: SearchOperation): Paginated {
+        val hits = conceptSearchService.searchCurrentConcepts(orgNumber, search)
 
-            hits.map { it.content }
-                .map { it.toDBO() }
-                .map { it.withHighestVersionDTO() }
-                .toList()
-                .paginate(hits.totalHits, search.pagination)
-        } else {
-            val hits = conceptSearchService.searchConcepts(orgNumber, search)
-
-            hits.map { it.content }
-                .map { it.withHighestVersionDTO() }
-                .toList()
-                .paginate(hits.totalHits, search.pagination)
-        }
+        return hits.map { it.content }
+            .map { it.toDBO() }
+            .map { it.withHighestVersionDTO() }
+            .toList()
+            .asPaginatedWrapDTO(hits.totalHits, search.pagination)
+    }
 
-    private fun List<Begrep>.paginate(totalHits: Long, pagination: Pagination): Paginated {
+    private fun List<Begrep>.asPaginatedWrapDTO(totalHits: Long, pagination: Pagination): Paginated {
         return Paginated(
             hits = this,
             page = PageMeta(
@@ -297,7 +285,6 @@ class ConceptService(
 
         conceptPublisher.send(concept.ansvarligVirksomhet.id)
 
-        conceptSearchRepository.save(published)
         currentConceptRepository.save(CurrentConcept(published))
         return conceptRepository.save(published)
             .withHighestVersionDTO()

src/test/kotlin/no/fdk/concept_catalog/contract/SearchConcepts.kt

@@ -415,14 +415,14 @@ class SearchConcepts : ApiTestContext() {
     fun `Query returns correct results when searching in merknad`() {
         val rsp = authorizedRequest(
             "/begreper/search?orgNummer=123456789",
-            port, mapper.writeValueAsString(SearchOperation("merknad")), JwtToken(Access.ORG_WRITE).toString(),
+            port, mapper.writeValueAsString(SearchOperation("asdf")), JwtToken(Access.ORG_WRITE).toString(),
             HttpMethod.POST
         )
 
         assertEquals(HttpStatus.OK.value(), rsp["status"])
 
         val result: Paginated = mapper.readValue(rsp["body"] as String)
-        assertEquals(listOf(BEGREP_0), result.hits)
+        assertEquals(listOf(BEGREP_1), result.hits)
 
     }
 
@@ -478,27 +478,6 @@ class SearchConcepts : ApiTestContext() {
         assertEquals(listOf(BEGREP_0), result.hits)
     }
 
-    @Test
-    fun `Query with false value for current version filter returns correct results`() {
-        val rsp = authorizedRequest(
-            "/begreper/search?orgNummer=123456789",
-            port,
-            mapper.writeValueAsString(
-                SearchOperation(
-                    "definisjon",
-                    filters = SearchFilters(onlyCurrentVersions = false)
-                )
-            ),
-            JwtToken(Access.ORG_WRITE).toString(),
-            HttpMethod.POST
-        )
-
-        assertEquals(HttpStatus.OK.value(), rsp["status"])
-
-        val result: Paginated = mapper.readValue(rsp["body"] as String)
-        assertEquals(listOf(BEGREP_0, BEGREP_0_OLD), result.hits)
-    }
-
     @Test
     fun `Query returns no results`() {
         val rsp = authorizedRequest(
@@ -578,7 +557,6 @@ class SearchConcepts : ApiTestContext() {
     fun `Query returns sorted results ordered by sistEndret ascending`() {
         val searchOp = SearchOperation(
             query = "",
-            filters = SearchFilters(onlyCurrentVersions = false),
             sort = SortField(field = SortFieldEnum.SIST_ENDRET, direction = SortDirection.ASC)
         )
         val rsp = authorizedRequest(
@@ -590,14 +568,13 @@ class SearchConcepts : ApiTestContext() {
         assertEquals(HttpStatus.OK.value(), rsp["status"])
 
         val result: Paginated = mapper.readValue(rsp["body"] as String)
-        assertEquals(listOf(BEGREP_0_OLD, BEGREP_2, BEGREP_0, BEGREP_1), result.hits)
+        assertEquals(listOf(BEGREP_2, BEGREP_0, BEGREP_1), result.hits)
     }
 
     @Test
     fun `Query returns sorted results ordered by anbefaltTerm descending`() {
         val searchOp = SearchOperation(
             query = "",
-            filters = SearchFilters(onlyCurrentVersions = false),
             sort = SortField(field = SortFieldEnum.ANBEFALT_TERM_NB, direction = SortDirection.DESC)
         )
         val rsp = authorizedRequest(
@@ -608,7 +585,7 @@ class SearchConcepts : ApiTestContext() {
         assertEquals(HttpStatus.OK.value(), rsp["status"])
 
         val result: Paginated = mapper.readValue(rsp["body"] as String)
-        assertEquals(listOf(BEGREP_0_OLD, BEGREP_0, BEGREP_2, BEGREP_1), result.hits)
+        assertEquals(listOf(BEGREP_0, BEGREP_2, BEGREP_1), result.hits)
     }
 
     @Test