Feature/1 ordering

.gitignore

@@ -50,4 +50,7 @@ dist/
 log/
 
 # Skip VisualStudio Code folders
-.vscode/
+.vscode/
+
+.tomcat/
+.integration/

cm-all/pom.xml

@@ -15,7 +15,7 @@
 	<artifactId>cm-all</artifactId>
 	<version>1.0.0</version>
 
-	<name>Catalog Manager :: Web API and Frontent together</name>
+	<name>Catalog Manager :: Web API and Frontend together</name>
 	<properties>
 		<java.version>1.8</java.version>
 		<cm.version>1.0.0</cm.version>
@@ -79,7 +79,13 @@
 			</plugin>
 
 			<plugin>
+				<groupId>org.apache.maven.plugins</groupId>
 				<artifactId>maven-resources-plugin</artifactId>
+				<version>2.6</version>
+				<inherited>false</inherited>
+				<configuration>
+					<encoding>UTF-8</encoding>
+				</configuration>
 				<executions>
 					<execution>
 						<id>position-react-build</id>
@@ -101,7 +107,9 @@
 			</plugin>
 
 			<plugin>
+				<groupId>org.apache.maven.plugins</groupId>
 				<artifactId>maven-clean-plugin</artifactId>
+				<version>3.0.0</version>
 				<configuration>
 					<skip>true</skip>
 				</configuration>
@@ -110,6 +118,7 @@
 			<plugin>
 				<groupId>org.springframework.boot</groupId>
 				<artifactId>spring-boot-maven-plugin</artifactId>
+				<version>2.4.0</version>
 				<configuration>
 					<mainClass>dk.erst.cm.CatalogApiApplication</mainClass>
 				</configuration>

cm-api/pom.xml

@@ -12,7 +12,7 @@
 	<properties>
 		<java.version>1.8</java.version>
 		<cm.version>1.0.0</cm.version>
-		<spring.boot.version>2.4.0</spring.boot.version>
+		<spring.boot.version>2.6.7</spring.boot.version>
 		<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
 		<maven.compiler.source>${java.version}</maven.compiler.source>
 		<maven.compiler.target>${java.version}</maven.compiler.target>
@@ -24,6 +24,13 @@
 			<artifactId>cm-ubl</artifactId>
 			<version>${cm.version}</version>
 		</dependency>
+
+		<dependency>
+			<groupId>com.helger.ubl</groupId>
+			<artifactId>ph-ubl21</artifactId>
+			<version>6.6.3</version>
+		</dependency>
+
 		<dependency>
 			<groupId>org.springframework.boot</groupId>
 			<artifactId>spring-boot-starter-data-mongodb</artifactId>
@@ -33,7 +40,7 @@
 		<dependency>
 			<groupId>com.opencsv</groupId>
 			<artifactId>opencsv</artifactId>
-			<version>4.4</version>
+			<version>5.6</version>
 		</dependency>
 
 		<!-- Commons -->
@@ -84,4 +91,4 @@
 		</dependency>
 	</dependencies>
 
-</project>
+</project>

cm-api/src/main/java/dk/erst/cm/api/dao/mongo/BasketRepository.java

@@ -0,0 +1,8 @@
+package dk.erst.cm.api.dao.mongo;
+
+import dk.erst.cm.api.data.Basket;
+import org.springframework.data.mongodb.repository.MongoRepository;
+
+public interface BasketRepository extends MongoRepository<Basket, String> {
+
+}

cm-api/src/main/java/dk/erst/cm/api/dao/mongo/OrderRepository.java

@@ -0,0 +1,13 @@
+package dk.erst.cm.api.dao.mongo;
+
+import java.util.List;
+
+import org.springframework.data.mongodb.repository.MongoRepository;
+
+import dk.erst.cm.api.data.Order;
+
+public interface OrderRepository extends MongoRepository<Order, String> {
+
+	List<Order> findByBasketId(String basketId);
+
+}

cm-api/src/main/java/dk/erst/cm/api/dao/mongo/ProductCatalogUpdateRepository.java

@@ -6,4 +6,6 @@
 
 public interface ProductCatalogUpdateRepository extends MongoRepository<ProductCatalogUpdate, String> {
 
+	ProductCatalogUpdate findTop1ByProductCatalogIdOrderByCreateTimeDesc(String productCatalogId);
+
 }

cm-api/src/main/java/dk/erst/cm/api/data/Basket.java

