Merge pull request #125 from hmrc/APB-8824

APB-8824: Remove StringFallback utility
hmrc · Oct 11, 2024 · 9975778 · 9975778
2 parents b5a225f + a4d3343
commit 9975778
Show file tree

Hide file tree

Showing 5 changed files with 23 additions and 50 deletions.
diff --git a/README.md b/README.md
@@ -15,8 +15,19 @@ These endpoints are called during the agent subscription journey.
 
 The "refusal to deal with" and "manually assured" lists are maintained by HMRC helpdesk staff (stride users) in agent-helpdesk-frontend.
 
+## Running the tests
+
+    sbt test it/test
+
+## Running the tests with coverage
+
+    sbt clean coverageOn test it/test coverageReport
+
 ## Run the application locally
 
+    sm2 -start AGENT_AUTHORISATION
+    sm2 -stop AGENT_ASSURANCE
+
 To run the application execute
 ```
 ./run.sh

diff --git a/app/uk/gov/hmrc/agentassurance/models/AgencyDetails.scala b/app/uk/gov/hmrc/agentassurance/models/AgencyDetails.scala
@@ -23,7 +23,6 @@ import play.api.libs.json.__
 import play.api.libs.json.Format
 import play.api.libs.json.Json
 import play.api.libs.json.OFormat
-import uk.gov.hmrc.agentassurance.utils.StringFormatFallbackSetup.stringFormatFallback
 import uk.gov.hmrc.crypto.json.JsonEncryption.stringEncrypterDecrypter
 import uk.gov.hmrc.crypto.Decrypter
 import uk.gov.hmrc.crypto.Encrypter
@@ -41,9 +40,9 @@ object AgencyDetails {
 
   def agencyDetailsDatabaseFormat(implicit crypto: Encrypter with Decrypter): Format[AgencyDetails] =
     (__ \ "agencyName")
-      .formatNullable[String](stringFormatFallback(stringEncrypterDecrypter))
-      .and((__ \ "agencyEmail").formatNullable[String](stringFormatFallback(stringEncrypterDecrypter)))
-      .and((__ \ "agencyTelephone").formatNullable[String](stringFormatFallback(stringEncrypterDecrypter)))
+      .formatNullable[String](stringEncrypterDecrypter)
+      .and((__ \ "agencyEmail").formatNullable[String](stringEncrypterDecrypter))
+      .and((__ \ "agencyTelephone").formatNullable[String](stringEncrypterDecrypter))
       .and((__ \ "agencyAddress").formatNullable[BusinessAddress](BusinessAddress.businessAddressDatabaseFormat))(
         AgencyDetails.apply,
         unlift(AgencyDetails.unapply)
@@ -64,12 +63,12 @@ object BusinessAddress {
 
   def businessAddressDatabaseFormat(implicit crypto: Encrypter with Decrypter): Format[BusinessAddress] = {
     (__ \ "addressLine1")
-      .format[String](stringFormatFallback(stringEncrypterDecrypter))
-      .and((__ \ "addressLine2").formatNullable[String](stringFormatFallback(stringEncrypterDecrypter)))
-      .and((__ \ "addressLine3").formatNullable[String](stringFormatFallback(stringEncrypterDecrypter)))
-      .and((__ \ "addressLine4").formatNullable[String](stringFormatFallback(stringEncrypterDecrypter)))
-      .and((__ \ "postalCode").formatNullable[String](stringFormatFallback(stringEncrypterDecrypter)))
-      .and((__ \ "countryCode").format[String](stringFormatFallback(stringEncrypterDecrypter)))(
+      .format[String](stringEncrypterDecrypter)
+      .and((__ \ "addressLine2").formatNullable[String](stringEncrypterDecrypter))
+      .and((__ \ "addressLine3").formatNullable[String](stringEncrypterDecrypter))
+      .and((__ \ "addressLine4").formatNullable[String](stringEncrypterDecrypter))
+      .and((__ \ "postalCode").formatNullable[String](stringEncrypterDecrypter))
+      .and((__ \ "countryCode").format[String](stringEncrypterDecrypter))(
         BusinessAddress.apply,
         unlift(BusinessAddress.unapply)
       )

diff --git a/app/uk/gov/hmrc/agentassurance/models/AgentDetailsDesResponse.scala b/app/uk/gov/hmrc/agentassurance/models/AgentDetailsDesResponse.scala
@@ -23,7 +23,6 @@ import play.api.libs.json.__
 import play.api.libs.json.Format
 import play.api.libs.json.Json
 import play.api.libs.json.OFormat
-import uk.gov.hmrc.agentassurance.utils.StringFormatFallbackSetup.stringFormatFallback
 import uk.gov.hmrc.agentmtdidentifiers.model.SuspensionDetails
 import uk.gov.hmrc.agentmtdidentifiers.model.Utr
 import uk.gov.hmrc.crypto.json.JsonEncryption.stringEncrypterDecrypter
@@ -42,7 +41,7 @@ object AgentDetailsDesResponse {
 
   def agentRecordDatabaseDetailsFormat(implicit crypto: Encrypter with Decrypter): Format[AgentDetailsDesResponse] =
     (__ \ "uniqueTaxReference")
-      .formatNullable[String](stringFormatFallback(stringEncrypterDecrypter))
+      .formatNullable[String](stringEncrypterDecrypter)
       .bimap[Option[Utr]](
         _.map(Utr(_)),
         _.map(_.value)

diff --git a/app/uk/gov/hmrc/agentassurance/utils/StringFormatFallbackSetup.scala b/app/uk/gov/hmrc/agentassurance/utils/StringFormatFallbackSetup.scala
diff --git a/it/test/uk/gov/hmrc/agentassurance/repositories/AgentDetailsCacheRepositoryISpec.scala b/it/test/uk/gov/hmrc/agentassurance/repositories/AgentDetailsCacheRepositoryISpec.scala
@@ -18,6 +18,7 @@ package uk.gov.hmrc.agentassurance.repositories
 
 import scala.concurrent.ExecutionContext.Implicits.global
 import scala.concurrent.Future
+
 import com.codahale.metrics.MetricRegistry
 import org.scalatest.concurrent.Eventually
 import org.scalatest.matchers.should.Matchers
@@ -139,7 +140,7 @@ class AgentDetailsCacheRepositoryISpec
         val result = await(agencyDetailsCacheRepository("agent-2")(Future.successful(agencyDetailsResponse)))
 
         result shouldBe agencyDetailsResponse
-        
+
         eventually {
           await(agencyDetailsCacheRepository.cacheRepo.collection.find().toFuture()).size shouldBe 1
         }