From a17dc6aa77eef910421feb7b35989dd69d50c6d4 Mon Sep 17 00:00:00 2001 From: Jonas Natten Date: Wed, 6 Dec 2023 06:58:00 +0100 Subject: [PATCH] hm --- .../controller/NdlaController.scala | 2 +- .../model/domain/NDLAErrors.scala | 1 - .../service/ConverterService.scala | 19 ++++--------------- .../learningpathapi/service/ReadService.scala | 8 +++----- .../service/UpdateService.scala | 2 +- .../learningpathapi/e2e/CloneFolderTest.scala | 1 + .../service/ConverterServiceTest.scala | 2 +- .../service/ReadServiceTest.scala | 2 +- .../service/UpdateServiceTest.scala | 10 ++-------- 9 files changed, 14 insertions(+), 33 deletions(-) diff --git a/learningpath-api/src/main/scala/no/ndla/learningpathapi/controller/NdlaController.scala b/learningpath-api/src/main/scala/no/ndla/learningpathapi/controller/NdlaController.scala index 901e74267..c49ea4ef6 100644 --- a/learningpath-api/src/main/scala/no/ndla/learningpathapi/controller/NdlaController.scala +++ b/learningpath-api/src/main/scala/no/ndla/learningpathapi/controller/NdlaController.scala @@ -9,7 +9,7 @@ package no.ndla.learningpathapi.controller import cats.implicits._ -import no.ndla.common.errors.{AccessDeniedException, ValidationException} +import no.ndla.common.errors.{AccessDeniedException, NotFoundException, ValidationException} import no.ndla.learningpathapi.integration.DataSource import no.ndla.learningpathapi.model.api.{Error, ErrorHelpers, ValidationError} import no.ndla.learningpathapi.model.domain._ diff --git a/learningpath-api/src/main/scala/no/ndla/learningpathapi/model/domain/NDLAErrors.scala b/learningpath-api/src/main/scala/no/ndla/learningpathapi/model/domain/NDLAErrors.scala index 1061c6176..d928caa91 100644 --- a/learningpath-api/src/main/scala/no/ndla/learningpathapi/model/domain/NDLAErrors.scala +++ b/learningpath-api/src/main/scala/no/ndla/learningpathapi/model/domain/NDLAErrors.scala @@ -15,7 +15,6 @@ case class ElasticIndexingException(message: String) extends RuntimeExcepti class ResultWindowTooLargeException(message: String) extends RuntimeException(message) case class LanguageNotSupportedException(message: String) extends RuntimeException(message) case class SearchException(message: String) extends RuntimeException(message) -case class NotFoundException(message: String) extends RuntimeException(message) case class TaxonomyUpdateException(message: String) extends RuntimeException(message) case class InvalidOembedResponse(message: String) extends RuntimeException(message) case class MissingIdException(message: String) extends RuntimeException(message) diff --git a/learningpath-api/src/main/scala/no/ndla/learningpathapi/service/ConverterService.scala b/learningpath-api/src/main/scala/no/ndla/learningpathapi/service/ConverterService.scala index 63ccd0cdb..210200ff9 100644 --- a/learningpath-api/src/main/scala/no/ndla/learningpathapi/service/ConverterService.scala +++ b/learningpath-api/src/main/scala/no/ndla/learningpathapi/service/ConverterService.scala @@ -10,12 +10,12 @@ package no.ndla.learningpathapi.service import cats.implicits._ import io.lemonlabs.uri.typesafe.dsl._ -import no.ndla.common.{Clock, errors, model} -import no.ndla.common.errors.ValidationException +import no.ndla.common.errors.NotFoundException import no.ndla.common.model.domain.learningpath import no.ndla.common.model.domain.learningpath.{EmbedType, EmbedUrl} import no.ndla.common.model.{api => commonApi, domain => common} -import no.ndla.language.Language.{AllLanguages, UnknownLanguage, findByLanguageOrBestEffort, getSearchLanguage, mergeLanguageFields} +import no.ndla.common.{Clock, errors} +import no.ndla.language.Language._ import no.ndla.learningpathapi.Props import no.ndla.learningpathapi.integration._ import no.ndla.learningpathapi.model.api.{LearningPathStatus => _, _} @@ -26,14 +26,10 @@ import no.ndla.learningpathapi.repository.LearningPathRepositoryComponent import no.ndla.learningpathapi.validation.{LanguageValidator, LearningPathValidator} import no.ndla.mapping.License.getLicense import no.ndla.myndla.model.api.config -import no.ndla.myndla.model.api.config.ConfigMetaRestricted import no.ndla.myndla.model.domain.config.ConfigMeta import no.ndla.network.ApplicationUrl -import no.ndla.network.tapir.auth.Permission.LEARNINGPATH_API_ADMIN import no.ndla.network.tapir.auth.TokenUser -import java.util.UUID -import scala.annotation.tailrec import scala.util.{Failure, Success, Try} trait ConverterService { @@ -48,14 +44,7 @@ trait ConverterService { val converterService: ConverterService class ConverterService { - import props.{ - DefaultLanguage, - Domain, - InternalImageApiUrl, - NdlaFrontendHost, - NdlaFrontendHostNames, - NdlaFrontendProtocol - } + import props._ def asEmbedUrlV2(embedUrl: api.EmbedUrlV2, language: String): EmbedUrl = { learningpath.EmbedUrl(embedUrl.url, language, EmbedType.valueOfOrError(embedUrl.embedType)) diff --git a/learningpath-api/src/main/scala/no/ndla/learningpathapi/service/ReadService.scala b/learningpath-api/src/main/scala/no/ndla/learningpathapi/service/ReadService.scala index 0300ca4cc..369aa2f7f 100644 --- a/learningpath-api/src/main/scala/no/ndla/learningpathapi/service/ReadService.scala +++ b/learningpath-api/src/main/scala/no/ndla/learningpathapi/service/ReadService.scala @@ -10,16 +10,14 @@ package no.ndla.learningpathapi.service import cats.implicits._ import no.ndla.common.Clock -import no.ndla.common.errors.{AccessDeniedException, ValidationException} +import no.ndla.common.errors.{AccessDeniedException, NotFoundException, ValidationException} import no.ndla.common.model.{api => commonApi} import no.ndla.learningpathapi.model.api._ +import no.ndla.learningpathapi.model.domain import no.ndla.learningpathapi.model.domain.UserInfo.LearningpathTokenUser -import no.ndla.learningpathapi.model.domain.{StepStatus, LearningPathStatus => _, _} -import no.ndla.learningpathapi.model.{api, domain} +import no.ndla.learningpathapi.model.domain.{StepStatus, LearningPathStatus => _} import no.ndla.learningpathapi.repository.LearningPathRepositoryComponent -import no.ndla.myndla.model.api.config.ConfigMetaRestricted import no.ndla.myndla.model.domain.InvalidStatusException -import no.ndla.myndla.model.domain.config.{BooleanValue, ConfigKey, StringListValue} import no.ndla.myndla.repository.{ConfigRepository, FolderRepository, UserRepository} import no.ndla.myndla.service.ConfigService import no.ndla.network.clients.{FeideApiClient, RedisClient} diff --git a/learningpath-api/src/main/scala/no/ndla/learningpathapi/service/UpdateService.scala b/learningpath-api/src/main/scala/no/ndla/learningpathapi/service/UpdateService.scala index cfd695d75..f2b47a502 100644 --- a/learningpath-api/src/main/scala/no/ndla/learningpathapi/service/UpdateService.scala +++ b/learningpath-api/src/main/scala/no/ndla/learningpathapi/service/UpdateService.scala @@ -10,7 +10,7 @@ package no.ndla.learningpathapi.service import cats.implicits._ import no.ndla.common.Clock -import no.ndla.common.errors.AccessDeniedException +import no.ndla.common.errors.{AccessDeniedException, NotFoundException} import no.ndla.common.implicits._ import no.ndla.learningpathapi.Props import no.ndla.learningpathapi.integration.{SearchApiClient, TaxonomyApiClient} diff --git a/learningpath-api/src/test/scala/no/ndla/learningpathapi/e2e/CloneFolderTest.scala b/learningpath-api/src/test/scala/no/ndla/learningpathapi/e2e/CloneFolderTest.scala index 06e9f2645..3ba568704 100644 --- a/learningpath-api/src/test/scala/no/ndla/learningpathapi/e2e/CloneFolderTest.scala +++ b/learningpath-api/src/test/scala/no/ndla/learningpathapi/e2e/CloneFolderTest.scala @@ -71,6 +71,7 @@ class CloneFolderTest when(feideApiClient.getFeideID(any)).thenReturn(Success("q")) when(feideApiClient.getFeideAccessTokenOrFail(any)).thenReturn(Success("notimportante")) + when(feideApiClient.getFeideGroups(any)).thenReturn(Success(Seq.empty)) when(feideApiClient.getFeideExtendedUser(any)) .thenReturn(Success(FeideExtendedUserInfo("", Seq("employee"), "email@ndla.no", Seq("email@ndla.no")))) when(feideApiClient.getOrganization(any)).thenReturn(Success("zxc")) diff --git a/learningpath-api/src/test/scala/no/ndla/learningpathapi/service/ConverterServiceTest.scala b/learningpath-api/src/test/scala/no/ndla/learningpathapi/service/ConverterServiceTest.scala index 1516dfbcb..7b0850abf 100644 --- a/learningpath-api/src/test/scala/no/ndla/learningpathapi/service/ConverterServiceTest.scala +++ b/learningpath-api/src/test/scala/no/ndla/learningpathapi/service/ConverterServiceTest.scala @@ -8,7 +8,7 @@ package no.ndla.learningpathapi.service -import no.ndla.common.errors.ValidationException +import no.ndla.common.errors.{NotFoundException, ValidationException} import no.ndla.common.model.{NDLADate, api => commonApi} import no.ndla.common.model.domain.learningpath.{EmbedType, EmbedUrl, LearningpathCopyright} import no.ndla.common.model.domain.{Tag, Title} diff --git a/learningpath-api/src/test/scala/no/ndla/learningpathapi/service/ReadServiceTest.scala b/learningpath-api/src/test/scala/no/ndla/learningpathapi/service/ReadServiceTest.scala index 4731ee8a5..38a058ff7 100644 --- a/learningpath-api/src/test/scala/no/ndla/learningpathapi/service/ReadServiceTest.scala +++ b/learningpath-api/src/test/scala/no/ndla/learningpathapi/service/ReadServiceTest.scala @@ -8,7 +8,7 @@ package no.ndla.learningpathapi.service -import no.ndla.common.errors.AccessDeniedException +import no.ndla.common.errors.{AccessDeniedException, NotFoundException} import no.ndla.common.model.NDLADate import no.ndla.common.model.domain.learningpath.LearningpathCopyright import no.ndla.common.model.domain.{Author, Title} diff --git a/learningpath-api/src/test/scala/no/ndla/learningpathapi/service/UpdateServiceTest.scala b/learningpath-api/src/test/scala/no/ndla/learningpathapi/service/UpdateServiceTest.scala index 02df631f8..7d42cb84a 100644 --- a/learningpath-api/src/test/scala/no/ndla/learningpathapi/service/UpdateServiceTest.scala +++ b/learningpath-api/src/test/scala/no/ndla/learningpathapi/service/UpdateServiceTest.scala @@ -9,18 +9,12 @@ package no.ndla.learningpathapi.service import no.ndla.common.model.{NDLADate, api => commonApi, domain => common} -import no.ndla.common.errors.{AccessDeniedException, ValidationException} +import no.ndla.common.errors.{AccessDeniedException, NotFoundException, ValidationException} import no.ndla.common.model.domain.{Author, Title} import no.ndla.common.model.domain.learningpath.LearningpathCopyright import no.ndla.learningpathapi._ import no.ndla.learningpathapi.model._ -import no.ndla.learningpathapi.model.api.{ - NewCopyLearningPathV2, - NewLearningPathV2, - NewLearningStepV2, - UpdatedLearningPathV2, - UpdatedLearningStepV2 -} +import no.ndla.learningpathapi.model.api.{NewCopyLearningPathV2, NewLearningPathV2, NewLearningStepV2, UpdatedLearningPathV2, UpdatedLearningStepV2} import no.ndla.learningpathapi.model.domain._ import no.ndla.myndla.model.api.config.ConfigMetaValue import no.ndla.myndla.model.domain.config.{ConfigKey, ConfigMeta}