Merge branch 'master' into language-code-param

Author: gunnarvelle

.github/workflows/typescript-generate.yml

@@ -2,6 +2,9 @@ name: 'Generate typescript types'
 on:
   workflow_dispatch:
     inputs: { }
+  push:
+    branches:
+      - master
 env:
   AWS_ACCESS_KEY_ID: ${{ secrets.CI_AWS_CLIENT_ID }}
   AWS_DEFAULT_REGION: eu-west-1
@@ -13,6 +16,16 @@ env:
   DOCKER_HUB_USERNAME: ${{ secrets.DOCKER_HUB_USERNAME }}
   NDLA_RELEASES: ${{ secrets.NDLA_RELEASES }}
   KNOWIT_EMAIL: ${{ secrets.KNOWIT_EMAIL }}
+  # Env variables needed to be defined for servers to "start"
+  BRIGHTCOVE_ACCOUNT_ID: ""
+  BRIGHTCOVE_PLAYER_ID: ""
+  META_USER_NAME: ""
+  META_PASSWORD: ""
+  META_RESOURCE: ""
+  META_SERVER: ""
+  META_PORT: 5432
+  META_SCHEMA: ""
+  META_MAX_CONNECTIONS: 1
 jobs:
   generate_typescript:
     name: Generate typescript types

article-api/src/main/scala/no/ndla/articleapi/ArticleApiProperties.scala

@@ -71,8 +71,8 @@ class ArticleApiProperties extends BaseProps with DatabaseProps {
     ).getOrElse(Environment, "https://h5p.ndla.no")
   )
 
-  private def BrightcoveAccountId: String = prop("NDLA_BRIGHTCOVE_ACCOUNT_ID")
-  private def BrightcovePlayerId: String  = prop("NDLA_BRIGHTCOVE_PLAYER_ID")
+  private def BrightcoveAccountId: String = prop("BRIGHTCOVE_ACCOUNT_ID")
+  private def BrightcovePlayerId: String  = prop("BRIGHTCOVE_PLAYER_ID")
 
   def BrightcoveVideoScriptUrl: String =
     s"//players.brightcove.net/$BrightcoveAccountId/${BrightcovePlayerId}_default/index.min.js"

article-api/src/test/scala/no/ndla/articleapi/UnitSuite.scala

