diff --git a/search-api/src/main/scala/no/ndla/searchapi/model/search/SearchableArticle.scala b/search-api/src/main/scala/no/ndla/searchapi/model/search/SearchableArticle.scala index 1b8edea2e..ae002f253 100644 --- a/search-api/src/main/scala/no/ndla/searchapi/model/search/SearchableArticle.scala +++ b/search-api/src/main/scala/no/ndla/searchapi/model/search/SearchableArticle.scala @@ -21,7 +21,6 @@ case class SearchableArticle( id: Long, title: SearchableLanguageValues, content: SearchableLanguageValues, - visualElement: SearchableLanguageValues, introduction: SearchableLanguageValues, metaDescription: SearchableLanguageValues, tags: SearchableLanguageList, diff --git a/search-api/src/main/scala/no/ndla/searchapi/model/search/SearchableDraft.scala b/search-api/src/main/scala/no/ndla/searchapi/model/search/SearchableDraft.scala index fe5adb8f7..3c3acb4fc 100644 --- a/search-api/src/main/scala/no/ndla/searchapi/model/search/SearchableDraft.scala +++ b/search-api/src/main/scala/no/ndla/searchapi/model/search/SearchableDraft.scala @@ -21,7 +21,6 @@ case class SearchableDraft( id: Long, title: SearchableLanguageValues, content: SearchableLanguageValues, - visualElement: SearchableLanguageValues, introduction: SearchableLanguageValues, metaDescription: SearchableLanguageValues, tags: SearchableLanguageList, diff --git a/search-api/src/main/scala/no/ndla/searchapi/service/search/ArticleIndexService.scala b/search-api/src/main/scala/no/ndla/searchapi/service/search/ArticleIndexService.scala index eeefd23d7..77867a602 100644 --- a/search-api/src/main/scala/no/ndla/searchapi/service/search/ArticleIndexService.scala +++ b/search-api/src/main/scala/no/ndla/searchapi/service/search/ArticleIndexService.scala @@ -77,7 +77,6 @@ trait ArticleIndexService { languageValuesMapping("title", keepRaw = true) ++ languageValuesMapping("metaDescription") ++ languageValuesMapping("content") ++ - languageValuesMapping("visualElement") ++ languageValuesMapping("introduction") ++ languageValuesMapping("tags") ++ languageValuesMapping("embedAttributes") ++ diff --git a/search-api/src/main/scala/no/ndla/searchapi/service/search/DraftIndexService.scala b/search-api/src/main/scala/no/ndla/searchapi/service/search/DraftIndexService.scala index 93ab2055f..e33349c75 100644 --- a/search-api/src/main/scala/no/ndla/searchapi/service/search/DraftIndexService.scala +++ b/search-api/src/main/scala/no/ndla/searchapi/service/search/DraftIndexService.scala @@ -103,7 +103,6 @@ trait DraftIndexService { languageValuesMapping("title", keepRaw = true) ++ languageValuesMapping("metaDescription") ++ languageValuesMapping("content") ++ - languageValuesMapping("visualElement") ++ languageValuesMapping("introduction") ++ languageValuesMapping("tags") ++ languageValuesMapping("embedAttributes") ++ diff --git a/search-api/src/main/scala/no/ndla/searchapi/service/search/SearchConverterService.scala b/search-api/src/main/scala/no/ndla/searchapi/service/search/SearchConverterService.scala index dbd9dfdbe..3458643fc 100644 --- a/search-api/src/main/scala/no/ndla/searchapi/service/search/SearchConverterService.scala +++ b/search-api/src/main/scala/no/ndla/searchapi/service/search/SearchConverterService.scala @@ -273,9 +273,6 @@ trait SearchConverterService { content = model.SearchableLanguageValues( ai.content.map(article => LanguageValue(article.language, toPlaintext(article.content))) ), - visualElement = model.SearchableLanguageValues( - ai.visualElement.map(visual => LanguageValue(visual.language, visual.resource)) - ), introduction = model.SearchableLanguageValues( ai.introduction.map(intro => LanguageValue(intro.language, toPlaintext(intro.introduction))) ), @@ -534,7 +531,6 @@ trait SearchConverterService { val title = model.SearchableLanguageValues.fromFieldsMap(draft.title, toPlaintext) val content = model.SearchableLanguageValues.fromFieldsMap(draft.content, toPlaintext) - val visualElement = model.SearchableLanguageValues.fromFields(draft.visualElement) val introduction = model.SearchableLanguageValues.fromFieldsMap(draft.introduction, toPlaintext) val metaDescription = model.SearchableLanguageValues.fromFields(draft.metaDescription) val contexts = asSearchableTaxonomyContexts(taxonomyContexts) @@ -544,7 +540,6 @@ trait SearchConverterService { id = draft.id.get, title = title, content = content, - visualElement = visualElement, introduction = introduction, metaDescription = metaDescription, tags = SearchableLanguageList(draft.tags.map(tag => LanguageValue(tag.language, tag.tags))), @@ -705,7 +700,7 @@ trait SearchConverterService { val metaDescriptions = searchableArticle.metaDescription.languageValues.map(lv => MetaDescriptionDTO(lv.value, lv.language)) val visualElements = - searchableArticle.visualElement.languageValues.map(lv => api.article.VisualElementDTO(lv.value, lv.language)) + searchableArticle.domainObject.visualElement.map(lv => api.article.VisualElementDTO(lv.value, lv.language)) val metaImages = searchableArticle.metaImage.map(image => { val metaImageUrl = s"${props.ExternalApiUrls("raw-image")}/${image.imageId}" MetaImageDTO(metaImageUrl, image.altText, image.language) @@ -783,7 +778,7 @@ trait SearchConverterService { common.model.api.search.MetaDescriptionDTO(lv.value, lv.language) ) val visualElements = - searchableDraft.visualElement.languageValues.map(lv => api.article.VisualElementDTO(lv.value, lv.language)) + searchableDraft.domainObject.visualElement.map(lv => api.article.VisualElementDTO(lv.value, lv.language)) val metaImages = searchableDraft.domainObject.metaImage.map(image => { val metaImageUrl = s"${props.ExternalApiUrls("raw-image")}/${image.imageId}" common.model.api.search.MetaImageDTO(metaImageUrl, image.altText, image.language) diff --git a/search-api/src/test/scala/no/ndla/searchapi/TestData.scala b/search-api/src/test/scala/no/ndla/searchapi/TestData.scala index 564836383..41baec757 100644 --- a/search-api/src/test/scala/no/ndla/searchapi/TestData.scala +++ b/search-api/src/test/scala/no/ndla/searchapi/TestData.scala @@ -1863,7 +1863,6 @@ object TestData { id = 100, title = searchableTitles, content = searchableContents, - visualElement = searchableVisualElements, introduction = searchableIntroductions, metaDescription = searchableMetaDescriptions, tags = searchableTags, diff --git a/search-api/src/test/scala/no/ndla/searchapi/model/search/SearchableArticleTest.scala b/search-api/src/test/scala/no/ndla/searchapi/model/search/SearchableArticleTest.scala index 590b1d5a8..87989a484 100644 --- a/search-api/src/test/scala/no/ndla/searchapi/model/search/SearchableArticleTest.scala +++ b/search-api/src/test/scala/no/ndla/searchapi/model/search/SearchableArticleTest.scala @@ -31,8 +31,6 @@ class SearchableArticleTest extends UnitSuite with TestEnvironment { ) ) - val visualElements = SearchableLanguageValues(Seq(LanguageValue("nn", "image"), LanguageValue("nb", "image"))) - val introductions = SearchableLanguageValues( Seq( LanguageValue("en", "Wroom wroom") @@ -67,7 +65,6 @@ class SearchableArticleTest extends UnitSuite with TestEnvironment { id = 100, title = titles, content = contents, - visualElement = visualElements, introduction = introductions, metaDescription = metaDescriptions, tags = tags, @@ -110,8 +107,6 @@ class SearchableArticleTest extends UnitSuite with TestEnvironment { ) ) - val visualElements = SearchableLanguageValues(Seq(LanguageValue("nn", "image"), LanguageValue("nb", "image"))) - val introductions = SearchableLanguageValues( Seq( LanguageValue("en", "Wroom wroom") @@ -146,7 +141,6 @@ class SearchableArticleTest extends UnitSuite with TestEnvironment { id = 100, title = titles, content = contents, - visualElement = visualElements, introduction = introductions, metaDescription = metaDescriptions, tags = tags, diff --git a/search-api/src/test/scala/no/ndla/searchapi/model/search/SearchableDraftTest.scala b/search-api/src/test/scala/no/ndla/searchapi/model/search/SearchableDraftTest.scala index 81f00012c..6853b9c3d 100644 --- a/search-api/src/test/scala/no/ndla/searchapi/model/search/SearchableDraftTest.scala +++ b/search-api/src/test/scala/no/ndla/searchapi/model/search/SearchableDraftTest.scala @@ -35,8 +35,6 @@ class SearchableDraftTest extends UnitSuite with TestEnvironment { ) ) - val visualElements = SearchableLanguageValues(Seq(LanguageValue("nn", "image"), LanguageValue("nb", "image"))) - val introductions = SearchableLanguageValues( Seq( LanguageValue("en", "Wroom wroom") @@ -87,7 +85,6 @@ class SearchableDraftTest extends UnitSuite with TestEnvironment { id = 100, title = titles, content = contents, - visualElement = visualElements, introduction = introductions, metaDescription = metaDescriptions, tags = tags,