There was an issue with your uploaded metadata file.
+
+
+
+
+
+
+ Status
+
+
+ Issues found
+
+
+
+
+
+ Details
+
+
+ @detailsMessage
+
+
+
+
+
+ Action
+
+
+ @actionMessage
+
+
+
diff --git a/conf/application.base.conf b/conf/application.base.conf
index c29b90a8c..9a6e350a3 100644
--- a/conf/application.base.conf
+++ b/conf/application.base.conf
@@ -64,6 +64,7 @@ featureAccessBlock {
draftMetadata {
fileName = "draft-metadata.csv"
+ errorFileName = "draft-metadata-errors.json"
}
notificationSnsTopicArn = ${NOTIFICATION_SNS_TOPIC_ARN}
diff --git a/conf/messages b/conf/messages
index 385a76762..9ed9892ce 100644
--- a/conf/messages
+++ b/conf/messages
@@ -36,3 +36,5 @@ notification.savedProgress.heading=Your progress has been saved
notification.savedProgress.metadataInfo=Your records and any metadata you added has been saved. You can leave at any time and return to this transfer by visiting the {1} page.
additionalMetadata.descriptive.sensitive=If the description of a record contains sensitive information, you must enter the full uncensored version on the Descriptive metadata page before entering an alternative description on the Closure metadata page.
+draftMetadata.validation.details.SCHEMA_VALIDATION=We found validation errors in the uploaded metadata.
+draftMetadata.validation.action.SCHEMA_VALIDATION=Download the report below for details on individual validation errors.
diff --git a/test/controllers/DraftMetadataChecksResultsControllerSpec.scala b/test/controllers/DraftMetadataChecksResultsControllerSpec.scala
index 176225eee..6e50678df 100644
--- a/test/controllers/DraftMetadataChecksResultsControllerSpec.scala
+++ b/test/controllers/DraftMetadataChecksResultsControllerSpec.scala
@@ -3,6 +3,7 @@ package controllers
import com.github.tomakehurst.wiremock.WireMockServer
import configuration.{ApplicationConfig, GraphQLConfiguration, KeycloakConfiguration}
import graphql.codegen.GetConsignmentStatus.getConsignmentStatus.{GetConsignment => gcs}
+import org.mockito.ArgumentMatchers.any
import org.mockito.Mockito.when
import org.pac4j.play.scala.SecurityComponents
import org.scalatest.matchers.should.Matchers._
@@ -12,12 +13,12 @@ import play.api.test.CSRFTokenHelper._
import play.api.test.FakeRequest
import play.api.test.Helpers.{status => playStatus, _}
import services.Statuses.{CompletedValue, CompletedWithIssuesValue, DraftMetadataType, FailedValue}
-import services.{ConsignmentService, ConsignmentStatusService}
+import services.{ConsignmentService, ConsignmentStatusService, DraftMetadataService, FileError}
import testUtils.FrontEndTestHelper
import java.time.{LocalDateTime, ZoneId, ZonedDateTime}
import java.util.UUID
-import scala.concurrent.ExecutionContext
+import scala.concurrent.{ExecutionContext, Future}
class DraftMetadataChecksResultsControllerSpec extends FrontEndTestHelper {
implicit val ec: ExecutionContext = ExecutionContext.global
@@ -59,57 +60,192 @@ class DraftMetadataChecksResultsControllerSpec extends FrontEndTestHelper {
}
"DraftMetadataChecksResultsController should render the page with the correct status" should {
- val draftMetadataStatuses = Table(
- ("status", "progress"),
- (CompletedValue.value, DraftMetadataProgress("IMPORTED", "blue")),
- (CompletedWithIssuesValue.value, DraftMetadataProgress("ERRORS", "red")),
- (FailedValue.value, DraftMetadataProgress("FAILED", "red"))
- )
- forAll(draftMetadataStatuses) { (statusValue, progress) =>
- s"render the draftMetadataResults page when the status is $statusValue" in {
- val controller = instantiateController(blockDraftMetadataUpload = false)
- val additionalMetadataEntryMethodPage = controller
- .draftMetadataChecksResultsPage(consignmentId)
- .apply(FakeRequest(GET, "/draft-metadata/checks-results").withCSRFToken)
- setConsignmentTypeResponse(wiremockServer, "standard")
- setConsignmentReferenceResponse(wiremockServer)
- val someDateTime = ZonedDateTime.of(LocalDateTime.of(2022, 3, 10, 1, 0), ZoneId.systemDefault())
- val consignmentStatuses = List(
- gcs.ConsignmentStatuses(UUID.randomUUID(), UUID.randomUUID(), DraftMetadataType.id, statusValue, someDateTime, None)
- )
- setConsignmentStatusResponse(app.configuration, wiremockServer, consignmentStatuses = consignmentStatuses)
-
- val pageAsString = contentAsString(additionalMetadataEntryMethodPage)
-
- playStatus(additionalMetadataEntryMethodPage) mustBe OK
- contentType(additionalMetadataEntryMethodPage) mustBe Some("text/html")
- pageAsString must include("Results of CSV Checks - Transfer Digital Records - GOV.UK")
- pageAsString must include(
- """
- | Results of your metadata checks
- |
""".stripMargin
- )
- pageAsString must include(
- s"""
+ s"render the draftMetadataResults page when the status is completed" in {
+ val controller = instantiateController(blockDraftMetadataUpload = false)
+ val additionalMetadataEntryMethodPage = controller
+ .draftMetadataChecksResultsPage(consignmentId)
+ .apply(FakeRequest(GET, "/draft-metadata/checks-results").withCSRFToken)
+ setConsignmentTypeResponse(wiremockServer, "standard")
+ setConsignmentReferenceResponse(wiremockServer)
+ val someDateTime = ZonedDateTime.of(LocalDateTime.of(2022, 3, 10, 1, 0), ZoneId.systemDefault())
+ val consignmentStatuses = List(
+ gcs.ConsignmentStatuses(UUID.randomUUID(), UUID.randomUUID(), DraftMetadataType.id, CompletedValue.value, someDateTime, None)
+ )
+ setConsignmentStatusResponse(app.configuration, wiremockServer, consignmentStatuses = consignmentStatuses)
+
+ val pageAsString = contentAsString(additionalMetadataEntryMethodPage)
+
+ playStatus(additionalMetadataEntryMethodPage) mustBe OK
+ contentType(additionalMetadataEntryMethodPage) mustBe Some("text/html")
+ pageAsString must include("Results of CSV Checks - Transfer Digital Records - GOV.UK")
+ pageAsString must include(
+ s"""
+ | Results of your metadata checks
+ |
""".stripMargin
+ )
+ pageAsString must include(
+ s"""