Update priority type in MultiSearchSummary. Generate TS for search-api.

NDLANO · Nov 13, 2023 · f6d6241 · f6d6241
1 parent cdf9e04
commit f6d6241
Show file tree

Hide file tree

Showing 3 changed files with 4 additions and 19 deletions.
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
@@ -9,7 +9,6 @@ package no.ndla.searchapi.model.api
 
 import no.ndla.common.model.NDLADate
 import no.ndla.common.model.api.draft.Comment
-import no.ndla.common.model.domain.Priority
 import org.scalatra.swagger.annotations.{ApiModel, ApiModelProperty}
 
 import scala.annotation.meta.field
@@ -41,7 +40,7 @@ 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" ) prioritized: Option[Boolean],
-    @(ApiModelProperty @field)(description ="If the article should be prioritized" ) priority: Option[Priority]
+    @(ApiModelProperty @field)(description = "If the article should be prioritized" ) prioritized: Option[Boolean],
+    @(ApiModelProperty @field)(description = "If the article should be prioritized. Possible values are prioritized, on-hold, unspecified") priority: Option[String]
 )
 // 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
@@ -545,7 +545,7 @@ trait SearchConverterService {
         revisions = revisions,
         responsible = responsible,
         comments = Some(comments),
-        priority = Some(searchableDraft.priority),
+        priority = Some(searchableDraft.priority.entryName),
         prioritized = Some(searchableDraft.priority == Priority.Prioritized)
       )
     }

diff --git a/typescript/search-api.ts b/typescript/search-api.ts
@@ -177,7 +177,7 @@ export interface IMultiSearchSummary {
   responsible?: IDraftResponsible
   comments?: IComment[]
   prioritized?: boolean
-  priority?: Priority
+  priority?: string
 }
 
 export interface IMultiSearchTermsAggregation {
@@ -187,14 +187,6 @@ export interface IMultiSearchTermsAggregation {
   values: ITermValue[]
 }
 
-export interface IOnHold {
-  type: "OnHold"
-}
-
-export interface IPrioritized {
-  type: "Prioritized"
-}
-
 export interface IRevisionMeta {
   revisionDate: string
   note: string
@@ -239,10 +231,6 @@ export interface ITitle {
   language: string
 }
 
-export interface IUnspecified {
-  type: "Unspecified"
-}
-
 export interface IValidationError {
   code: string
   description: string
@@ -254,5 +242,3 @@ export interface IValidationMessage {
   field: string
   message: string
 }
-
-export type Priority = (IOnHold | IPrioritized | IUnspecified)