Skip to content
Draft
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Original file line number Diff line number Diff line change
Expand Up @@ -22,6 +22,7 @@ object LearningResourceType extends Enum[LearningResourceType] with CirceEnum[Le
case object Article extends LearningResourceType("standard")
case object TopicArticle extends LearningResourceType("topic-article")
case object FrontpageArticle extends LearningResourceType("frontpage-article")
case object CaseArticle extends LearningResourceType("case-article")
case object LearningPath extends LearningResourceType("learningpath")
case object Concept extends LearningResourceType("concept")
case object Gloss extends LearningResourceType("gloss")
Expand All @@ -37,6 +38,7 @@ object LearningResourceType extends Enum[LearningResourceType] with CirceEnum[Le
case ArticleType.Standard => Article
case ArticleType.TopicArticle => TopicArticle
case ArticleType.FrontpageArticle => FrontpageArticle
case ArticleType.CaseArticle => CaseArticle
}
}

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -20,6 +20,7 @@ object ArticleType extends Enum[ArticleType] with CirceEnum[ArticleType] {
case object Standard extends ArticleType("standard")
case object TopicArticle extends ArticleType("topic-article")
case object FrontpageArticle extends ArticleType("frontpage-article")
case object CaseArticle extends ArticleType("case-article")

implicit def schema: Schema[ArticleType] = schemaForEnumEntry[ArticleType]
implicit def codec: PlainCodec[ArticleType] = plainCodecEnumEntry[ArticleType]
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -29,6 +29,7 @@ object ResourceType extends Enum[ResourceType] with CirceEnum[ResourceType] {
case object Image extends ResourceType("image")
case object Learningpath extends ResourceType("learningpath")
case object Multidisciplinary extends ResourceType("multidisciplinary")
case object Case extends ResourceType("case")
case object Topic extends ResourceType("topic")
case object Video extends ResourceType("video")
}
Original file line number Diff line number Diff line change
Expand Up @@ -80,7 +80,10 @@ class DraftRepository(using draftErrorHelpers: DraftErrorHelpers, clock: Clock)
if (keepDraftData) article.priority
else Priority.Unspecified,
comments =
if (keepDraftData | article.articleType == ArticleType.TopicArticle) article.comments
if (
keepDraftData | article.articleType == ArticleType.TopicArticle | article.articleType == ArticleType
.CaseArticle
) article.comments
else Seq.empty,
)
dataObject = {
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -446,7 +446,7 @@ class DraftControllerTest extends UnitSuite with TestEnvironment with TapirContr
.searchSettings
.copy(
searchLanguage = "*",
articleTypes = List("standard", "topic-article", "frontpage-article"),
articleTypes = List("standard", "topic-article", "frontpage-article", "case-article"),
shouldScroll = true,
sort = Sort.ByTitleAsc,
)
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -45,7 +45,7 @@ class StatsController(using
}

private val pathResourceType = path[CommaSeparated[String]]("resourceType").description(
s"The type of the resource to look up. Comma separated list to support ${ResourceType.Multidisciplinary}. Possible values ${ResourceType.values.mkString(", ")}"
s"The type of the resource to look up. Separate with comma to search for several types simultaneously. Possible values ${ResourceType.values.mkString(", ")}"
)
private val pathResourceIds =
path[CommaSeparated[String]]("resourceIds").description("IDs of the resources to look up")
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@ import no.ndla.common.Clock
import no.ndla.common.errors.{AccessDeniedException, NotFoundException, ValidationException}
import no.ndla.common.implicits.*
import no.ndla.common.model.NDLADate
import no.ndla.common.model.domain.ResourceType
import no.ndla.common.model.domain.ResourceType.{Audio, Concept, Image, Learningpath, Video}
import no.ndla.common.model.domain.myndla.{FolderStatus, MyNDLAUser}
import no.ndla.database.DBUtility
import no.ndla.myndlaapi.integration.SearchApiClient
Expand Down Expand Up @@ -603,12 +603,10 @@ class FolderWriteService(using

private def updateSearchApi(resource: domain.Resource): Unit = {
resource.resourceType match {
case ResourceType.Multidisciplinary => searchApiClient.reindexDraft(resource.resourceId)
case ResourceType.Article => searchApiClient.reindexDraft(resource.resourceId)
case ResourceType.Topic => searchApiClient.reindexDraft(resource.resourceId)
case ResourceType.Learningpath => searchApiClient.reindexLearningpath(resource.resourceId)
case ResourceType.Concept => searchApiClient.reindexConcept(resource.resourceId)
case ResourceType.Audio | ResourceType.Image | ResourceType.Video =>
case Audio | Image | Video => ()
case Learningpath => searchApiClient.reindexLearningpath(resource.resourceId)
case Concept => searchApiClient.reindexConcept(resource.resourceId)
case _ => searchApiClient.reindexDraft(resource.resourceId)
}
}

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -156,6 +156,7 @@ class SearchConverterService(using
"about-ndla",
"om-ndla-artikkel",
)
case LearningResourceType.CaseArticle => List("case", "case-article", "tverrfaglig", "tverrfaglig case")
case LearningResourceType.LearningPath => List("learningpath", "læringssti", "sti", "læringsti")
case LearningResourceType.Concept | LearningResourceType.Gloss =>
List("concept", "forklaring", "konsept", "glose", "gloss")
Expand Down Expand Up @@ -586,6 +587,11 @@ class SearchConverterService(using
"nn" -> "Om-NDLA-artikkel",
"en" -> "About-NDLA article",
)
case ArticleType.CaseArticle => SearchableLanguageValues.from(
"nb" -> "Tverrfaglig case",
"nn" -> "Tverrfaglig case",
"en" -> "Multidisciplinary case",
)
}
}

Expand Down