Merge pull request #187 from companieshouse/bi-12452-proposed-fix-free-checkout-status

Bi 12452 proposed fix free checkout status

Author: tombradley1

src/main/java/uk/gov/companieshouse/orders/api/controller/BasketController.java

@@ -424,6 +424,9 @@ public ResponseEntity<?> checkoutBasket(@RequestBody(required = false) String js
             LOGGER.infoRequest(request, "Basket checkout completed no payment required", logMap);
             checkoutData.setPaymentReference("FREEINTERNALORDER");
 
+            checkoutData.setStatus(PaymentStatus.FREE);
+            //Now that the payment ref and payment status are set, update the checkout object in db
+            updateFreeOrderCheckout(checkout);
             processOrder(checkout, logMap);
             LOGGER.infoRequest(request, "Free order processed", logMap);
             return new ResponseEntity<>(checkoutData, OK);
@@ -503,7 +506,6 @@ public ResponseEntity<String> patchBasketPaymentDetails(@NonNull final @RequestB
         } else {
 
             // Update the checkout of non-paid order
-            checkoutData.setStatus(PaymentStatus.FREE);
             updateCheckout(checkout, basketPaymentRequestDTO);
             LOGGER.infoRequest(request, "Checkout updated for order not requiring any payment", logMap);
         }
@@ -579,6 +581,10 @@ private Checkout updateCheckout(final Checkout checkout, final BasketPaymentRequ
         return checkout;
     }
 
+    private void updateFreeOrderCheckout(final Checkout checkout) {
+        checkoutService.saveCheckout(checkout);
+    }
+
     /**
      * Performs the actions required to process a successful payment.
      *

src/test/java/uk/gov/companieshouse/orders/api/controller/BasketControllerIntegrationTest.java

@@ -1058,6 +1058,8 @@ void checkoutBasketReturns200WhenTotalOrderCostIsZero() throws Exception {
         assertEquals(1, checkoutRepository.count());
         final Optional<Checkout> retrievedCheckout = checkoutRepository.findById(responseCheckoutData.getReference());
         assertTrue(retrievedCheckout.isPresent());
+        assertThat(retrievedCheckout.get().getData().getStatus().getJsonName(), is("free"));
+        assertThat(retrievedCheckout.get().getData().getPaymentReference(), is("FREEINTERNALORDER"));
         final Item retrievedItem = retrievedCheckout.get().getData().getItems().get(0);
         assertThat(retrievedItem.getItemCosts(), is(ITEM_COSTS_ZERO));
         assertThat(retrievedItem.getPostageCost(), is(POSTAGE_COST));

src/test/java/uk/gov/companieshouse/orders/api/controller/BasketControllerTest.java

@@ -612,8 +612,8 @@ void controllerCreatesCheckoutWhenTotalCostIsFree() {
     }
 
     @Test
-    @DisplayName("Payment Reference is set value when free orders ")
-    void controllerSetsPaymentReferenceWhenIsNotFreeOrder() {
+    @DisplayName("Payment Reference/Status is set to expected value when free order")
+    void controllerSetsCheckoutValuesWhenIsFreeOrder() {
         // given
         Basket basket = createBasket();
         basket.getData().setItems(Arrays.asList(certificate));
@@ -635,6 +635,7 @@ void controllerSetsPaymentReferenceWhenIsNotFreeOrder() {
         // then
         assertEquals(OK, actual.getStatusCode());
         assertEquals("FREEINTERNALORDER", checkout.getData().getPaymentReference());
+        assertEquals(PaymentStatus.FREE, checkout.getData().getStatus());
     }
 
     @Test