Merge branch 'master' into scala-steward-dependencies

nationalarchives · Mar 11, 2024 · eacc8ed · eacc8ed
2 parents 97ae6eb + f3d6e9b
commit eacc8ed
Show file tree

Hide file tree

Showing 2 changed files with 23 additions and 4 deletions.
diff --git a/src/main/scala/uk/gov/nationalarchives/tdr/api/service/ConsignmentStatusService.scala b/src/main/scala/uk/gov/nationalarchives/tdr/api/service/ConsignmentStatusService.scala
@@ -1,7 +1,7 @@
 package uk.gov.nationalarchives.tdr.api.service
 
 import cats.implicits._
-import uk.gov.nationalarchives.Tables.{ConsignmentstatusRow, FilestatusRow}
+import uk.gov.nationalarchives.Tables.ConsignmentstatusRow
 import uk.gov.nationalarchives.tdr.api.consignmentstatevalidation.ConsignmentStateException
 import uk.gov.nationalarchives.tdr.api.db.repository.{ConsignmentStatusRepository, FileStatusRepository}
 import uk.gov.nationalarchives.tdr.api.graphql.DataExceptions.InputDataException
@@ -115,7 +115,8 @@ class ConsignmentStatusService(
 }
 
 object ConsignmentStatusService {
-  val validConsignmentTypes: List[String] = List("Series", "TransferAgreement", "Upload", "ClientChecks", "ClosureMetadata", "DescriptiveMetadata", "ConfirmTransfer", "Export")
+  val validConsignmentTypes: List[String] =
+    List("Series", "TransferAgreement", "Upload", "ClientChecks", "DraftMetadata", "ClosureMetadata", "DescriptiveMetadata", "ConfirmTransfer", "Export")
   val validStatusTypes: Set[String] = validConsignmentTypes.toSet ++ Set("ServerFFID", "ServerChecksum", "ServerAntivirus")
   val validStatusValues: Set[String] = Set("InProgress", "Completed", "CompletedWithIssues", "Failed", "NotEntered", "Incomplete")
 }
diff --git a/src/test/scala/uk/gov/nationalarchives/tdr/api/service/ConsignmentStatusServiceSpec.scala b/src/test/scala/uk/gov/nationalarchives/tdr/api/service/ConsignmentStatusServiceSpec.scala
@@ -10,8 +10,8 @@ import org.scalatest.prop.{TableDrivenPropertyChecks, TableFor1, TableFor2}
 import uk.gov.nationalarchives.Tables.{ConsignmentstatusRow, FilestatusRow}
 import uk.gov.nationalarchives.tdr.api.db.repository.{ConsignmentStatusRepository, FileStatusRepository}
 import uk.gov.nationalarchives.tdr.api.graphql.fields.ConsignmentStatusFields.{ConsignmentStatus, ConsignmentStatusInput}
-import uk.gov.nationalarchives.tdr.api.service.ConsignmentStatusService.validStatusValues
-import uk.gov.nationalarchives.tdr.api.service.FileStatusService.{ClosureMetadata, Completed, DescriptiveMetadata, Incomplete, NotEntered}
+import uk.gov.nationalarchives.tdr.api.service.ConsignmentStatusService.{validStatusTypes, validStatusValues}
+import uk.gov.nationalarchives.tdr.api.service.FileStatusService._
 import uk.gov.nationalarchives.tdr.api.utils.{FixedTimeSource, FixedUUIDSource}
 
 import java.sql.Timestamp
@@ -430,6 +430,24 @@ class ConsignmentStatusServiceSpec extends AnyFlatSpec with MockitoSugar with Re
     validStatusValues.toList.sorted should equal(expectedValues)
   }
 
+  "validStatusTypes" should "contain the correct values" in {
+    val expectedValues = List(
+      "ClientChecks",
+      "ClosureMetadata",
+      "ConfirmTransfer",
+      "DescriptiveMetadata",
+      "DraftMetadata",
+      "Export",
+      "Series",
+      "ServerAntivirus",
+      "ServerChecksum",
+      "ServerFFID",
+      "TransferAgreement",
+      "Upload"
+    )
+    validStatusTypes.toList.sorted should equal(expectedValues)
+  }
+
   private def generateConsignmentStatusRow(
       consignmentId: UUID,
       statusType: String,