Merge pull request #484 from NDLANO/refactor-saved-search

draft-api: Refactor saved search
NDLANO · Jun 3, 2024 · 66d0238 · 66d0238
2 parents 6fa605d + 4c34d04
commit 66d0238
Show file tree

Hide file tree

Showing 11 changed files with 440 additions and 23 deletions.
diff --git a/draft-api/src/main/scala/no/ndla/draftapi/ComponentRegistry.scala b/draft-api/src/main/scala/no/ndla/draftapi/ComponentRegistry.scala
@@ -13,12 +13,13 @@ import com.zaxxer.hikari.HikariDataSource
 import no.ndla.common.{Clock, UUIDUtil}
 import no.ndla.common.configuration.BaseComponentRegistry
 import no.ndla.draftapi.caching.MemoizeHelpers
-import no.ndla.draftapi.controller._
-import no.ndla.draftapi.integration._
+import no.ndla.draftapi.controller.*
+import no.ndla.draftapi.db.migrationwithdependencies.V57__MigrateSavedSearch
+import no.ndla.draftapi.integration.*
 import no.ndla.draftapi.model.api.ErrorHelpers
 import no.ndla.draftapi.repository.{DraftRepository, UserDataRepository}
-import no.ndla.draftapi.service._
-import no.ndla.draftapi.service.search._
+import no.ndla.draftapi.service.*
+import no.ndla.draftapi.service.search.*
 import no.ndla.draftapi.validation.ContentValidator
 import no.ndla.network.NdlaClient
 import no.ndla.network.tapir.{
@@ -77,7 +78,8 @@ class ComponentRegistry(properties: DraftApiProperties)
     with NdlaMiddleware
     with TapirErrorHelpers
     with SwaggerControllerConfig
-    with SwaggerDocControllerConfig {
+    with SwaggerDocControllerConfig
+    with V57__MigrateSavedSearch {
   override val props: DraftApiProperties = properties
 
   override val migrator                     = new DBMigrator

diff --git a/draft-api/src/main/scala/no/ndla/draftapi/DBMigrator.scala b/draft-api/src/main/scala/no/ndla/draftapi/DBMigrator.scala
@@ -14,14 +14,15 @@ import no.ndla.draftapi.db.migrationwithdependencies.{
   R__SetArticleTypeFromTaxonomy,
   V20__UpdateH5PDomainForFF,
   V23__UpdateH5PDomainForFFVisualElement,
-  V33__ConvertLanguageUnknown
+  V33__ConvertLanguageUnknown,
+  V57__MigrateSavedSearch
 }
 import no.ndla.draftapi.integration.DataSource
 import org.flywaydb.core.Flyway
 import org.flywaydb.core.api.output.MigrateResult
 
 trait DBMigrator {
-  this: Props with DataSource =>
+  this: Props with DataSource with V57__MigrateSavedSearch =>
   val migrator: DBMigrator
 
   class DBMigrator {
@@ -35,7 +36,8 @@ trait DBMigrator {
           new R__SetArticleTypeFromTaxonomy(props),
           new V20__UpdateH5PDomainForFF,
           new V23__UpdateH5PDomainForFFVisualElement,
-          new V33__ConvertLanguageUnknown(props)
+          new V33__ConvertLanguageUnknown(props),
+          new V57__MigrateSavedSearch
         )
         .locations("no/ndla/draftapi/db/migration")
         .table("schema_version") // Flyway's default table name changed, so we specify the old one.

diff --git a/draft-api/src/main/scala/no/ndla/draftapi/DraftApiProperties.scala b/draft-api/src/main/scala/no/ndla/draftapi/DraftApiProperties.scala
@@ -139,4 +139,6 @@ class DraftApiProperties extends BaseProps with StrictLogging {
   )
 
   def multipartFileSizeThresholdBytes: Int = 1024 * 1024 * 30 // 30MB
+  def auth0ManagmentClientId: String       = prop("AUTH0_MANAGEMENT_CLIENT_ID")
+  def auth0ManagmentClientSecret: String   = prop("AUTH0_MANAGEMENT_CLIENT_SECRET")
 }