Merge pull request #142 from companieshouse/feature/gci-2239_refactor_get_checkout_item_endpoint

GCI-2335 Change getCheckoutItem to return checkout data

Author: kinpang-CH

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

@@ -102,7 +102,7 @@ public ResponseEntity<Item> getOrderItem(final @PathVariable("id") String orderI
     }
 
     @GetMapping(GET_CHECKOUT_ITEM_URI)
-    public ResponseEntity<Checkout> getCheckoutItem(final @PathVariable("id") String checkoutId,
+    public ResponseEntity<CheckoutData> getCheckoutItem(final @PathVariable("id") String checkoutId,
             final @PathVariable("itemId") String itemId,
             final @RequestHeader(REQUEST_ID_HEADER_NAME) String requestId) {
         Map<String, Object> logMap = createLogMapWithRequestId(requestId);
@@ -113,7 +113,7 @@ public ResponseEntity<Checkout> getCheckoutItem(final @PathVariable("id") String
                                  .orElseThrow(ResourceNotFoundException::new);
         logMap.put(LoggingUtils.STATUS, HttpStatus.OK);
         LOGGER.info("Checkout with item found and returned", logMap);
-        return ResponseEntity.ok().body(checkout);
+        return ResponseEntity.ok().body(checkout.getData());
     }
 
     @GetMapping(GET_CHECKOUT_URI)

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

@@ -582,11 +582,8 @@ void getCheckoutItem() throws Exception {
                         "12345678")));
         checkoutRepository.save(preexistingCheckout);
 
-        final Checkout expectedCheckout = new Checkout();
-        expectedCheckout.setId(CHECKOUT_ID);
         final CheckoutData expectedCheckoutData = new CheckoutData();
         expectedCheckoutData.setItems(Collections.singletonList(expectedItem));
-        expectedCheckout.setData(expectedCheckoutData);
 
         mockMvc.perform(get("/checkouts/"+CHECKOUT_ID+"/items/CCD-123456-123456")
                        .header(REQUEST_ID_HEADER_NAME, TOKEN_REQUEST_ID_VALUE)
@@ -596,7 +593,7 @@ void getCheckoutItem() throws Exception {
                        .header(ERIC_AUTHORISED_TOKEN_PERMISSIONS, String.format(TOKEN_PERMISSION_VALUE, Permission.Value.READ))
                        .contentType(MediaType.APPLICATION_JSON))
                .andExpect(status().isOk())
-               .andExpect(content().json(mapper.writeValueAsString(expectedCheckout)));
+               .andExpect(content().json(mapper.writeValueAsString(expectedCheckoutData)));
     }
 
     @DisplayName("Get checkout item returns HTTP 404 Not Found if no matching item ID")