diff --git a/search-api/src/main/scala/no/ndla/searchapi/model/api/MultiSearchSummary.scala b/search-api/src/main/scala/no/ndla/searchapi/model/api/MultiSearchSummary.scala index 5b6a52fa74..02fb177c71 100644 --- a/search-api/src/main/scala/no/ndla/searchapi/model/api/MultiSearchSummary.scala +++ b/search-api/src/main/scala/no/ndla/searchapi/model/api/MultiSearchSummary.scala @@ -41,6 +41,6 @@ case class MultiSearchSummary( @(ApiModelProperty @field)(description = "A list of revisions planned for the article") revisions: Seq[RevisionMeta], @(ApiModelProperty @field)(description = "Responsible field") responsible: Option[DraftResponsible], @(ApiModelProperty @field)(description = "Information about comments attached to the article") comments: Option[Seq[Comment]], - @(ApiModelProperty @field)(description ="If the article should be prioritized" ) priority: Priority + @(ApiModelProperty @field)(description ="If the article should be prioritized" ) priority: Option[Priority] ) // format: on 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 49a852d62b..bb243abb4a 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 @@ -488,7 +488,7 @@ trait SearchConverterService { revisions = Seq.empty, responsible = None, comments = None, - priority = Priority.Unspecified + priority = Some(Priority.Unspecified) ) } @@ -544,7 +544,7 @@ trait SearchConverterService { revisions = revisions, responsible = responsible, comments = Some(comments), - priority = searchableDraft.priority + priority = Some(searchableDraft.priority) ) } @@ -595,7 +595,7 @@ trait SearchConverterService { revisions = Seq.empty, responsible = None, comments = None, - priority = Priority.Unspecified + priority = Some(Priority.Unspecified) ) } 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 32b4f8d5c5..b3adb16c36 100644 --- a/search-api/src/test/scala/no/ndla/searchapi/TestData.scala +++ b/search-api/src/test/scala/no/ndla/searchapi/TestData.scala @@ -8,7 +8,21 @@ package no.ndla.searchapi import no.ndla.common.configuration.Constants.EmbedTagName -import no.ndla.common.model.domain.{ArticleContent, ArticleMetaImage, ArticleType, Author, Availability, EditorNote, Introduction, Priority, Status, Tag, Title, VisualElement, draft} +import no.ndla.common.model.domain.{ + ArticleContent, + ArticleMetaImage, + ArticleType, + Author, + Availability, + EditorNote, + Introduction, + Priority, + Status, + Tag, + Title, + VisualElement, + draft +} import no.ndla.common.model.domain.article.{Article, Copyright} import no.ndla.common.model.domain.draft.{Draft, DraftCopyright, DraftStatus} import no.ndla.common.model.domain.learningpath.LearningpathCopyright @@ -1596,7 +1610,7 @@ object TestData { responsibleIdFilter = List.empty, articleTypes = List.empty, filterInactive = false, - priority = Priority.Unspecified, + priority = List.empty ) val searchableResourceTypes: List[SearchableTaxonomyResourceType] = List( diff --git a/search-api/src/test/scala/no/ndla/searchapi/service/search/MultiDraftSearchServiceAtomicTest.scala b/search-api/src/test/scala/no/ndla/searchapi/service/search/MultiDraftSearchServiceAtomicTest.scala index 62c3816727..e8cb1aec4d 100644 --- a/search-api/src/test/scala/no/ndla/searchapi/service/search/MultiDraftSearchServiceAtomicTest.scala +++ b/search-api/src/test/scala/no/ndla/searchapi/service/search/MultiDraftSearchServiceAtomicTest.scala @@ -797,7 +797,7 @@ class MultiDraftSearchServiceAtomicTest id = Some(4) ) val draft5 = TestData.draft1.copy( - id = Some(4), + id = Some(5), priority = Priority.OnHold ) draftIndexService.indexDocument(draft1, Some(taxonomyTestBundle), Some(grepBundle)).get @@ -836,6 +836,16 @@ class MultiDraftSearchServiceAtomicTest .get .results .map(_.id) should be(Seq(5)) + + multiDraftSearchService + .matchingQuery( + multiDraftSearchSettings.copy( + priority = List.empty + ) + ) + .get + .results + .map(_.id) should be(Seq(1, 2, 3, 4, 5)) } test("That search on embed id supports video embed with timestamp resources") {