SASS-8272: DES clean up and fix 1938 API (#49)

Fix API 1938, Clean up DES API connectors and references and upgrade dependencies
hmrc · May 21, 2024 · b51ce7c · b51ce7c
1 parent ea25df0
commit b51ce7c
Show file tree

Hide file tree

Showing 15 changed files with 8 additions and 433 deletions.
diff --git a/app/config/AppConfig.scala b/app/config/AppConfig.scala
@@ -38,8 +38,4 @@ class AppConfig @Inject()(servicesConfig: ServicesConfig) {
   lazy val useEncryption: Boolean = servicesConfig.getBoolean("useEncryption")
 
   def authorisationTokenFor(apiVersion: String): String = servicesConfig.getString(authorisationTokenKey + s".$apiVersion")
-
-  lazy val desBaseUrl: String = servicesConfig.baseUrl(serviceName = "des")
-  lazy val desEnvironment: String = servicesConfig.getString(key = "microservice.services.des.environment")
-  lazy val desAuthorisationToken: String = servicesConfig.getString(key = "microservice.services.des.authorisation-token")
 }
diff --git a/app/connectors/DESConnector.scala b/app/connectors/DESConnector.scala
diff --git a/app/connectors/DataExchangeServiceConnector.scala b/app/connectors/DataExchangeServiceConnector.scala
diff --git a/app/connectors/IntegrationFrameworkConnector.scala b/app/connectors/IntegrationFrameworkConnector.scala
@@ -52,8 +52,8 @@ class IntegrationFrameworkConnector @Inject()(httpClient: HttpClient,
 
   def getAllStateBenefitsData(taxYear: Int, nino: String)
                              (implicit hc: HeaderCarrier): Future[Either[ApiError, Option[AllStateBenefitsData]]] = {
-    val (url, apiVersion) = if (shouldUse2324(taxYear)) {
-      (new URL(s"$baseUrl/income-tax/income/state-benefits/23-24/$nino"), getApi2324Version)
+    val (url, apiVersion) = if (isAfter2324Api(taxYear)) {
+      (new URL(s"$baseUrl/income-tax/income/state-benefits/${asTys(taxYear)}/$nino"), getApi2324Version)
     } else {
       (new URL(s"$baseUrl/income-tax/income/state-benefits/$nino/${toTaxYearParam(taxYear)}"), getApiVersion)
     }
@@ -209,10 +209,6 @@ class IntegrationFrameworkConnector @Inject()(httpClient: HttpClient,
     s"${taxYear - 1}-${taxYear.toString takeRight 2}"
   }
 
-  private def shouldUse2324(taxYear: Int): Boolean = {
-    taxYear == 2024
-  }
-
   private def isAfter2324Api(taxYear: Int): Boolean = {
     taxYear >= 2024
   }

diff --git a/app/services/DESService.scala b/app/services/DESService.scala
diff --git a/conf/application.conf b/conf/application.conf
@@ -74,14 +74,6 @@ microservice {
       port = 8500
     }
 
-    des {
-      host = "localhost"
-      environment = "test"
-      authorisation-token = "secret"
-      port = 9303
-      #This is the port for the income-tax-submission-stub
-    }
-
     integration-framework {
       host = "localhost"
       environment = "test"

diff --git a/it/test/connectors/DataExchangeServiceConnectorISpec.scala b/it/test/connectors/DataExchangeServiceConnectorISpec.scala
diff --git a/project/AppDependencies.scala b/project/AppDependencies.scala
@@ -18,8 +18,8 @@ import sbt.*
 
 object AppDependencies {
 
-  private val bootstrapBackendPlay30Version = "8.5.0"
-  private val hmrcMongoPlay30Version = "1.7.0"
+  private val bootstrapBackendPlay30Version = "8.6.0"
+  private val hmrcMongoPlay30Version = "1.9.0"
 
   val compile: Seq[ModuleID] = Seq(
     "uk.gov.hmrc"                   %% "bootstrap-backend-play-30"  % bootstrapBackendPlay30Version,

diff --git a/project/plugins.sbt b/project/plugins.sbt
@@ -22,8 +22,8 @@ ThisBuild / libraryDependencySchemes ++= Seq(
   "org.scala-lang.modules" %% "scala-xml" % VersionScheme.Always
 )
 
-addSbtPlugin("uk.gov.hmrc"       % "sbt-auto-build"         % "3.20.0")
+addSbtPlugin("uk.gov.hmrc"       % "sbt-auto-build"         % "3.21.0")
 addSbtPlugin("uk.gov.hmrc"       % "sbt-distributables"     % "2.5.0")
-addSbtPlugin("org.playframework" % "sbt-plugin"             % "3.0.2")
+addSbtPlugin("org.playframework" % "sbt-plugin"             % "3.0.3")
 addSbtPlugin("org.scoverage"     % "sbt-scoverage"          % "2.0.9")
 addSbtPlugin("org.scalastyle"    %% "scalastyle-sbt-plugin" % "1.0.0")
diff --git a/test/connectors/DESConnectorSpec.scala b/test/connectors/DESConnectorSpec.scala