[DTR-2857] ad hoc fix (#52)

Author: yanshengzhangHMRC

app/uk/gov/hmrc/formpproxy/cis/models/requests/UpdateMonthlyReturnItemRequest.scala

@@ -28,7 +28,7 @@ case class UpdateMonthlyReturnItemRequest(
   costOfMaterials: String,
   totalDeducted: String,
   subcontractorName: String,
-  verificationNumber: String
+  verificationNumber: Option[String]
 )
 
 object UpdateMonthlyReturnItemRequest:

app/uk/gov/hmrc/formpproxy/cis/repositories/CisFormpRepository.scala

@@ -665,7 +665,7 @@ class CisFormpRepository @Inject() (@NamedDatabase("cis") db: Database)(implicit
       cs.setString(7, req.costOfMaterials)
       cs.setString(8, req.totalDeducted)
       cs.setString(9, req.subcontractorName)
-      cs.setString(10, req.verificationNumber)
+      cs.setOptionalString(10, req.verificationNumber)
       cs.setNull(11, Types.INTEGER)
       cs.registerOutParameter(11, Types.INTEGER)
       cs.execute()

app/uk/gov/hmrc/formpproxy/cis/repositories/CisStoredProcedures.scala

@@ -48,6 +48,6 @@ object CisStoredProcedures {
     "{ call SUBMISSION_ADMIN.UpdateGovtalkStatus(?, ?, ?, ?) }"
   val CallUpdateGovTalkStatusStatistics   =
     "{ call SUBMISSION_ADMIN.UpdateGovtalkStatistics(?, ?, ?, ?, ?, ?) }"
-  val CallCreateGovTalkStatus           =
+  val CallCreateGovTalkStatus             =
     "{ call SUBMISSION_ADMIN.InsertInitialGovTalkStatus(?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?) }"
 }

test/uk/gov/hmrc/formpproxy/cis/controllers/MonthlyReturnControllerSpec.scala

@@ -227,7 +227,7 @@ class MonthlyReturnControllerSpec extends AnyFreeSpec with Matchers with ScalaFu
         costOfMaterials = "10.00",
         totalDeducted = "18.00",
         subcontractorName = "Some Subbie",
-        verificationNumber = "V123456"
+        verificationNumber = Some("V123456")
       )
 
       when(mockService.updateMonthlyReturnItem(eqTo(requestBody)))
@@ -256,7 +256,7 @@ class MonthlyReturnControllerSpec extends AnyFreeSpec with Matchers with ScalaFu
         costOfMaterials = "10.00",
         totalDeducted = "18.00",
         subcontractorName = "Some Subbie",
-        verificationNumber = "V123456"
+        verificationNumber = Some("V123456")
       )
 
       val err = UpstreamErrorResponse("formp failed", BAD_GATEWAY, BAD_GATEWAY)
@@ -287,7 +287,7 @@ class MonthlyReturnControllerSpec extends AnyFreeSpec with Matchers with ScalaFu
         costOfMaterials = "10.00",
         totalDeducted = "18.00",
         subcontractorName = "Some Subbie",
-        verificationNumber = "V123456"
+        verificationNumber = Some("V123456")
       )
 
       when(mockService.updateMonthlyReturnItem(eqTo(requestBody)))

test/uk/gov/hmrc/formpproxy/cis/models/requests/UpdateMonthlyReturnItemRequestSpec.scala

@@ -32,7 +32,7 @@ class UpdateMonthlyReturnItemRequestSpec extends AnyWordSpec with Matchers {
     costOfMaterials = "250.00",
     totalDeducted = "150.00",
     subcontractorName = "John Smith Ltd",
-    verificationNumber = "V1234567"
+    verificationNumber = Some("V1234567")
   )
 
   private val json: JsValue = Json.parse("""
@@ -85,7 +85,6 @@ class UpdateMonthlyReturnItemRequestSpec extends AnyWordSpec with Matchers {
           paths must contain("/costOfMaterials")
           paths must contain("/totalDeducted")
           paths must contain("/subcontractorName")
-          paths must contain("/verificationNumber")
         case _               =>
           fail("Expected JsError for missing fields")
       }

test/uk/gov/hmrc/formpproxy/cis/repositories/CisFormpRepositorySpec.scala

@@ -25,6 +25,7 @@ import play.api.db.Database
 import uk.gov.hmrc.formpproxy.base.SpecBase
 import uk.gov.hmrc.formpproxy.cis.models.requests.*
 import uk.gov.hmrc.formpproxy.cis.models.*
+import uk.gov.hmrc.formpproxy.shared.utils.CallableStatementUtils.*
 
 import java.sql.*
 import java.time.{Instant, LocalDateTime}
@@ -1879,7 +1880,7 @@ final class CisFormpRepositorySpec extends SpecBase {
         costOfMaterials = "100.00",
         totalDeducted = "100.00",
         subcontractorName = "Charles, C",
-        verificationNumber = "V1000000009"
+        verificationNumber = Some("V1000000009")
       )
 
       repo.updateMonthlyReturnItem(req).futureValue mustBe (())
@@ -1899,7 +1900,7 @@ final class CisFormpRepositorySpec extends SpecBase {
       verify(csUpdateItem).setString(7, "100.00")
       verify(csUpdateItem).setString(8, "100.00")
       verify(csUpdateItem).setString(9, "Charles, C")
-      verify(csUpdateItem).setString(10, "V1000000009")
+      verify(csUpdateItem).setOptionalString(10, Some("V1000000009"))
 
       verify(csUpdateItem).setNull(11, Types.INTEGER)
       verify(csUpdateItem).registerOutParameter(11, Types.INTEGER)

test/uk/gov/hmrc/formpproxy/cis/services/MonthlyReturnServiceSpec.scala

@@ -191,7 +191,7 @@ final class MonthlyReturnServiceSpec extends SpecBase {
         costOfMaterials = "200.00",
         totalDeducted = "80.00",
         subcontractorName = "ABC Ltd",
-        verificationNumber = "V123456"
+        verificationNumber = Some("V123456")
       )
 
       when(repo.updateMonthlyReturnItem(eqTo(request)))
@@ -214,7 +214,7 @@ final class MonthlyReturnServiceSpec extends SpecBase {
         costOfMaterials = "200.00",
         totalDeducted = "80.00",
         subcontractorName = "ABC Ltd",
-        verificationNumber = "V123456"
+        verificationNumber = Some("V123456")
       )
 
       val boom = new RuntimeException("db failed")