Merge pull request #5 from companieshouse/PCI-655-checkout-collection

Pci 655 checkout collection

Author: nabeelamirch

pom.xml

@@ -24,9 +24,22 @@
 		<mockito-junit-jupiter-version>2.18.0</mockito-junit-jupiter-version>
 		<hamcrest-all-version>1.3</hamcrest-all-version>
 		<start-class>uk.gov.companieshouse.orders.api.OrdersApiApplication</start-class>
+		<private-api-sdk-java.version>2.0.20</private-api-sdk-java.version>
+		<api-sdk-manager-java-library.version>1.0.2</api-sdk-manager-java-library.version>
+		<api-sdk-java.version>4.1.48</api-sdk-java.version>
 	</properties>
 
 	<dependencies>
+		<dependency>
+			<groupId>uk.gov.companieshouse</groupId>
+			<artifactId>private-api-sdk-java</artifactId>
+			<version>${private-api-sdk-java.version}</version>
+		</dependency>
+		<dependency>
+			<groupId>uk.gov.companieshouse</groupId>
+			<artifactId>api-sdk-java</artifactId>
+			<version>${api-sdk-java.version}</version>
+		</dependency>
 		<dependency>
 			<groupId>org.springframework.boot</groupId>
 			<artifactId>spring-boot-starter-data-mongodb</artifactId>
@@ -97,6 +110,11 @@
 			<artifactId>de.flapdoodle.embed.mongo</artifactId>
 			<scope>test</scope>
 		</dependency>
+		<dependency>
+			<groupId>uk.gov.companieshouse</groupId>
+			<artifactId>api-sdk-manager-java-library</artifactId>
+			<version>${api-sdk-manager-java-library.version}</version>
+		</dependency>
 	</dependencies>
 
 	<build>

routes.yaml

@@ -2,4 +2,4 @@ app_name: orders.api.ch.gov.uk
 group: api
 weight: 991
 routes:
