image-api: Stop using dynamic mapping

Even though the problems with dynamic mappings are most prevalent in search-api.
I see no reason to keep using it in all places when search-api does not.

Author: jnatten

image-api/src/main/scala/no/ndla/imageapi/ComponentRegistry.scala

@@ -29,7 +29,7 @@ import no.ndla.imageapi.service.search.{
 }
 import no.ndla.network.NdlaClient
 import no.ndla.network.tapir.TapirApplication
-import no.ndla.search.{BaseIndexService, Elastic4sClient}
+import no.ndla.search.{BaseIndexService, Elastic4sClient, SearchLanguage}
 
 class ComponentRegistry(properties: ImageApiProperties)
     extends BaseComponentRegistry[ImageApiProperties]
@@ -41,6 +41,7 @@ class ComponentRegistry(properties: ImageApiProperties)
     with ImageIndexService
     with SearchService
     with ImageSearchService
+    with SearchLanguage
     with TagSearchService
     with SearchConverterService
     with DataSource

image-api/src/main/scala/no/ndla/imageapi/service/search/ImageIndexService.scala

@@ -12,16 +12,16 @@ import com.sksamuel.elastic4s.ElasticDsl.*
 import com.sksamuel.elastic4s.fields.{ElasticField, ObjectField}
 import com.sksamuel.elastic4s.requests.indexes.IndexRequest
 import com.sksamuel.elastic4s.requests.mappings.MappingDefinition
-import com.sksamuel.elastic4s.requests.mappings.dynamictemplate.DynamicTemplateRequest
 import com.typesafe.scalalogging.StrictLogging
 import no.ndla.common.CirceUtil
 import no.ndla.imageapi.Props
 import no.ndla.imageapi.model.domain.ImageMetaInformation
 import no.ndla.imageapi.model.search.SearchableImage
 import no.ndla.imageapi.repository.{ImageRepository, Repository}
+import no.ndla.search.SearchLanguage
 
 trait ImageIndexService {
-  this: SearchConverterService with IndexService with ImageRepository with Props =>
+  this: SearchConverterService & IndexService & ImageRepository & Props & SearchLanguage =>
   val imageIndexService: ImageIndexService
 
   class ImageIndexService extends StrictLogging with IndexService[ImageMetaInformation, SearchableImage] {
@@ -36,6 +36,23 @@ trait ImageIndexService {
       Seq(indexInto(indexName).doc(source).id(domainModel.id.get.toString))
     }
 
+    protected def generateLanguageSupportedFieldList(fieldName: String, keepRaw: Boolean = false): Seq[ElasticField] = {
+      if (keepRaw) {
+        SearchLanguage.languageAnalyzers.map(langAnalyzer =>
+          textField(s"$fieldName.${langAnalyzer.languageTag.toString}")
+            .fielddata(false)
+            .analyzer(langAnalyzer.analyzer)
+            .fields(keywordField("raw"))
+        )
+      } else {
+        SearchLanguage.languageAnalyzers.map(langAnalyzer =>
+          textField(s"$fieldName.${langAnalyzer.languageTag.toString}")
+            .fielddata(false)
+            .analyzer(langAnalyzer.analyzer)
+        )
+      }
+    }
+
     def getMapping: MappingDefinition = {
       val fields: Seq[ElasticField] = List(
         ObjectField("domainObject", enabled = Some(false)),
@@ -60,12 +77,12 @@ trait ImageIndexService {
         )
       )
 
-      val dynamics: Seq[DynamicTemplateRequest] = generateLanguageSupportedDynamicTemplates("titles", keepRaw = true) ++
-        generateLanguageSupportedDynamicTemplates("alttexts", keepRaw = false) ++
-        generateLanguageSupportedDynamicTemplates("captions", keepRaw = false) ++
-        generateLanguageSupportedDynamicTemplates("tags", keepRaw = false)
+      val dynamics = generateLanguageSupportedFieldList("titles", keepRaw = true) ++
+        generateLanguageSupportedFieldList("alttexts") ++
+        generateLanguageSupportedFieldList("captions") ++
+        generateLanguageSupportedFieldList("tags")
 
-      properties(fields).dynamicTemplates(dynamics)
+      properties(fields ++ dynamics)
     }
   }
 

image-api/src/main/scala/no/ndla/imageapi/service/search/IndexService.scala

@@ -9,18 +9,13 @@
 package no.ndla.imageapi.service.search
 
 import cats.implicits.*
-import com.sksamuel.elastic4s.ElasticDsl.*
-import com.sksamuel.elastic4s.fields.ElasticField
 import com.sksamuel.elastic4s.requests.indexes.IndexRequest
-import com.sksamuel.elastic4s.requests.mappings.dynamictemplate.DynamicTemplateRequest
 import com.typesafe.scalalogging.StrictLogging
 import no.ndla.imageapi.Props
 import no.ndla.imageapi.repository.{ImageRepository, Repository}
-import no.ndla.search.SearchLanguage.languageAnalyzers
 import no.ndla.search.model.domain.{BulkIndexResult, ReindexResult}
-import no.ndla.search.{BaseIndexService, Elastic4sClient, SearchLanguage}
+import no.ndla.search.{BaseIndexService, Elastic4sClient}
 
-import scala.collection.mutable.ListBuffer
 import scala.util.{Failure, Success, Try}
 
 trait IndexService {
@@ -82,41 +77,5 @@ trait IndexService {
         }
       }
     }
