Add test for inserting cards of different types to ensure type inform…

…ation is persisted
guardian · Apr 29, 2024 · 793613c · 793613c
1 parent b02a873
commit 793613c
Show file tree

Hide file tree

Showing 8 changed files with 425 additions and 393 deletions.
diff --git a/app/controllers/EditionsController.scala b/app/controllers/EditionsController.scala
@@ -114,7 +114,10 @@ class EditionsController(db: EditionsDB,
       (LocalDate.parse(dateFrom), LocalDate.parse(dateTo))
     }.map {
       case (localDateFrom, localDateTo) =>
-        Ok(Json.toJson(db.listIssues(edition, localDateFrom, localDateTo).flatMap(_.toOption)))
+        db.listIssues(edition, localDateFrom, localDateTo) match {
+          case Right(issues) => Ok(Json.toJson(issues))
+          case Left(errors) => InternalServerError(s"Error listing issues: ${errors.mkString(", ")}")
+        }
     }.getOrElse(BadRequest("Invalid or missing date"))
   }
 

diff --git a/app/services/editions/db/CollectionsQueries.scala b/app/services/editions/db/CollectionsQueries.scala
@@ -115,10 +115,11 @@ trait CollectionsQueries {
           INSERT INTO cards (
           collection_id,
           id,
+          card_type,
           index,
           added_on,
           metadata
-          ) VALUES (${collection.id}, ${card.id}, $index, $addedOn, ${card.metadata.map(m => Json.toJson(m).toString)}::JSONB)
+          ) VALUES (${collection.id}, ${card.id}, ${card.cardType.entryName}, $index, $addedOn, ${card.metadata.map(m => Json.toJson(m).toString)}::JSONB)
        """.execute().apply()
     }
 

diff --git a/app/services/editions/db/IssueQueries.scala b/app/services/editions/db/IssueQueries.scala
@@ -107,21 +107,26 @@ trait IssueQueries extends Logging {
   }
 
   def listIssues(edition: Edition, dateFrom: LocalDate, dateTo: LocalDate) = DB readOnly { implicit session =>
-    sql"""
-    SELECT
-      id,
-      name,
-      issue_date,
-      timezone_id,
-      created_on,
-      created_by,
-      created_email,
-      launched_on,
-      launched_by,
-      launched_email
-    FROM edition_issues
-    WHERE issue_date BETWEEN $dateFrom AND $dateTo AND name = ${edition.entryName}
-    """.map(EditionsIssue.fromRow(_)).list().apply()
+    val maybeIssues = sql"""
+      SELECT
+        id,
+        name,
+        issue_date,
+        timezone_id,
+        created_on,
+        created_by,
+        created_email,
+        launched_on,
+        launched_by,
+        launched_email
+      FROM edition_issues
+      WHERE issue_date BETWEEN $dateFrom AND $dateTo AND name = ${edition.entryName}
+      """.map(EditionsIssue.fromRow(_)).list().apply()
+
+    maybeIssues.partitionMap(identity) match {
+      case (Nil, rights) => Right(rights)
+      case (lefts, _) => Left(lefts)
+    }
   }
 
   def getIssueIdFromCollectionId(collectionId: String): Option[String] = DB readOnly { implicit session =>

diff --git a/test/logic/EditionsCheckerTest.scala b/test/logic/EditionsCheckerTest.scala
@@ -1,9 +1,8 @@
 package logic
 
 import java.time.LocalDate
-
 import model.editions.Edition.DailyEdition
-import model.editions.{EditionsCard, EditionsCollection, EditionsFront, EditionsFrontMetadata, EditionsIssue}
+import model.editions.{CuratedPlatform, EditionsCard, EditionsCollection, EditionsFront, EditionsFrontMetadata, EditionsIssue}
 import org.scalatest.{FreeSpec, Matchers}
 
 class EditionsCheckerTest extends FreeSpec with Matchers {
@@ -96,6 +95,7 @@ class EditionsCheckerTest extends FreeSpec with Matchers {
     EditionsIssue(
       "id",
       DailyEdition,
+      CuratedPlatform.Editions,
       "timezoneId",
       LocalDate.now(),
       LocalDate.now().toEpochDay,

diff --git a/test/model/editions/PublishedIssueSerialisationTest.scala b/test/model/editions/PublishedIssueSerialisationTest.scala
@@ -13,6 +13,7 @@ class PublishedIssueSerialisationTest extends FreeSpec with Matchers {
     val issue: EditionsIssue = EditionsIssue(
       id = "4290573248905743296789524389623",
       edition = Edition.DailyEdition,
+      platform = CuratedPlatform.Editions,
       timezoneId = "Europe/London",
       issueDate = issueDate,
       createdOn = 0,

diff --git a/test/model/editions/PublishedIssueTest.scala b/test/model/editions/PublishedIssueTest.scala
@@ -17,6 +17,7 @@ class PublishedIssueTest extends FreeSpec with Matchers with OptionValues {
     EditionsIssue(
       "test-edition",
       Edition.DailyEdition,
+      CuratedPlatform.Editions,
       LondonZone.toString,
       date,
       dateTimeMilli,