Merge pull request #50 from companieshouse/GCI-1099-refactor-orderid

Gci 1099 refactor orderid

Author: nabeelamirch

src/main/java/uk/gov/companieshouse/orders/api/service/CheckoutService.java

@@ -6,7 +6,9 @@
 import uk.gov.companieshouse.orders.api.repository.CheckoutRepository;
 import uk.gov.companieshouse.orders.api.util.CheckoutHelper;
 
+import java.security.SecureRandom;
 import java.time.LocalDateTime;
+import java.util.Calendar;
 import java.util.List;
 import java.util.Optional;
 
@@ -28,12 +30,23 @@ public CheckoutService(CheckoutRepository checkoutRepository,
         this.checkoutHelper = checkoutHelper;
     }
 
+    private String autoGenerateId() {
+        SecureRandom random = new SecureRandom();
+        byte[] values = new byte[4];
+        random.nextBytes(values);
+        String rand = String.format("%04d", random.nextInt(9999));
+        String time = String.format("%08d", Calendar.getInstance().getTimeInMillis() / 100000L);
+        String rawId = rand + time;
+        String[] tranId = rawId.split("(?<=\\G.{6})");
+        return "ORD-" + String.join("-", tranId);
+    }
+
     public Checkout createCheckout(Item item, String userId, String email, DeliveryDetails deliveryDetails) {
         final LocalDateTime now = LocalDateTime.now();
-        String objectId = new ObjectId().toString();
+        String checkoutId = autoGenerateId();
 
         Checkout checkout = new Checkout();
-        checkout.setId(objectId);
+        checkout.setId(checkoutId);
         checkout.setUserId(userId);
         checkout.setCreatedAt(now);
         checkout.setUpdatedAt(now);
@@ -44,9 +57,9 @@ public Checkout createCheckout(Item item, String userId, String email, DeliveryD
         checkout.getData().setCheckedOutBy(actionedBy);
         checkout.getData().setStatus(PaymentStatus.PENDING);
         checkout.getData().setEtag(etagGeneratorService.generateEtag());
-        checkout.getData().setLinks(linksGeneratorService.generateCheckoutLinks(objectId));
+        checkout.getData().setLinks(linksGeneratorService.generateCheckoutLinks(checkoutId));
         checkout.getData().getItems().add(item);
-        checkout.getData().setReference(objectId);
+        checkout.getData().setReference(checkoutId);
         checkout.getData().setKind("order");
         checkout.getData().setDeliveryDetails(deliveryDetails);
         String totalOrderCostStr = checkoutHelper.calculateTotalOrderCostForCheckout(checkout) + "";

src/test/java/uk/gov/companieshouse/orders/api/service/CheckoutServiceTest.java

@@ -1,5 +1,6 @@
 package uk.gov.companieshouse.orders.api.service;
 
+import org.hamcrest.Matchers;
 import org.junit.jupiter.api.BeforeEach;
 import org.junit.jupiter.api.DisplayName;
 import org.junit.jupiter.api.Test;
@@ -21,6 +22,7 @@
 import static org.hamcrest.MatcherAssert.assertThat;
 import static org.hamcrest.core.Is.is;
 import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertTrue;
 import static org.mockito.ArgumentMatchers.any;
 import static org.mockito.Mockito.*;
 import static uk.gov.companieshouse.orders.api.util.TestConstants.ERIC_AUTHORISED_USER_VALUE;
@@ -189,6 +191,16 @@ void createCheckoutPopulatesTotalOrderCost() {
         assertThat(checkout().getData().getTotalOrderCost(), is(EXPECTED_TOTAL_ORDER_COST + ""));
     }
 
+    @Test
+    @DisplayName("createCheckout populates `id` in the format ORD-######-######")
+    void createCheckoutPopulatesIdCorrectly() {
+        Item certificateItem = createCertificateItem();
+        serviceUnderTest.createCheckout(certificateItem, ERIC_IDENTITY_VALUE,
+                ERIC_AUTHORISED_USER_VALUE, new DeliveryDetails());
+        verify(checkoutRepository).save(checkoutCaptor.capture());
+        assertTrue(checkout().getId().matches("^ORD-\\d{6}-\\d{6}$")); ;
+    }
+
     @Test
     @DisplayName("saveCheckout saves updated checkout correctly")
     void saveCheckoutSavesUpdatedCheckout() {