@@ -0,0 +1,23 @@
+package dk.erst.cm.api.data;
+
+import java.time.Instant;
+
+import org.springframework.data.annotation.Id;
+import org.springframework.data.mongodb.core.mapping.Document;
+
+import lombok.Data;
+import lombok.NoArgsConstructor;
+
+@Document
+@Data
+@NoArgsConstructor
+public class Basket {
+
+	@Id
+	private String id;
+	private Instant createTime;
+	private int version;
+	private int orderCount;
+	private int lineCount;
+
+}

cm-api/src/main/java/dk/erst/cm/api/data/Order.java

@@ -0,0 +1,41 @@
+package dk.erst.cm.api.data;
+
+import java.time.Instant;
+
+import org.springframework.data.annotation.Id;
+import org.springframework.data.mongodb.core.index.Indexed;
+import org.springframework.data.mongodb.core.mapping.Document;
+
+import lombok.Data;
+import lombok.NoArgsConstructor;
+
+@Document
+@Data
+@NoArgsConstructor
+public class Order {
+
+	@Id
+	private String id;
+	private Instant createTime;
+	private int version;
+
+	@Indexed
+	private String basketId;
+
+	private OrderStatus status;
+	private int orderIndex;
+
+	private String supplierName;
+
+	@Indexed
+	private String orderNumber;
+	private int lineCount;
+
+	private Object document;
+
+	private String resultFileName;
+
+	private Instant downloadDate;
+	private Instant deliveredDate;
+
+}

cm-api/src/main/java/dk/erst/cm/api/data/OrderStatus.java

@@ -0,0 +1,7 @@
+package dk.erst.cm.api.data;
+
+public enum OrderStatus {
+
+    GENERATED, DELIVERED, DELIVERY_FAILED, ORDER_CONFIRMED, ORDER_REJECTED
+
+}

cm-api/src/main/java/dk/erst/cm/api/item/CatalogService.java

@@ -12,6 +12,7 @@
 import dk.erst.cm.api.data.ProductCatalog;
 import dk.erst.cm.api.data.ProductCatalogUpdate;
 import dk.erst.cm.xml.ubl21.model.Catalogue;
+import dk.erst.cm.xml.ubl21.model.NestedParty;
 import dk.erst.cm.xml.ubl21.model.Party;
 import dk.erst.cm.xml.ubl21.model.SchemeID;
 import lombok.extern.slf4j.Slf4j;
@@ -72,6 +73,43 @@ public ProductCatalogUpdate saveCatalogue(Catalogue catalogue) {
 		return c;
 	}
 
+	public Party loadLastSellerParty(String productCatalogId) {
+
+		log.debug("Requested to load last seller party for productCatalog " + productCatalogId);
+
+		long start = System.currentTimeMillis();
+		ProductCatalogUpdate catalogUpdate = productCatalogUpdateRepository.findTop1ByProductCatalogIdOrderByCreateTimeDesc(productCatalogId);
+		long duration = System.currentTimeMillis() - start;
+		if (duration > 50) {
+			log.warn("LastSellerParty Mongo lookup by " + productCatalogId + " took more than 50ms: " + 50);
+		}
+
+		if (catalogUpdate != null && catalogUpdate.getDocument() != null) {
+			if (catalogUpdate.getDocument() instanceof Catalogue) {
+				Catalogue document = (Catalogue) catalogUpdate.getDocument();
+
+				if (document.getSellerSupplierParty() != null) {
+					NestedParty sellerSupplierParty = document.getSellerSupplierParty();
+					if (sellerSupplierParty != null && sellerSupplierParty.getParty() != null) {
+						log.debug("LastSellerParty found by document.sellerSupplierParty.party for productCatalog " + productCatalogId);
+						return sellerSupplierParty.getParty();
+					}
+				}
+				if (document.getProviderParty() != null) {
+					log.debug("LastSellerParty found by document.providerParty for productCatalog " + productCatalogId);
+					return document.getProviderParty();
+				}
+				log.warn("Neither sellerSupplierParty, nor providerParty are defined by last catalogUpdate by id " + productCatalogId + ": " + document);
+			} else {
+				log.warn("Found catalogUpdate by lastCatalog with id" + productCatalogId + " has unexpected type: " + catalogUpdate.getDocument().getClass());
+			}
+		} else {
+			log.warn("No catalogUpdate found by lastCatalog with id" + productCatalogId);
+		}
+
+		return null;
+	}
+
 	private String buildSellerLocalId(Catalogue catalogue) {
 		String sellerLogicalId = null;
 		if (catalogue.getSellerSupplierParty() != null) {