@@ -26,8 +26,8 @@ trait UnitSuite extends UnitTestSuite {
   setProp("IMAGE_API_HOST", "localhost:30001")
   setProp("DRAFT_API_HOST", "localhost:30022")
 
-  setProp("NDLA_BRIGHTCOVE_ACCOUNT_ID", "some-account-id")
-  setProp("NDLA_BRIGHTCOVE_PLAYER_ID", "some-player-id")
+  setProp("BRIGHTCOVE_ACCOUNT_ID", "some-account-id")
+  setProp("BRIGHTCOVE_PLAYER_ID", "some-player-id")
   setProp("BRIGHTCOVE_API_CLIENT_ID", "some-client-id")
   setProp("BRIGHTCOVE_API_CLIENT_SECRET", "some-secret")
   setProp("SEARCH_INDEX_NAME", "article-integration-test-index")

common/src/main/scala/no/ndla/common/model/domain/concept/Concept.scala

@@ -24,7 +24,6 @@ case class Concept(
     created: NDLADate,
     updated: NDLADate,
     updatedBy: Seq[String],
-    metaImage: Seq[ConceptMetaImage],
     tags: Seq[Tag],
     status: Status,
     visualElement: Seq[VisualElement],
@@ -34,7 +33,7 @@ case class Concept(
     editorNotes: Seq[ConceptEditorNote]
 ) extends Content {
   def supportedLanguages: Set[String] =
-    getSupportedLanguages(title, content, tags, visualElement, metaImage).toSet
+    getSupportedLanguages(title, content, tags, visualElement).toSet
 }
 
 object Concept {

common/src/main/scala/no/ndla/common/model/domain/concept/ConceptMetaImage.scala

@@ -8,5 +8,10 @@
 
 package no.ndla.common.model.domain.frontpage
 
+import no.ndla.language.model.LanguageField
+
 case class MovieTheme(name: Seq[MovieThemeName], movies: Seq[String])
-case class MovieThemeName(name: String, language: String)
+case class MovieThemeName(name: String, language: String) extends LanguageField[String] {
+  override def value: String    = name
+  override def isEmpty: Boolean = name.isEmpty
+}

common/src/main/scala/no/ndla/common/model/domain/frontpage/MovieTheme.scala

@@ -0,0 +1,2 @@
+update conceptdata set document = document - 'metaImage';
+update publishedconceptdata set document = document - 'metaImage';

concept-api/src/main/resources/no/ndla/conceptapi/db/migration/V29__DropMetaImage.sql

@@ -11,7 +11,6 @@ package no.ndla.conceptapi
 import com.typesafe.scalalogging.StrictLogging
 import com.zaxxer.hikari.HikariDataSource
 import no.ndla.conceptapi.controller.*
-import no.ndla.conceptapi.integration.TaxonomyApiClient
 import no.ndla.conceptapi.model.api.ErrorHandling
 import no.ndla.conceptapi.model.search.{DraftSearchSettingsHelper, SearchSettingsHelper}
 import no.ndla.conceptapi.repository.{DraftConceptRepository, PublishedConceptRepository}
@@ -60,7 +59,6 @@ class ComponentRegistry(properties: ConceptApiProperties)
     with ErrorHandling
     with SearchSettingsHelper
     with DraftSearchSettingsHelper
-    with TaxonomyApiClient
     with SwaggerDocControllerConfig
     with ConceptControllerHelpers {
   override val props: ConceptApiProperties = properties
@@ -81,8 +79,6 @@ class ComponentRegistry(properties: ConceptApiProperties)
   lazy val publishedConceptIndexService  = new PublishedConceptIndexService
   lazy val publishedConceptSearchService = new PublishedConceptSearchService
 
-  lazy val taxonomyApiClient: TaxonomyApiClient = new TaxonomyApiClient
-
   var e4sClient: NdlaE4sClient = Elastic4sClientFactory.getClient(props.SearchServer)
 
   lazy val ndlaClient                       = new NdlaClient

concept-api/src/main/scala/no/ndla/conceptapi/ComponentRegistry.scala

@@ -28,8 +28,6 @@ case class ConceptDTO(
     copyright: Option[DraftCopyrightDTO],
     @description("URL for the source of the concept")
     source: Option[String],
-    @description("A meta image for the concept")
-    metaImage: Option[ConceptMetaImageDTO],
     @description("Search tags the concept is tagged with")
     tags: Option[ConceptTagsDTO],
     @description("When the concept was created")

concept-api/src/main/scala/no/ndla/conceptapi/integration/TaxonomyApiClient.scala

@@ -22,8 +22,6 @@ case class ConceptSummaryDTO(
     title: ConceptTitleDTO,
     @description("The content of the concept in available languages")
     content: ConceptContent,
-    @description("The metaImage of the concept")
-    metaImage: ConceptMetaImageDTO,
     @description("Search tags the concept is tagged with")
     tags: Option[ConceptTagsDTO],
     @description("All available languages of the current concept")

concept-api/src/main/scala/no/ndla/conceptapi/integration/model/TaxonomySubject.scala

@@ -23,8 +23,6 @@ case class NewConceptDTO(
     content: Option[String],
     @description("Describes the copyright information for the concept")
     copyright: Option[DraftCopyrightDTO],
-    @description("An image-api ID for the concept meta image")
-    metaImage: Option[NewConceptMetaImageDTO],
     @description("A list of searchable tags")
     tags: Option[Seq[String]],
     @description("A visual element for the concept. May be anything from an image to a video or H5P")

concept-api/src/main/scala/no/ndla/conceptapi/model/api/ConceptDTO.scala

@@ -21,8 +21,6 @@ case class UpdatedConceptDTO(
     title: Option[String],
     @description("The content of the concept")
     content: Option[String],
-    @description("An image-api ID for the concept meta image")
-    metaImage: UpdateOrDelete[NewConceptMetaImageDTO],
     @description("Describes the copyright information for the concept")
     copyright: Option[DraftCopyrightDTO],
     @description("A list of searchable tags")

concept-api/src/main/scala/no/ndla/conceptapi/model/api/ConceptMetaImageDTO.scala

@@ -35,7 +35,6 @@ object DBConcept extends SQLSyntaxSupport[Concept] {
       meta.created,
       meta.updated,
       meta.updatedBy,
-      meta.metaImage,
       meta.tags,
       meta.status,
       meta.visualElement,

concept-api/src/main/scala/no/ndla/conceptapi/model/api/ConceptSummaryDTO.scala

@@ -14,14 +14,13 @@ import no.ndla.common.model.domain.Responsible
 import no.ndla.search.model.domain.EmbedValues
 import no.ndla.search.model.{SearchableLanguageList, SearchableLanguageValues}
 import no.ndla.common.model.NDLADate
-import no.ndla.common.model.domain.concept.{Concept, ConceptMetaImage}
+import no.ndla.common.model.domain.concept.Concept
 
 case class SearchableConcept(
     id: Long,
     conceptType: String,
     title: SearchableLanguageValues,
     content: SearchableLanguageValues,
-    metaImage: Seq[ConceptMetaImage],
     defaultTitle: Option[String],
     tags: SearchableLanguageList,
     lastUpdated: NDLADate,