Fix webhook lookup (#32)

* Lookup Order by ProviderReference instead of PublicReference * Add separate methods for public and provider reference lookup * Fix small html errors * Nothing to see here.
WISVCH · Mar 15, 2017 · 65e6940 · 65e6940
1 parent 253d9c5
commit 65e6940
Show file tree

Hide file tree

Showing 6 changed files with 28 additions and 12 deletions.
diff --git a/src/main/java/ch/wisv/payments/admin/OrderController.java b/src/main/java/ch/wisv/payments/admin/OrderController.java
@@ -35,7 +35,7 @@ String orders(Model model) {
     @PostMapping("/update/{orderReference}")
     String updateOrder(Model model, @PathVariable String orderReference, RedirectAttributes redirectAttributes) {
         try {
-            Order order = paymentService.updateStatus(orderReference);
+            Order order = paymentService.updateStatusByPublicReference(orderReference);
             redirectAttributes.addFlashAttribute("message", "Order " + order.getId() + " successfully updated!");
         } catch (RuntimeException e) {
             redirectAttributes.addFlashAttribute("error", e.getMessage());

diff --git a/src/main/java/ch/wisv/payments/rest/MolliePaymentService.java b/src/main/java/ch/wisv/payments/rest/MolliePaymentService.java
@@ -89,10 +89,20 @@ private void updateOrder(Order order, ResponseOrError<Payment> molliePayment) {
     }
 
     @Override
-    public Order updateStatus(String orderReference) {
-        Order order = orderRepository.findByPublicReference(orderReference)
-                .orElseThrow(() -> new RuntimeException("Order with providerReference " + orderReference + " not found"));
+    public Order updateStatusByPublicReference(String publicOrderReference) {
+        Order order = orderRepository.findByPublicReference(publicOrderReference)
+                .orElseThrow(() -> new RuntimeException("Order with publicReference " + publicOrderReference + " not found"));
+        return updateOrder(order);
+    }
+
+    @Override
+    public Order updateStatusByProviderReference(String providerOrderReference) {
+        Order order = orderRepository.findByProviderReference(providerOrderReference)
+                .orElseThrow(() -> new RuntimeException("Order with providerReference " + providerOrderReference + " not found"));
+        return updateOrder(order);
+    }
 
+    private Order updateOrder(Order order) {
         // This try is for the Mollie API internal HttpClient
         try {
             // Request a payment from Mollie
@@ -116,7 +126,7 @@ public Order updateStatus(String orderReference) {
                         break;
                     }
                     case "paid": {
-                        if(!order.getStatus().equals(OrderStatus.PAID)){
+                        if (!order.getStatus().equals(OrderStatus.PAID)) {
                             mailService.sendOrderConfirmation(order);
                         }
                         order.setStatus(OrderStatus.PAID);

diff --git a/src/main/java/ch/wisv/payments/rest/OrderRestController.java b/src/main/java/ch/wisv/payments/rest/OrderRestController.java
@@ -40,9 +40,15 @@ public ResponseEntity<?> getOrderStatus(@PathVariable String orderReference) {
         return new ResponseEntity<>(new OrderResponse(order), HttpStatus.OK);
     }
 
+    /**
+     * This endpoint is for the paymentprovider. Webhooks will arrive here.
+     *
+     * @param providerReference The provider Order Reference
+     * @return Status Message
+     */
     @RequestMapping(value = "/status", method = RequestMethod.POST)
-    public ResponseEntity<?> updateOrderStatus(@RequestParam(name = "id") String orderReference) {
-        paymentService.updateStatus(orderReference);
+    public ResponseEntity<?> updateOrderStatus(@RequestParam(name = "id") String providerReference) {
+        paymentService.updateStatusByProviderReference(providerReference);
         return new ResponseEntity<>(HttpStatus.OK);
     }
 

diff --git a/src/main/java/ch/wisv/payments/rest/PaymentService.java b/src/main/java/ch/wisv/payments/rest/PaymentService.java
@@ -11,6 +11,8 @@ public interface PaymentService {
 
     OrderResponse registerOrder(Order order);
 
-    Order updateStatus(String orderReference);
+    Order updateStatusByPublicReference(String publicOrderReference);
+
+    Order updateStatusByProviderReference(String providerOrderReference);
 
 }
diff --git a/src/main/resources/templates/about.html b/src/main/resources/templates/about.html
@@ -76,9 +76,7 @@ <h1>CH-Payments</h1>
 <script src="https://cdnjs.cloudflare.com/ajax/libs/tether/1.4.0/js/tether.min.js"
         integrity="sha384-DztdAPBWPRXSA/3eYEEUWrWCy7G5KFbe8fFjk5JAIxUYHKkDx6Qin1DkWx51bBrb"
         crossorigin="anonymous"></script>
-<script src="../../dist/js/bootstrap.min.js"></script>
-<!-- IE10 viewport hack for Surface/desktop Windows 8 bug -->
-<script src="../../assets/js/ie10-viewport-bug-workaround.js"></script>
+<script th:src="@{/webjars/bootstrap/3.3.7-1/js/bootstrap.min.js}"></script>
 </body>
 </html>
 
diff --git a/src/main/resources/templates/products.html b/src/main/resources/templates/products.html
@@ -209,8 +209,8 @@ <h3 class="panel-title">Add Product Group</h3>
                     <td th:text="${group.getCommittee().getName().getName()} + ' '+ ${group.getCommittee().getYear()}">
                         Row 1 Data 2
                     </td>
-                    <td th:text="${group.getGroupLimit()}">Group limit</td>
                     <td th:text="${group.getName()}">Row 1 Data 1</td>
+                    <td th:text="${group.getGroupLimit()}">Group limit</td>
                     <td th:text="${group.getDescription()}">Row 1 Data 3</td>
                     <td>
                         <ul th:each="product : ${group.getProducts()}">