From 0d547c8903575d31f59db20069c9bab53d19406c Mon Sep 17 00:00:00 2001
From: CodeSteak <codesteak@shellf.art>
Date: Wed, 24 Jun 2020 02:15:31 +0200
Subject: [PATCH] Fix display order in various locations. closes #120

---
 .../controller/intern/WarehouseController.java    |  2 +-
 .../intern/suppliers/SupplierOrderController.java |  2 +-
 .../repos/supplier/SupplierOrderRepository.java   | 15 +++++++++------
 .../warehouse/WarehouseBookingRepository.java     |  3 +++
 4 files changed, 14 insertions(+), 8 deletions(-)

diff --git a/prototype/src/main/java/org/hso/ecommerce/controller/intern/WarehouseController.java b/prototype/src/main/java/org/hso/ecommerce/controller/intern/WarehouseController.java
index 4a0258e..76f0804 100644
--- a/prototype/src/main/java/org/hso/ecommerce/controller/intern/WarehouseController.java
+++ b/prototype/src/main/java/org/hso/ecommerce/controller/intern/WarehouseController.java
@@ -21,7 +21,7 @@ public class WarehouseController {
             Model model,
             HttpServletRequest request
     ) {
-        model.addAttribute("bookings", warehouseBookingRepository.findAll());
+        model.addAttribute("bookings", warehouseBookingRepository.findAllDesc());
         return "intern/warehouse/index";
     }
 }
diff --git a/prototype/src/main/java/org/hso/ecommerce/controller/intern/suppliers/SupplierOrderController.java b/prototype/src/main/java/org/hso/ecommerce/controller/intern/suppliers/SupplierOrderController.java
index 3259a17..f27cfcc 100644
--- a/prototype/src/main/java/org/hso/ecommerce/controller/intern/suppliers/SupplierOrderController.java
+++ b/prototype/src/main/java/org/hso/ecommerce/controller/intern/suppliers/SupplierOrderController.java
@@ -48,7 +48,7 @@ public class SupplierOrderController {
 
 		List<UImodelSupplierOrder> totals = new ArrayList<UImodelSupplierOrder>();
 
-		for (SupplierOrder order : supplierOrderRepository.findAll()) {
+		for (SupplierOrder order : supplierOrderRepository.findAllDesc()) {
 			final Article article = articleRepository.findArticleByArticleOffer(order.ordered).orElse(null);
 			totals.add(new UImodelSupplierOrder(order, article));
 		}
diff --git a/prototype/src/main/java/org/hso/ecommerce/repos/supplier/SupplierOrderRepository.java b/prototype/src/main/java/org/hso/ecommerce/repos/supplier/SupplierOrderRepository.java
index 06ad249..2bd8e57 100644
--- a/prototype/src/main/java/org/hso/ecommerce/repos/supplier/SupplierOrderRepository.java
+++ b/prototype/src/main/java/org/hso/ecommerce/repos/supplier/SupplierOrderRepository.java
@@ -1,22 +1,25 @@
 package org.hso.ecommerce.repos.supplier;
 
-import java.util.List;
-
 import org.hso.ecommerce.entities.supplier.SupplierOrder;
 import org.springframework.data.jpa.repository.JpaRepository;
 import org.springframework.data.jpa.repository.Query;
 import org.springframework.data.repository.query.Param;
 import org.springframework.stereotype.Repository;
 
+import java.util.List;
+
 @Repository
 public interface SupplierOrderRepository extends JpaRepository<SupplierOrder, Long> {
 
-    @Query("SELECT SUM(so.numberOfUnits) FROM SupplierOrder so JOIN so.ordered ao WHERE ao.articleNumber = :articleNumber AND so.delivered IS NULL")
-    Integer countUndeliveredReorders(String articleNumber);
+	@Query("SELECT SUM(so.numberOfUnits) FROM SupplierOrder so JOIN so.ordered ao WHERE ao.articleNumber = :articleNumber AND so.delivered IS NULL")
+	Integer countUndeliveredReorders(String articleNumber);
 
-	@Query(value = "SELECT * FROM supplier_orders as a WHERE a.supplier_id = :supplierId", nativeQuery = true)
+	@Query(value = "SELECT * FROM supplier_orders as a WHERE a.supplier_id = :supplierId ORDER BY a.id DESC", nativeQuery = true)
 	List<SupplierOrder> findOrderBySupplierID(@Param("supplierId") long supplierId);
-    
+
 	@Query("SELECT a FROM SupplierOrder a")
 	List<SupplierOrder> findAll();
+
+	@Query("SELECT a FROM SupplierOrder a ORDER BY a.id DESC")
+	List<SupplierOrder> findAllDesc();
 }
diff --git a/prototype/src/main/java/org/hso/ecommerce/repos/warehouse/WarehouseBookingRepository.java b/prototype/src/main/java/org/hso/ecommerce/repos/warehouse/WarehouseBookingRepository.java
index 08434c4..79f1d95 100644
--- a/prototype/src/main/java/org/hso/ecommerce/repos/warehouse/WarehouseBookingRepository.java
+++ b/prototype/src/main/java/org/hso/ecommerce/repos/warehouse/WarehouseBookingRepository.java
@@ -13,5 +13,8 @@ public interface WarehouseBookingRepository extends JpaRepository<WarehouseBooki
     @Query("Select b FROM WarehouseBooking b WHERE b.isDone = 0")
     List<WarehouseBooking> findNotDone();
 
+    @Query("Select b FROM WarehouseBooking b ORDER BY b.id DESC")
+    List<WarehouseBooking> findAllDesc();
+
 }