Merge pull request #184 from hmrc/DLS-3692

hmrc · Feb 19, 2021 · aef577e · aef577e
2 parents d15e40e + 09d3287
commit aef577e
Show file tree

Hide file tree

Showing 34 changed files with 53 additions and 60 deletions.
diff --git a/app/uk/gov/hmrc/helptosavestub/config/AppConfig.scala b/app/uk/gov/hmrc/helptosavestub/config/AppConfig.scala
@@ -1,5 +1,5 @@
 /*
- * Copyright 2020 HM Revenue & Customs
+ * Copyright 2021 HM Revenue & Customs
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.

diff --git a/app/uk/gov/hmrc/helptosavestub/controllers/BARSController.scala b/app/uk/gov/hmrc/helptosavestub/controllers/BARSController.scala
@@ -1,5 +1,5 @@
 /*
- * Copyright 2020 HM Revenue & Customs
+ * Copyright 2021 HM Revenue & Customs
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.

diff --git a/app/uk/gov/hmrc/helptosavestub/controllers/BankDetailsBehaviour.scala b/app/uk/gov/hmrc/helptosavestub/controllers/BankDetailsBehaviour.scala
@@ -1,5 +1,5 @@
 /*
- * Copyright 2020 HM Revenue & Customs
+ * Copyright 2021 HM Revenue & Customs
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -28,37 +28,31 @@ trait BankDetailsBehaviour {
   val allowedSeparators: Set[Char] = Set(' ', '-', '–', '−', '—')
 
   def getBankProfile(bankDetails: BankDetails): Profile = {
-    val accountNumberWithSortCodeIsValid =
-      if (bankDetails.accountNumber.startsWith("9")) {
-        Some(false)
-      } else if (bankDetails.accountNumber.startsWith("5")) {
-        None
-      } else if (!validateSortCode(bankDetails.sortCode)) {
-        Some(false)
-      } else if (!validateAccountNumber(bankDetails.accountNumber)) {
-        Some(false)
-      } else {
-        Some(true)
-      }
+    val accountNumberWithSortCodeIsValid = bankDetails match {
+      case BankDetails(_, accountNumber) if accountNumber.startsWith("9")         => Some(false)
+      case BankDetails(_, accountNumber) if accountNumber.startsWith("5")         => None
+      case BankDetails(sortCode, _) if !validateSortCode(sortCode)                => Some(false)
+      case BankDetails(_, accountNumber) if !validateAccountNumber(accountNumber) => Some(false)
+      case _                                                                      => Some(true)
+    }
 
     val sortCodeIsPresentOnEISCD =
-      if (bankDetails.sortCode.startsWith("9")) {
-        "no"
-      } else if (bankDetails.sortCode.startsWith("5")) {
-        "whoopsie"
-      } else {
-        "yes"
+      bankDetails match {
+        case BankDetails(_, accountNumber) if accountNumber.startsWith("9") => "no"
+        case BankDetails(_, accountNumber) if accountNumber.startsWith("5") => "whoopsie"
+        case _                                                              => "yes"
       }
 
     val barsResponse =
       accountNumberWithSortCodeIsValid.map(a ⇒ BARSResponse(a, sortCodeIsPresentOnEISCD))
 
-    if (bankDetails.accountNumber.startsWith("707")) {
-      Profile(barsResponse, CreateAccountResponse(Left(NSIErrorResponse.incorrectAccountNumber)))
-    } else if (bankDetails.sortCode.startsWith("70-3")) {
-      Profile(barsResponse, CreateAccountResponse(Left(NSIErrorResponse.incorrectSortCode)))
-    } else {
-      Profile(barsResponse, CreateAccountResponse(Right(())))
+    bankDetails match {
+      case BankDetails(_, accountNumber) if accountNumber.startsWith("707") =>
+        Profile(barsResponse, CreateAccountResponse(Left(NSIErrorResponse.incorrectAccountNumber)))
+      case BankDetails(sortCode, _) if sortCode.startsWith("70-3") =>
+        Profile(barsResponse, CreateAccountResponse(Left(NSIErrorResponse.incorrectSortCode)))
+      case _ =>
+        Profile(barsResponse, CreateAccountResponse(Right(())))
     }
   }
 

diff --git a/app/uk/gov/hmrc/helptosavestub/controllers/DESController.scala b/app/uk/gov/hmrc/helptosavestub/controllers/DESController.scala
@@ -1,5 +1,5 @@
 /*
- * Copyright 2020 HM Revenue & Customs
+ * Copyright 2021 HM Revenue & Customs
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.

diff --git a/app/uk/gov/hmrc/helptosavestub/controllers/DESThresholdController.scala b/app/uk/gov/hmrc/helptosavestub/controllers/DESThresholdController.scala
@@ -1,5 +1,5 @@
 /*
- * Copyright 2020 HM Revenue & Customs
+ * Copyright 2021 HM Revenue & Customs
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.

diff --git a/app/uk/gov/hmrc/helptosavestub/controllers/DWPController.scala b/app/uk/gov/hmrc/helptosavestub/controllers/DWPController.scala
@@ -1,5 +1,5 @@
 /*
- * Copyright 2020 HM Revenue & Customs
+ * Copyright 2021 HM Revenue & Customs
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.

diff --git a/app/uk/gov/hmrc/helptosavestub/controllers/DWPEligibilityBehaviour.scala b/app/uk/gov/hmrc/helptosavestub/controllers/DWPEligibilityBehaviour.scala
@@ -1,5 +1,5 @@
 /*
- * Copyright 2020 HM Revenue & Customs
+ * Copyright 2021 HM Revenue & Customs
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.

diff --git a/app/uk/gov/hmrc/helptosavestub/controllers/EligibilityCheckController.scala b/app/uk/gov/hmrc/helptosavestub/controllers/EligibilityCheckController.scala
@@ -1,5 +1,5 @@
 /*
- * Copyright 2020 HM Revenue & Customs
+ * Copyright 2021 HM Revenue & Customs
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.

diff --git a/app/uk/gov/hmrc/helptosavestub/controllers/EmailVerificationController.scala b/app/uk/gov/hmrc/helptosavestub/controllers/EmailVerificationController.scala
@@ -1,5 +1,5 @@
 /*
- * Copyright 2020 HM Revenue & Customs
+ * Copyright 2021 HM Revenue & Customs
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.

diff --git a/app/uk/gov/hmrc/helptosavestub/controllers/ITMPEnrolmentController.scala b/app/uk/gov/hmrc/helptosavestub/controllers/ITMPEnrolmentController.scala
@@ -1,5 +1,5 @@
 /*
- * Copyright 2020 HM Revenue & Customs
+ * Copyright 2021 HM Revenue & Customs
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.

diff --git a/app/uk/gov/hmrc/helptosavestub/controllers/NSIController.scala b/app/uk/gov/hmrc/helptosavestub/controllers/NSIController.scala
@@ -1,5 +1,5 @@
 /*
- * Copyright 2020 HM Revenue & Customs
+ * Copyright 2021 HM Revenue & Customs
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -24,7 +24,6 @@ import cats.data.Validated.{Invalid, Valid}
 import cats.data.{Validated, ValidatedNel}
 import cats.instances.string._
 import cats.syntax.apply._
-import cats.syntax.either._
 import cats.syntax.eq._
 import com.google.inject.{Inject, Singleton}
 import org.scalacheck.Gen

diff --git a/app/uk/gov/hmrc/helptosavestub/controllers/NSIGetAccountBehaviour.scala b/app/uk/gov/hmrc/helptosavestub/controllers/NSIGetAccountBehaviour.scala
@@ -1,5 +1,5 @@
 /*
- * Copyright 2020 HM Revenue & Customs
+ * Copyright 2021 HM Revenue & Customs
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.

diff --git a/app/uk/gov/hmrc/helptosavestub/controllers/NSIGetTransactionsBehaviour.scala b/app/uk/gov/hmrc/helptosavestub/controllers/NSIGetTransactionsBehaviour.scala
@@ -1,5 +1,5 @@
 /*
- * Copyright 2020 HM Revenue & Customs
+ * Copyright 2021 HM Revenue & Customs
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.

diff --git a/app/uk/gov/hmrc/helptosavestub/controllers/PayePersonalDetailsController.scala b/app/uk/gov/hmrc/helptosavestub/controllers/PayePersonalDetailsController.scala
@@ -1,5 +1,5 @@
 /*
- * Copyright 2020 HM Revenue & Customs
+ * Copyright 2021 HM Revenue & Customs
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.

diff --git a/app/uk/gov/hmrc/helptosavestub/controllers/package.scala b/app/uk/gov/hmrc/helptosavestub/controllers/package.scala
@@ -1,5 +1,5 @@
 /*
- * Copyright 2020 HM Revenue & Customs
+ * Copyright 2021 HM Revenue & Customs
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.

diff --git a/app/uk/gov/hmrc/helptosavestub/models/BankDetails.scala b/app/uk/gov/hmrc/helptosavestub/models/BankDetails.scala
@@ -1,5 +1,5 @@
 /*
- * Copyright 2020 HM Revenue & Customs
+ * Copyright 2021 HM Revenue & Customs
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.

diff --git a/app/uk/gov/hmrc/helptosavestub/models/ContactPreference.scala b/app/uk/gov/hmrc/helptosavestub/models/ContactPreference.scala
@@ -1,5 +1,5 @@
 /*
- * Copyright 2020 HM Revenue & Customs
+ * Copyright 2021 HM Revenue & Customs
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.

diff --git a/app/uk/gov/hmrc/helptosavestub/models/NSIErrorResponse.scala b/app/uk/gov/hmrc/helptosavestub/models/NSIErrorResponse.scala
@@ -1,5 +1,5 @@
 /*
- * Copyright 2020 HM Revenue & Customs
+ * Copyright 2021 HM Revenue & Customs
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.

diff --git a/app/uk/gov/hmrc/helptosavestub/models/NSIPayload.scala b/app/uk/gov/hmrc/helptosavestub/models/NSIPayload.scala
@@ -1,5 +1,5 @@
 /*
- * Copyright 2020 HM Revenue & Customs
+ * Copyright 2021 HM Revenue & Customs
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.

diff --git a/app/uk/gov/hmrc/helptosavestub/util/Delays.scala b/app/uk/gov/hmrc/helptosavestub/util/Delays.scala
@@ -1,5 +1,5 @@
 /*
- * Copyright 2020 HM Revenue & Customs
+ * Copyright 2021 HM Revenue & Customs
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.

diff --git a/app/uk/gov/hmrc/helptosavestub/util/ErrorJson.scala b/app/uk/gov/hmrc/helptosavestub/util/ErrorJson.scala
@@ -1,5 +1,5 @@
 /*
- * Copyright 2020 HM Revenue & Customs
+ * Copyright 2021 HM Revenue & Customs
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.

diff --git a/app/uk/gov/hmrc/helptosavestub/util/Logging.scala b/app/uk/gov/hmrc/helptosavestub/util/Logging.scala
@@ -1,5 +1,5 @@
 /*
- * Copyright 2020 HM Revenue & Customs
+ * Copyright 2021 HM Revenue & Customs
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.

diff --git a/app/uk/gov/hmrc/helptosavestub/util/package.scala b/app/uk/gov/hmrc/helptosavestub/util/package.scala
@@ -1,5 +1,5 @@
 /*
- * Copyright 2020 HM Revenue & Customs
+ * Copyright 2021 HM Revenue & Customs
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.

diff --git a/conf/application.conf b/conf/application.conf
@@ -1,4 +1,4 @@
-# Copyright 2020 HM Revenue & Customs
+# Copyright 2021 HM Revenue & Customs
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
 # you may not use this file except in compliance with the License.

diff --git a/test/uk/gov/hmrc/helptosavestub/controllers/BARSControllerSpec.scala b/test/uk/gov/hmrc/helptosavestub/controllers/BARSControllerSpec.scala
@@ -1,5 +1,5 @@
 /*
- * Copyright 2020 HM Revenue & Customs
+ * Copyright 2021 HM Revenue & Customs
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.

diff --git a/test/uk/gov/hmrc/helptosavestub/controllers/DESThresholdControllerSpec.scala b/test/uk/gov/hmrc/helptosavestub/controllers/DESThresholdControllerSpec.scala
@@ -1,5 +1,5 @@
 /*
- * Copyright 2020 HM Revenue & Customs
+ * Copyright 2021 HM Revenue & Customs
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.

diff --git a/test/uk/gov/hmrc/helptosavestub/controllers/DWPControllerSpec.scala b/test/uk/gov/hmrc/helptosavestub/controllers/DWPControllerSpec.scala
@@ -1,5 +1,5 @@
 /*
- * Copyright 2020 HM Revenue & Customs
+ * Copyright 2021 HM Revenue & Customs
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.

diff --git a/test/uk/gov/hmrc/helptosavestub/controllers/EligibilityCheckControllerSpec.scala b/test/uk/gov/hmrc/helptosavestub/controllers/EligibilityCheckControllerSpec.scala
@@ -1,5 +1,5 @@
 /*
- * Copyright 2020 HM Revenue & Customs
+ * Copyright 2021 HM Revenue & Customs
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.

diff --git a/test/uk/gov/hmrc/helptosavestub/controllers/NSIControllerSpec.scala b/test/uk/gov/hmrc/helptosavestub/controllers/NSIControllerSpec.scala
@@ -1,5 +1,5 @@
 /*
- * Copyright 2020 HM Revenue & Customs
+ * Copyright 2021 HM Revenue & Customs
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.

diff --git a/test/uk/gov/hmrc/helptosavestub/controllers/PayePersonalDetailsControllerSpec.scala b/test/uk/gov/hmrc/helptosavestub/controllers/PayePersonalDetailsControllerSpec.scala
@@ -1,5 +1,5 @@
 /*
- * Copyright 2020 HM Revenue & Customs
+ * Copyright 2021 HM Revenue & Customs
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.

diff --git a/test/uk/gov/hmrc/helptosavestub/controllers/TestSupport.scala b/test/uk/gov/hmrc/helptosavestub/controllers/TestSupport.scala
@@ -1,5 +1,5 @@
 /*
- * Copyright 2020 HM Revenue & Customs
+ * Copyright 2021 HM Revenue & Customs
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.

diff --git a/test/uk/gov/hmrc/helptosavestub/controllers/support/AkkaMaterializerSpec.scala b/test/uk/gov/hmrc/helptosavestub/controllers/support/AkkaMaterializerSpec.scala
@@ -1,5 +1,5 @@
 /*
- * Copyright 2020 HM Revenue & Customs
+ * Copyright 2021 HM Revenue & Customs
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.

diff --git a/test/uk/gov/hmrc/helptosavestub/util/DelaysSpec.scala b/test/uk/gov/hmrc/helptosavestub/util/DelaysSpec.scala
@@ -1,5 +1,5 @@
 /*
- * Copyright 2020 HM Revenue & Customs
+ * Copyright 2021 HM Revenue & Customs
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -24,7 +24,7 @@ import org.scalatest.matchers.should.Matchers
 
 import uk.gov.hmrc.helptosavestub.util.Delays.DelayConfig
 
-import scala.concurrent.{Await, ExecutionContext, Future, TimeoutException}
+import scala.concurrent.{Await, Future, TimeoutException}
 import scala.concurrent.ExecutionContext.Implicits.global
 import scala.concurrent.duration._
 

diff --git a/test/uk/gov/hmrc/helptosavestub/util/UnitSpec.scala b/test/uk/gov/hmrc/helptosavestub/util/UnitSpec.scala
@@ -1,5 +1,5 @@
 /*
- * Copyright 2020 HM Revenue & Customs
+ * Copyright 2021 HM Revenue & Customs
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.