From f5ad6b7bda0b72b0759e17eab42be19c4060680a Mon Sep 17 00:00:00 2001 From: Gunnar Velle Date: Fri, 12 Apr 2024 09:19:02 +0200 Subject: [PATCH] Add resourcetype list to swaggerdoc --- .../no/ndla/common/model/domain/ResourceType.scala | 4 +++- .../ndla/myndlaapi/controller/StatsController.scala | 11 ++++++++--- 2 files changed, 11 insertions(+), 4 deletions(-) diff --git a/common/src/main/scala/no/ndla/common/model/domain/ResourceType.scala b/common/src/main/scala/no/ndla/common/model/domain/ResourceType.scala index 538b4d6a7a..79d2d0d5eb 100644 --- a/common/src/main/scala/no/ndla/common/model/domain/ResourceType.scala +++ b/common/src/main/scala/no/ndla/common/model/domain/ResourceType.scala @@ -11,7 +11,9 @@ import com.scalatsi.TypescriptType.{TSLiteralString, TSUnion} import com.scalatsi.{TSNamedType, TSType} import enumeratum.* -sealed abstract class ResourceType(override val entryName: String) extends EnumEntry {} +sealed abstract class ResourceType(override val entryName: String) extends EnumEntry { + override def toString: String = entryName +} object ResourceType extends Enum[ResourceType] with CirceEnum[ResourceType] { override val values: IndexedSeq[ResourceType] = findValues diff --git a/myndla-api/src/main/scala/no/ndla/myndlaapi/controller/StatsController.scala b/myndla-api/src/main/scala/no/ndla/myndlaapi/controller/StatsController.scala index 0d8cd3fec8..df443df69b 100644 --- a/myndla-api/src/main/scala/no/ndla/myndlaapi/controller/StatsController.scala +++ b/myndla-api/src/main/scala/no/ndla/myndlaapi/controller/StatsController.scala @@ -9,6 +9,7 @@ package no.ndla.myndlaapi.controller import no.ndla.common.errors.NotFoundException import no.ndla.common.model.api.SingleResourceStats +import no.ndla.common.model.domain.ResourceType import no.ndla.myndlaapi.Eff import no.ndla.myndlaapi.model.api.Stats import no.ndla.myndlaapi.service.FolderReadService @@ -17,8 +18,8 @@ import no.ndla.network.tapir.{Service, TapirErrorHelpers} import no.ndla.network.tapir.TapirErrors.errorOutputsFor import sttp.tapir.EndpointInput import sttp.tapir.server.ServerEndpoint -import sttp.tapir._ -import sttp.tapir.generic.auto._ +import sttp.tapir.* +import sttp.tapir.generic.auto.* import sttp.tapir.model.CommaSeparated trait StatsController { @@ -39,7 +40,11 @@ trait StatsController { } } private val pathResourceType = - path[CommaSeparated[String]]("resourceType").description("The type of the resource to look up") + 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(", ")}" + ) private val pathResourceIds = path[CommaSeparated[String]]("resourceIds").description("IDs of the resources to look up")