Fix II url

hmrc · May 2, 2017 · 2ad65c3 · 2ad65c3
1 parent 0667bfd
commit 2ad65c3
Show file tree

Hide file tree

Showing 4 changed files with 15 additions and 8 deletions.
diff --git a/app/connectors/IncorporationInformationConnector.scala b/app/connectors/IncorporationInformationConnector.scala
@@ -37,19 +37,21 @@ class IncorporationInformationResponseException(msg: String) extends NoStackTrac
 @Singleton
 class IncorporationInformationConnector @Inject()() extends IncorporationInformationConnect with ServicesConfig {
   val http = WSHttp
-  val incorporationInformationUri: String = baseUrl("incorporation-information")
+  lazy val incorporationInformationUri: String = baseUrl("incorporation-information")
+  lazy val payeRegUri: String = baseUrl("paye-registration")
 }
 
 trait IncorporationInformationConnect {
   val http: WSPost
   val incorporationInformationUri: String
+  val payeRegUri: String
 
   private[connectors] def constructIncorporationInfoUri(transactionId: String, regime: String, subscriber: String): String = {
     s"/incorporation-information/subscribe/$transactionId/regime/$regime/subscriber/$subscriber"
   }
 
-  def getIncorporationUpdate(transactionId: String, regime: String, subscriber: String, callbackUrl: String)(implicit hc: HeaderCarrier): Future[Option[IncorpStatusUpdate]] = {
-    val postJson = Json.obj("SCRSIncorpSubscription" -> Json.obj("callbackUrl" -> callbackUrl))
+  def getIncorporationUpdate(transactionId: String, regime: String, subscriber: String)(implicit hc: HeaderCarrier): Future[Option[IncorpStatusUpdate]] = {
+    val postJson = Json.obj("SCRSIncorpSubscription" -> Json.obj("callbackUrl" -> s"$payeRegUri/incorporation-data"))
     http.POST[JsObject, HttpResponse](s"$incorporationInformationUri${constructIncorporationInfoUri(transactionId, regime, subscriber)}", postJson) map { resp =>
       resp.status match {
         case OK => Some(resp.json.as[IncorpStatusUpdate])

diff --git a/app/services/SubmissionService.scala b/app/services/SubmissionService.scala
@@ -72,7 +72,6 @@ trait SubmissionSrv {
 
   private val REGIME = "paye"
   private val SUBSCRIBER = "SCRS"
-  private val CALLBACK_URL = controllers.routes.RegistrationController.processIncorporationData().url
   private val rejected = "rejected"
 
   def submitToDes(regId: String)(implicit hc: HeaderCarrier, req: Request[AnyContent]): Future[String] = {
@@ -104,7 +103,7 @@ trait SubmissionSrv {
   def getIncorporationUpdate(regId: String)(implicit hc: HeaderCarrier): Future[Option[IncorpStatusUpdate]] = {
     for {
       txId      <- registrationRepository.retrieveTransactionId(regId)
-      incStatus <- incorporationInformationConnector.getIncorporationUpdate(txId, REGIME, SUBSCRIBER, CALLBACK_URL) map {
+      incStatus <- incorporationInformationConnector.getIncorporationUpdate(txId, REGIME, SUBSCRIBER) map {
         case Some(update) if update.status == rejected => throw new RejectedIncorporationException(s"incorporation for regId $regId has been rejected")
         case response => response
       }

diff --git a/conf/application.conf b/conf/application.conf
@@ -187,6 +187,11 @@ microservice {
       host = localhost
       port = 9660
     }
+
+    paye-registration {
+      host = localhost
+      port = 9873
+    }
   }
 }
 

diff --git a/test/connectors/IncorporationInformationConnectorSpec.scala b/test/connectors/IncorporationInformationConnectorSpec.scala
@@ -60,6 +60,7 @@ class IncorporationInformationConnectorSpec extends PAYERegSpec {
   class Setup {
     val testConnector = new IncorporationInformationConnect {
       override val incorporationInformationUri: String = "/test/uri"
+      override val payeRegUri: String = "/test-reg/"
       override val http: WSHttp = mockHttp
     }
   }
@@ -84,7 +85,7 @@ class IncorporationInformationConnectorSpec extends PAYERegSpec {
         when(mockHttp.POST[JsObject, HttpResponse](ArgumentMatchers.any(), ArgumentMatchers.any(), ArgumentMatchers.any())(ArgumentMatchers.any(), ArgumentMatchers.any(), ArgumentMatchers.any()))
           .thenReturn(Future.successful(testResponse))
 
-        val result = await(testConnector.getIncorporationUpdate("testTxId", "paye", "SCRS", "/test/call-back"))
+        val result = await(testConnector.getIncorporationUpdate("testTxId", "paye", "SCRS"))
         result shouldBe Some(Json.fromJson[IncorpStatusUpdate](testJson).get)
       }
     }
@@ -98,7 +99,7 @@ class IncorporationInformationConnectorSpec extends PAYERegSpec {
         when(mockHttp.POST[JsObject, HttpResponse](ArgumentMatchers.any(), ArgumentMatchers.any(), ArgumentMatchers.any())(ArgumentMatchers.any(), ArgumentMatchers.any(), ArgumentMatchers.any()))
           .thenReturn(Future.successful(testResponse))
 
-        val result = await(testConnector.getIncorporationUpdate("testTxId", "paye", "SCRS", "/test/call-back"))
+        val result = await(testConnector.getIncorporationUpdate("testTxId", "paye", "SCRS"))
         result shouldBe None
       }
     }
@@ -112,7 +113,7 @@ class IncorporationInformationConnectorSpec extends PAYERegSpec {
         when(mockHttp.POST[JsObject, HttpResponse](ArgumentMatchers.any(), ArgumentMatchers.any(), ArgumentMatchers.any())(ArgumentMatchers.any(), ArgumentMatchers.any(), ArgumentMatchers.any()))
           .thenReturn(Future.successful(testResponse))
 
-        val result = intercept[IncorporationInformationResponseException](await(testConnector.getIncorporationUpdate("testTxId", "paye", "SCRS", "/test/call-back")))
+        val result = intercept[IncorporationInformationResponseException](await(testConnector.getIncorporationUpdate("testTxId", "paye", "SCRS")))
         result.getMessage shouldBe s"Calling II on /incorporation-information/subscribe/testTxId/regime/paye/subscriber/SCRS returned a 500"
       }
     }