Merge pull request #66 from hmrc/MTDSA-1418

MTDSA-1418 Unexpected http status code (201) when sending VAT submission
hmrc · Mar 1, 2018 · 9c0f6f8 · 9c0f6f8
2 parents ecb0f15 + df6f15f
commit 9c0f6f8
Show file tree

Hide file tree

Showing 4 changed files with 13 additions and 3 deletions.
diff --git a/app/uk/gov/hmrc/vatapi/resources/VatReturnsResource.scala b/app/uk/gov/hmrc/vatapi/resources/VatReturnsResource.scala
@@ -47,7 +47,8 @@ object VatReturnsResource extends BaseController {
         _ <-  audit(SubmitVatReturnEvent(vrn, response))
       } yield response
     } onSuccess { response =>
-      response.filter { case 200 => Created(Json.toJson(response.vatReturnOrError.toOption)) }
+      response.filter { case 200 => response.jsonOrError match {
+            case Right(vatReturn) => Created(Json.toJson(vatReturn))} }
     }
   }
 

diff --git a/func/uk/gov/hmrc/support/BaseFunctionalSpec.scala b/func/uk/gov/hmrc/support/BaseFunctionalSpec.scala
@@ -850,7 +850,13 @@ trait BaseFunctionalSpec extends TestApplication {
               .willReturn(
                 aResponse()
                   .withStatus(200)
-                  .withBody("[]")
+                  .withBody(s"""
+                               |{
+                               |    "processingDate": "2018-03-01T11:43:43.195Z",
+                               |    "paymentIndicator": "BANK",
+                               |    "formBundleNumber": "891713832155"
+                               |}
+                            """.stripMargin)
               )
           )
           givens

diff --git a/func/uk/gov/hmrc/vatapi/resources/ValueAddedTaxReturnsSpec.scala b/func/uk/gov/hmrc/vatapi/resources/ValueAddedTaxReturnsSpec.scala
@@ -28,6 +28,9 @@ class ValueAddedTaxReturnsSpec extends BaseFunctionalSpec {
         .post(s"/$vrn/returns", Some(Json.parse(body())))
         .thenAssertThat()
         .statusIs(201)
+        .bodyHasPath("\\paymentIndicator", "BANK")
+        .bodyHasPath("\\processingDate", "2018-03-01T11:43:43.195Z")
+        .bodyHasPath("\\formBundleNumber", "891713832155")
     }
 
     "not allow users to submit undeclared VAT returns" in {

diff --git a/public/api/conf/1.0/application.raml b/public/api/conf/1.0/application.raml
@@ -169,7 +169,7 @@ traits:
             type: !include schemas/VatReturnDeclaration.json
             example: !include examples/VatReturnDeclaration.json
         responses:
-          200:
+          201:
             headers:
               X-CorrelationId:
                 example: 5968c22d620000620096db5f