ETFE-4453 Correct handling of invalid trader (#239)

hmrc · Sep 10, 2024 · 4f69549 · 4f69549
1 parent 2df83fe
commit 4f69549
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 6 deletions.
diff --git a/app/controllers/prevalidateTrader/PrevalidateTraderResultsController.scala b/app/controllers/prevalidateTrader/PrevalidateTraderResultsController.scala
@@ -63,7 +63,11 @@ class PrevalidateTraderResultsController @Inject()(
           prevalidateTraderService.prevalidateTrader(ern, prevalidateTraderUserAnswers.ern, Some(prevalidateTraderUserAnswers.entityGroup), Some(enteredEPCs))
             .map { prevalidateTraderResult =>
 
-            val validTraderErn:Boolean = prevalidateTraderResult.failDetails.forall(_.validTrader)
+            val validTraderErn:Boolean = (prevalidateTraderResult.validationResult, prevalidateTraderResult.failDetails) match {
+              case ("Pass", _) => true
+              case ("Fail", Some(failDetails)) if failDetails.validTrader => true
+              case _ => false
+            }
 
             val ineligibleEPCs: Seq[String] = prevalidateTraderResult.failDetails
               .flatMap(_.validateProductAuthorisationResponse)

diff --git a/test/controllers/prevalidateTrader/PrevalidateTraderResultsControllerSpec.scala b/test/controllers/prevalidateTrader/PrevalidateTraderResultsControllerSpec.scala
@@ -94,11 +94,7 @@ class PrevalidateTraderResultsControllerSpec extends SpecBase
         exciseTraderResponse.copy(
           exciseId = ernToCheck,
           validationResult = "Fail",
-          failDetails = Some(
-            FailDetails(
-              validTrader = false
-            )
-          )
+          failDetails = None
         )
       ))