@@ -0,0 +14,4 @@
+import java.util.*;
+
+@Service
+public class RestServiceForDelivery {

@@ -0,0 +22,4 @@
+
+    public String getDeliveryID(CustomerOrder customerOrder) throws ResourceAccessException
+    {
+        String url = "http://[::1]:8082/newDelivery";

@@ -0,0 +68,4 @@
+            {
+                return response.getBody();
+            } else {
+                return new DeliveryData("DHL-Server ist gerade nicht erreichbar","--:--:----");

@@ -0,0 +73,4 @@
+        }
+        catch (ResourceAccessException e)
+        {
+            return new DeliveryData("DHL-Server gerade nicht erreichbar","--:--:----");

@@ -3,9 +3,12 @@ package org.hso.ecommerce.app;
 import org.springframework.boot.SpringApplication;
 import org.springframework.boot.autoconfigure.SpringBootApplication;
 import org.springframework.boot.autoconfigure.domain.EntityScan;
+import org.springframework.context.ConfigurableApplicationContext;

@@ -51,1 +58,3 @@
-        model.addAttribute("orders", orders);
+        List<CustomerOrder> orders =  customerOrderRepository.getAllOrders();
+
+        Map<CustomerOrder, DeliveryData> customerOrderDeliveryDataMap = orders.stream().collect

@@ -0,0 +1,75 @@
+package org.hso.ecommerce.uiModel;

@@ -0,0 +28,4 @@
+        isDelivered = status.equals("Lieferung erfolgreich");
+    }
+
+    public static  DeliveryData getDeliveryDataFromCustomerOrder(CustomerOrder customerOrder, CustomerOrderRepository customerOrderRepository, RestServiceForDelivery restServiceForDelivery)

@@ -0,0 +31,4 @@
+    public static  DeliveryData getDeliveryDataFromCustomerOrder(CustomerOrder customerOrder, CustomerOrderRepository customerOrderRepository, RestServiceForDelivery restServiceForDelivery)
+    {
+        if(customerOrder.trackingId == null)
+            return new DeliveryData("Bestellung wurde elektronisch angekündigt","");

@@ -16,3 +16,3 @@
     <nav></nav>
     <div>
-        <h1>Bestellung 1010</h1>
+        <h1 th:text="|Bestellung ${order.id}|"></h1>

@@ -7,3 +8,4 @@
 
 import java.util.Optional;
 
+import static jdk.nashorn.internal.runtime.regexp.joni.Syntax.Java;

@@ -26,3 +26,3 @@
     <div class="content-width">
         <div>
-            <h2 id="20202701"> Bestellung vom 27.01.2020 </h2>
+            <h2 th:text="| Bestellung vom ${order.created.toString().substring(0,10)}"></h2>

@@ -24,2 +24,2 @@
-        <div th:each="order: ${orders}">
-            <h2 id="20202701" th:text="|Bestellung vom ${order.formatCreated()}" />
+        <div th:each="order: ${orderDeliveryDataMap}">
+            <h2 id="20202701" th:text="|Bestellung vom ${order.getKey().formatCreated()}" />