-
-    /** Returns Sequence of DynamicTemplateRequest for a given field.
-      *
-      * @param fieldName
-      *   Name of field in mapping.
-      * @param keepRaw
-      *   Whether to add a keywordField named raw. Usually used for sorting, aggregations or scripts.
-      * @return
-      *   Sequence of DynamicTemplateRequest for a field.
-      */
-    protected def generateLanguageSupportedDynamicTemplates(
-        fieldName: String,
-        keepRaw: Boolean = false
-    ): Seq[DynamicTemplateRequest] = {
-      val fields = new ListBuffer[ElasticField]()
-      if (keepRaw) {
-        fields += keywordField("raw")
-      }
-      val languageTemplates = languageAnalyzers.map(languageAnalyzer => {
-        val name = s"$fieldName.${languageAnalyzer.languageTag.toString()}"
-        DynamicTemplateRequest(
-          name = name,
-          mapping = textField(name).analyzer(languageAnalyzer.analyzer).fields(fields.toList),
-          matchMappingType = Some("string"),
-          pathMatch = Some(name)
-        )
-      })
-      val catchAlltemplate = DynamicTemplateRequest(
-        name = fieldName,
-        mapping = textField(fieldName).analyzer(SearchLanguage.standardAnalyzer).fields(fields.toList),
-        matchMappingType = Some("string"),
-        pathMatch = Some(s"$fieldName.*")
-      )
-      languageTemplates ++ Seq(catchAlltemplate)
-    }
-
   }
 }

image-api/src/main/scala/no/ndla/imageapi/service/search/SearchConverterService.scala

@@ -30,7 +30,7 @@ import no.ndla.network.tapir.auth.TokenUser
 import scala.util.{Failure, Success, Try}
 
 trait SearchConverterService {
-  this: ConverterService with Props =>
+  this: ConverterService & Props & SearchLanguage =>
   val searchConverterService: SearchConverterService
 
   class SearchConverterService extends StrictLogging {

image-api/src/test/scala/no/ndla/imageapi/TestEnvironment.scala

@@ -34,7 +34,7 @@ import no.ndla.imageapi.service.search.{
 }
 import no.ndla.network.NdlaClient
 import no.ndla.network.tapir.TapirApplication
-import no.ndla.search.{BaseIndexService, Elastic4sClient}
+import no.ndla.search.{BaseIndexService, Elastic4sClient, SearchLanguage}
 import org.scalatestplus.mockito.MockitoSugar
 
 trait TestEnvironment
@@ -47,6 +47,7 @@ trait TestEnvironment
     with ImageSearchService
     with TagSearchService
     with SearchConverterService
+    with SearchLanguage
     with DataSource
     with ConverterService
     with ValidationService