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 b50006e..b7e35cd 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 @@ -47,7 +47,7 @@ public class SupplierOrderController { List totals = new ArrayList(); - 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 { - @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 findOrderBySupplierID(@Param("supplierId") long supplierId); - + @Query("SELECT a FROM SupplierOrder a") List findAll(); + + @Query("SELECT a FROM SupplierOrder a ORDER BY a.id DESC") + List 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 findNotDone(); + @Query("Select b FROM WarehouseBooking b ORDER BY b.id DESC") + List findAllDesc(); + }