-   1: ^/basket/items
+   1: ^/basket/*

src/main/java/uk/gov/companieshouse/orders/api/client/ApiClient.java

@@ -0,0 +1,14 @@
+package uk.gov.companieshouse.orders.api.client;
+
+import org.springframework.stereotype.Component;
+import uk.gov.companieshouse.api.InternalApiClient;
+import uk.gov.companieshouse.sdk.manager.ApiSdkManager;
+
+@Component
+public class ApiClient {
+
+    public InternalApiClient getInternalApiClient() {
+        return ApiSdkManager.getPrivateSDK();
+    }
+
+}

src/main/java/uk/gov/companieshouse/orders/api/config/MongoConfig.java

@@ -2,12 +2,19 @@
 
 import org.springframework.context.annotation.Bean;
 import org.springframework.context.annotation.Configuration;
+import org.springframework.core.convert.converter.ConverterFactory;
 import org.springframework.data.mongodb.MongoDbFactory;
 import org.springframework.data.mongodb.core.convert.DbRefResolver;
 import org.springframework.data.mongodb.core.convert.DefaultDbRefResolver;
 import org.springframework.data.mongodb.core.convert.DefaultMongoTypeMapper;
 import org.springframework.data.mongodb.core.convert.MappingMongoConverter;
+import org.springframework.data.mongodb.core.convert.MongoCustomConversions;
 import org.springframework.data.mongodb.core.mapping.MongoMappingContext;
+import uk.gov.companieshouse.orders.api.converter.EnumToStringConverterFactory;
+import uk.gov.companieshouse.orders.api.converter.StringToEnumConverterFactory;
+
+import java.util.ArrayList;
+import java.util.List;
 
 @Configuration
 public class MongoConfig {
@@ -28,6 +35,11 @@ public MappingMongoConverter mappingMongoConverter(final MongoDbFactory factory,
         // Don't save _class to mongo
         mappingConverter.setTypeMapper(new DefaultMongoTypeMapper(null));
 
+        final List<ConverterFactory<?, ?>> converters = new ArrayList<>();
+        converters.add(new StringToEnumConverterFactory());
+        converters.add(new EnumToStringConverterFactory());
+        mappingConverter.setCustomConversions(new MongoCustomConversions(converters));
+
         return mappingConverter;
     }
 }

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

@@ -2,23 +2,35 @@
 
 import org.springframework.http.HttpStatus;
 import org.springframework.http.ResponseEntity;
-import org.springframework.web.bind.annotation.*;
+import org.springframework.web.bind.annotation.PostMapping;
+import org.springframework.web.bind.annotation.RequestBody;
+import org.springframework.web.bind.annotation.RequestHeader;
+import org.springframework.web.bind.annotation.RestController;
+import uk.gov.companieshouse.logging.Logger;
+import uk.gov.companieshouse.logging.LoggerFactory;
 import uk.gov.companieshouse.orders.api.dto.AddToBasketRequestDTO;
 import uk.gov.companieshouse.orders.api.dto.AddToBasketResponseDTO;
+import uk.gov.companieshouse.orders.api.exception.ConflictException;
 import uk.gov.companieshouse.orders.api.mapper.BasketMapper;
+import uk.gov.companieshouse.orders.api.model.ApiError;
 import uk.gov.companieshouse.orders.api.model.Basket;
-
-import uk.gov.companieshouse.logging.Logger;
-import uk.gov.companieshouse.logging.LoggerFactory;
+import uk.gov.companieshouse.orders.api.model.Checkout;
+import uk.gov.companieshouse.orders.api.model.Item;
+import uk.gov.companieshouse.orders.api.service.ApiClientService;
 import uk.gov.companieshouse.orders.api.service.BasketService;
+import uk.gov.companieshouse.orders.api.service.CheckoutService;
 import uk.gov.companieshouse.orders.api.util.EricHeaderHelper;
+import uk.gov.companieshouse.orders.api.validator.CheckoutBasketValidator;
 
 import javax.servlet.http.HttpServletRequest;
 import javax.validation.Valid;
 import java.util.HashMap;
+import java.util.List;
 import java.util.Map;
 import java.util.Optional;
 
+import static org.springframework.http.HttpStatus.BAD_REQUEST;
+import static org.springframework.http.HttpStatus.CONFLICT;
 import static uk.gov.companieshouse.orders.api.OrdersApiApplication.APPLICATION_NAMESPACE;
 
 @RestController
@@ -30,10 +42,20 @@ public class BasketController {
 
     private final BasketMapper mapper;
     private final BasketService basketService;
+    private final CheckoutService checkoutService;
+    private final CheckoutBasketValidator checkoutBasketValidator;
+    private final ApiClientService apiClientService;
 
-    public BasketController(final BasketMapper mapper, final BasketService basketService){
+    public BasketController(final BasketMapper mapper,
+                            final BasketService basketService,
+                            final CheckoutService checkoutService,
+                            final CheckoutBasketValidator checkoutBasketValidator,
+                            final ApiClientService apiClientService){
         this.mapper = mapper;
         this.basketService = basketService;
+        this.checkoutService = checkoutService;
+        this.checkoutBasketValidator = checkoutBasketValidator;
+        this.apiClientService = apiClientService;
     }
 
     @PostMapping("${uk.gov.companieshouse.orders.api.basket.items}")
@@ -60,6 +82,35 @@ public ResponseEntity<AddToBasketResponseDTO> addItemToBasket(final @Valid @Requ
         return ResponseEntity.status(HttpStatus.OK).body(addToBasketResponseDTO);
     }
 
+    @PostMapping("${uk.gov.companieshouse.orders.api.basket.checkout}")
+    public ResponseEntity<?> checkoutBasket(HttpServletRequest request,
+                                            final @RequestHeader(REQUEST_ID_HEADER_NAME) String requestId) {
+        trace("Entering checkoutBasket", requestId);
+
+        final Basket retrievedBasket = basketService.getBasketById(EricHeaderHelper.getIdentity(request))
+                .orElseThrow(ConflictException::new);
+
+        final List<String> errors = checkoutBasketValidator.getValidationErrors(retrievedBasket);
+        if (!errors.isEmpty()) {
+            return ResponseEntity.status(CONFLICT).body(new ApiError(CONFLICT, errors));
+        }
+
+        Item item;
+        String itemUri = null;
+        try {
+            itemUri = retrievedBasket.getData().getItems().get(0).getItemUri();
+            item = apiClientService.getItem(itemUri);
+        } catch (Exception exception) {
+            LOGGER.error("Failed to get item "+itemUri, exception);
+            return ResponseEntity.status(BAD_REQUEST).body(new ApiError(BAD_REQUEST, "Failed to retrieve item"));
+        }
+
+        Checkout checkout = checkoutService.createCheckout(item);
+        trace("Successfully created checkout with id "+checkout.getId(), requestId);
+
+        return ResponseEntity.status(HttpStatus.OK).body(null);
+    }
+
     /**
      * Utility method that logs each message with the request ID for log tracing/analysis.
      * @param message the message to log

src/main/java/uk/gov/companieshouse/orders/api/converter/EnumToStringConverterFactory.java

@@ -0,0 +1,29 @@
+package uk.gov.companieshouse.orders.api.converter;
+
+import org.springframework.core.convert.converter.Converter;
+import org.springframework.core.convert.converter.ConverterFactory;
+import org.springframework.data.convert.WritingConverter;
+
+import static uk.gov.companieshouse.orders.api.converter.EnumValueNameConverter.convertEnumValueNameToJson;
+
+@WritingConverter
+public final class EnumToStringConverterFactory implements ConverterFactory<Enum, String> {
+
+    @Override
+    public <T extends String> Converter<Enum, T> getConverter(Class<T> targetType) {
+        return new EnumToStringConverter(targetType);
+    }
+
+    private final class EnumToStringConverter<T extends Enum> implements Converter<T, String> {
+
+        private Class<T> enumType;
+
+        public EnumToStringConverter(Class<T> enumType) {
+            this.enumType = enumType;
+        }
+
+        public String convert(T source) {
+            return convertEnumValueNameToJson(source);
+        }
+    }
+}

src/main/java/uk/gov/companieshouse/orders/api/converter/EnumValueNameConverter.java

@@ -0,0 +1,14 @@
+package uk.gov.companieshouse.orders.api.converter;
+
+public class EnumValueNameConverter {
+
+    private EnumValueNameConverter() { }
+
+    public static String convertEnumValueJsonToName(final String enumValueJson) {
+        return enumValueJson.toUpperCase().replace("-", "_");
+    }
+
+    public static String convertEnumValueNameToJson(final Enum value) {
+        return value.name().toLowerCase().replace("_", "-");
+    }
+}

src/main/java/uk/gov/companieshouse/orders/api/converter/StringToEnumConverterFactory.java

@@ -0,0 +1,26 @@
+package uk.gov.companieshouse.orders.api.converter;
+
+import org.springframework.core.convert.converter.Converter;
+import org.springframework.core.convert.converter.ConverterFactory;
+import org.springframework.data.convert.ReadingConverter;
+
+@ReadingConverter
+public final class StringToEnumConverterFactory implements ConverterFactory<String, Enum> {
+
+    public <T extends Enum> Converter<String, T> getConverter(Class<T> targetType) {
+        return new StringToEnumConverter(targetType);
+    }
+
+    private final class StringToEnumConverter<T extends Enum> implements Converter<String, T> {
+
+        private Class<T> enumType;
+
+        public StringToEnumConverter(Class<T> enumType) {
+            this.enumType = enumType;
+        }
+
+        public T convert(String source) {
+            return (T) Enum.valueOf(this.enumType, source.trim());
+        }
+    }
+}

src/main/java/uk/gov/companieshouse/orders/api/dto/AddToBasketRequestDTO.java

@@ -1,11 +1,9 @@
 package uk.gov.companieshouse.orders.api.dto;
 
-import com.fasterxml.jackson.annotation.JsonInclude;
 import com.fasterxml.jackson.annotation.JsonProperty;
 import com.google.gson.Gson;
 
 import javax.validation.constraints.NotBlank;
-import javax.validation.constraints.NotNull;
 
 public class AddToBasketRequestDTO {
 

src/main/java/uk/gov/companieshouse/orders/api/exception/ConflictException.java

@@ -0,0 +1,20 @@
+package uk.gov.companieshouse.orders.api.exception;
+
+import org.springframework.http.HttpStatus;
+import org.springframework.web.bind.annotation.ResponseStatus;
+
+@ResponseStatus(HttpStatus.CONFLICT)
+public class ConflictException extends RuntimeException {
+
+    public ConflictException() {
+        this("Conflict");
+    }
+
+    public ConflictException(String message) {
+        this(message, (Throwable)null);
+    }
+
+    public ConflictException(String message, Throwable cause) {
+        super(message, cause);
+    }
+}