Merge pull request #38 from hmrc/fix_field_name

Fix field name
hmrc · Apr 14, 2016 · 9c978fc · 9c978fc
2 parents 4f4acc3 + 9a7f71d
commit 9c978fc
Show file tree

Hide file tree

Showing 6 changed files with 15 additions and 15 deletions.
diff --git a/app/connectors/GmpBulkConnector.scala b/app/connectors/GmpBulkConnector.scala
@@ -41,7 +41,6 @@ trait GmpBulkConnector extends ServicesConfig{
 
  val baseURI = s"gmp${getUser(user)}/gmp/bulk-data"
  val bulkUri = s"$serviceURL/$baseURI/"
- println(bulkUri)
  val result = httpPost.POST[BulkCalculationRequest, HttpResponse](bulkUri,bcr)
 
  Logger.debug(s"[GmpBulkConnector][sendBulkRequest][POST] : $bcr")

diff --git a/app/events/ContributionsAndEarningsEvent.scala b/app/events/ContributionsAndEarningsEvent.scala
@@ -23,4 +23,4 @@ class ContributionsAndEarningsEvent(userId: String, nino: String)(implicit hc: H
  Map(
  "userId" -> userId,
  "nino" -> nino
- ))
+ ))
diff --git a/app/models/BulkCalculationRequest.scala b/app/models/BulkCalculationRequest.scala
@@ -22,7 +22,7 @@ case class CalculationRequestLine(scon: String,
  nino: String,
  firstForename: String,
  surname: String,
- memberRef: Option[String],
+ memberReference: Option[String],
  calctype: Option[Int],
  terminationDate: Option[String] = None,
  revaluationDate: Option[String] = None,
@@ -35,7 +35,7 @@ object CalculationRequestLine {
 }
 
 case class BulkCalculationRequestLine(lineId: Int,
- calculationRequestLine: Option[CalculationRequestLine],
+ validCalculationRequest: Option[CalculationRequestLine],
  validationError: Option[String]
  )
 

diff --git a/app/models/CallBackData.scala b/app/models/CallBackData.scala
@@ -18,7 +18,8 @@ package models
 
 import play.api.libs.json.{JsObject, Json}
 
-case class CallBackData(collection: String, id: String, length: Long, name: Option[String], contentType: Option[String], sessionId: String, customMetadata: Option[JsObject])
+case class CallBackData(collection: String, id: String, length: Long, name: Option[String], contentType: Option[String], sessionId: String,
+ customMetadata: Option[JsObject])
 
 object CallBackData {
  implicit val format = Json.format[CallBackData]

diff --git a/test/controllers/BulkRequestReceivedControllerSpec.scala b/test/controllers/BulkRequestReceivedControllerSpec.scala
@@ -125,7 +125,7 @@ class BulkRequestReceivedControllerSpec extends PlaySpec with OneServerPerSuite
  }
 
  def lineListFromCalculationRequestLine(line: BulkCalculationRequestLine): List[Char] = {
- val l = line.calculationRequestLine.get.productIterator.toList
+ val l = line.validCalculationRequest.get.productIterator.toList
 
  def process(item: Any) = {
  val dateRegEx = """([0-9][0-9][0-9][0-9]-[0-9][0-9]-[0-9][0-9])""".r

diff --git a/test/services/BulkRequestCreationServiceSpec.scala b/test/services/BulkRequestCreationServiceSpec.scala
@@ -90,20 +90,20 @@ class BulkRequestCreationServiceSpec extends PlaySpec with ScalaFutures with Moc
 
  val bulkRequest: BulkCalculationRequest = TestBulkRequestCreationService.createBulkRequest(collection, "4", bulkRequest4.email, bulkRequest4.reference)
 
- bulkRequest.calculationRequests.head.calculationRequestLine.get.revaluationDate mustBe None
- bulkRequest.calculationRequests.head.calculationRequestLine.get.terminationDate mustBe None
+ bulkRequest.calculationRequests.head.validCalculationRequest.get.revaluationDate mustBe None
+ bulkRequest.calculationRequests.head.validCalculationRequest.get.terminationDate mustBe None
  }
 
  "contain Nones for other options" in {
 
  val bulkRequest: BulkCalculationRequest = TestBulkRequestCreationService.createBulkRequest(collection, "5", bulkRequest4.email, bulkRequest4.reference)
 
- bulkRequest.calculationRequests.head.calculationRequestLine.get.revaluationDate mustBe None
- bulkRequest.calculationRequests.head.calculationRequestLine.get.terminationDate mustBe None
- bulkRequest.calculationRequests.head.calculationRequestLine.get.calctype mustBe None
- bulkRequest.calculationRequests.head.calculationRequestLine.get.dualCalc mustBe None
- bulkRequest.calculationRequests.head.calculationRequestLine.get.memberRef mustBe None
- bulkRequest.calculationRequests.head.calculationRequestLine.get.revaluationRate mustBe None
+ bulkRequest.calculationRequests.head.validCalculationRequest.get.revaluationDate mustBe None
+ bulkRequest.calculationRequests.head.validCalculationRequest.get.terminationDate mustBe None
+ bulkRequest.calculationRequests.head.validCalculationRequest.get.calctype mustBe None
+ bulkRequest.calculationRequests.head.validCalculationRequest.get.dualCalc mustBe None
+ bulkRequest.calculationRequests.head.validCalculationRequest.get.memberReference mustBe None
+ bulkRequest.calculationRequests.head.validCalculationRequest.get.revaluationRate mustBe None
  }
 
  "return Bulk Request with correct line numbers" in {
@@ -116,7 +116,7 @@ class BulkRequestCreationServiceSpec extends PlaySpec with ScalaFutures with Moc
  }
 
  def lineListFromCalculationRequestLine(line: BulkCalculationRequestLine): List[Char] = {
- val l = line.calculationRequestLine.get.productIterator.toList
+ val l = line.validCalculationRequest.get.productIterator.toList
 
  def process(item: Any) = {
  val dateRegEx = """([0-9][0-9][0-9][0-9]-[0-9][0-9]-[0-9][0-9])""".r