Fix tests and typing

NDLANO · Oct 23, 2024 · 02a390f · 02a390f
1 parent 6ab1b31
commit 02a390f
Show file tree

Hide file tree

Showing 3 changed files with 19 additions and 11 deletions.
diff --git a/article-api/src/main/scala/no/ndla/articleapi/service/ConverterService.scala b/article-api/src/main/scala/no/ndla/articleapi/service/ConverterService.scala
@@ -371,7 +371,7 @@ trait ConverterService {
     ): api.TagsSearchResult = {
       api.TagsSearchResult(tagsCount, offset, pageSize, language, tags)
     }
-    
+
     private def toApiArticleIntroSummary(introSummary: ArticleIntroSummary): api.ArticleIntroSummary = {
       api.ArticleIntroSummary(
         introSummary.content,

diff --git a/article-api/src/test/scala/no/ndla/articleapi/TestData.scala b/article-api/src/test/scala/no/ndla/articleapi/TestData.scala
@@ -82,7 +82,8 @@ trait TestData {
       availability = Availability.everyone.toString,
       relatedContent = Seq.empty,
       revisionDate = None,
-      slug = None
+      slug = None,
+      summary = None
     )
 
     val apiArticleV2: api.ArticleV2 = api.ArticleV2(
@@ -122,7 +123,8 @@ trait TestData {
       availability = Availability.everyone.toString,
       relatedContent = Seq.empty,
       revisionDate = None,
-      slug = None
+      slug = None,
+      summary = None
     )
 
     val sampleArticleWithPublicDomain: Article = Article(
@@ -152,7 +154,8 @@ trait TestData {
       availability = Availability.everyone,
       relatedContent = Seq.empty,
       revisionDate = Some(NDLADate.now().withNano(0)),
-      slug = None
+      slug = None,
+      summary = Seq.empty
     )
 
     val sampleDomainArticle: Article = Article(
@@ -177,7 +180,8 @@ trait TestData {
       availability = Availability.everyone,
       relatedContent = Seq.empty,
       revisionDate = None,
-      slug = None
+      slug = None,
+      summary = Seq.empty
     )
 
     val sampleDomainArticle2: Article = Article(
@@ -202,7 +206,8 @@ trait TestData {
       availability = Availability.everyone,
       relatedContent = Seq.empty,
       revisionDate = None,
-      slug = None
+      slug = None,
+      summary = Seq(ArticleIntroSummary("summary", "en"))
     )
 
     val sampleArticleWithByNcSa: Article      = sampleArticleWithPublicDomain.copy(copyright = byNcSaCopyright)
@@ -239,7 +244,8 @@ trait TestData {
       availability = Availability.everyone,
       relatedContent = Seq.empty,
       revisionDate = None,
-      slug = None
+      slug = None,
+      summary = Seq(ArticleIntroSummary("summary", "en"))
     )
 
     val apiArticleWithHtmlFaultV2: api.ArticleV2 = api.ArticleV2(
@@ -273,7 +279,8 @@ trait TestData {
       availability = Availability.everyone.toString,
       relatedContent = Seq.empty,
       revisionDate = None,
-      slug = None
+      slug = None,
+      summary = None
     )
 
     val (nodeId, nodeId2)  = ("1234", "4321")
@@ -307,7 +314,8 @@ trait TestData {
         availability = Availability.everyone,
         relatedContent = Seq.empty,
         revisionDate = None,
-        slug = None
+        slug = None,
+        summary = Seq(ArticleIntroSummary("", lang))
       )
     }
 

diff --git a/common/src/main/scala/no/ndla/common/model/domain/ArticleIntroSummary.scala b/common/src/main/scala/no/ndla/common/model/domain/ArticleIntroSummary.scala
@@ -17,6 +17,6 @@ case class ArticleIntroSummary(content: String, language: String) extends Langua
 }
 
 object ArticleIntroSummary {
-  implicit def encoder: Encoder[ArticleContent] = deriveEncoder[ArticleContent]
-  implicit def decoder: Decoder[ArticleContent] = deriveDecoder[ArticleContent]
+  implicit def encoder: Encoder[ArticleIntroSummary] = deriveEncoder[ArticleIntroSummary]
+  implicit def decoder: Decoder[ArticleIntroSummary] = deriveDecoder[ArticleIntroSummary]
 }