From 4e0ab68026a8f156694bef753615da2e689f6eb4 Mon Sep 17 00:00:00 2001
From: Martijn Janssen <martijn9612@gmail.com>
Date: Fri, 17 Mar 2017 16:44:38 +0100
Subject: [PATCH 1/5] Add remove button to groups & fix add product group

---
 .../payments/admin/products/ProductController.java | 10 +++++++++-
 .../payments/admin/products/ProductService.java    |  2 ++
 .../admin/products/ProductServiceImpl.java         |  7 +++++++
 src/main/resources/templates/products.html         | 14 +++++++++++++-
 4 files changed, 31 insertions(+), 2 deletions(-)

diff --git a/src/main/java/ch/wisv/payments/admin/products/ProductController.java b/src/main/java/ch/wisv/payments/admin/products/ProductController.java
index 9dc4aa3..f40cbed 100644
--- a/src/main/java/ch/wisv/payments/admin/products/ProductController.java
+++ b/src/main/java/ch/wisv/payments/admin/products/ProductController.java
@@ -88,9 +88,17 @@ public String deleteProduct(@PathVariable int productId, RedirectAttributes redi
         return "redirect:/products";
     }
 
-    @PostMapping(value = "/addGroup")
+    @PostMapping(value = "/group")
     public String addProductGroup(@ModelAttribute @Validated ProductGroupRequest productGroupRequest) {
         productService.addProductGroup(productGroupRequest);
+        System.out.println("here");
+
+        return "redirect:/products";
+    }
+
+    @PostMapping(value = "/group/delete/{productGroupId}")
+    public String deleteProductGroup(@PathVariable int productGroupId) {
+        productService.deleteProductGroup(productGroupId);
 
         return "redirect:/products";
     }
diff --git a/src/main/java/ch/wisv/payments/admin/products/ProductService.java b/src/main/java/ch/wisv/payments/admin/products/ProductService.java
index 9dc8899..94388b5 100644
--- a/src/main/java/ch/wisv/payments/admin/products/ProductService.java
+++ b/src/main/java/ch/wisv/payments/admin/products/ProductService.java
@@ -38,4 +38,6 @@ public interface ProductService {
     void addProductGroup(ProductGroupRequest productGroupRequest);
 
     void addProductToGroup(Product product, ProductGroup productGroup);
+
+    void deleteProductGroup(int productGroupId);
 }
diff --git a/src/main/java/ch/wisv/payments/admin/products/ProductServiceImpl.java b/src/main/java/ch/wisv/payments/admin/products/ProductServiceImpl.java
index 4304cb3..45d4750 100644
--- a/src/main/java/ch/wisv/payments/admin/products/ProductServiceImpl.java
+++ b/src/main/java/ch/wisv/payments/admin/products/ProductServiceImpl.java
@@ -139,4 +139,11 @@ public void deleteProduct(int productId) {
             productRepository.delete(productId);
         }
     }
+
+    @Override
+    public void deleteProductGroup(int productGroupId) {
+        productGroupRepository.findOne(productGroupId).getProducts()
+                .forEach(p -> p.setProductGroup(null));
+        productGroupRepository.delete(productGroupId);
+    }
 }
diff --git a/src/main/resources/templates/products.html b/src/main/resources/templates/products.html
index 156da77..d0733af 100644
--- a/src/main/resources/templates/products.html
+++ b/src/main/resources/templates/products.html
@@ -155,7 +155,7 @@ <h3 class="panel-title">Add Product Group</h3>
             </div>
             <div class="panel-body">
                 <!--/*@thymesVar id="productGroup" type="ch.wisv.payments.admin.products.request.ProductGroupRequest"*/-->
-                <form class="form-inline" th:action="@{/products/addGroup}" th:object="${productGroup}"
+                <form class="form-inline" th:action="@{/products/group}" th:object="${productGroup}"
                       method="post">
                     <div class="form-group">
                         <label class="sr-only" for="committeeNameGroup">Committee</label>
@@ -227,6 +227,18 @@ <h3 class="panel-title">Add Product Group</h3>
                         <!--</button>-->
                         <!--</div>-->
                     </td>
+                    <td>
+                        <form th:action="@{/products/group/delete/} + ${group.id}" method="post">
+                            <div class="btn-group" role="group" aria-label="...">
+                                <!--<a class="btn btn-info" th:href="@{/products/edit/} + ${product.id}" href="#">-->
+                                    <!--<span class="glyphicon glyphicon-edit" aria-hidden="true"></span>-->
+                                <!--</a>-->
+                                <button type="submit" class="btn btn-danger" aria-label="Remove">
+                                    <span class="glyphicon glyphicon-remove" aria-hidden="true"></span>
+                                </button>
+                            </div>
+                        </form>
+                    </td>
                 </tr>
                 </tbody>
             </table>

From 820034b00cf16de050372d6ccdae0866caf0cc1f Mon Sep 17 00:00:00 2001
From: Martijn Janssen <martijn9612@gmail.com>
Date: Fri, 17 Mar 2017 20:07:57 +0100
Subject: [PATCH 2/5] Add edit page & change removal constraints

---
 .../admin/products/ProductController.java     | 40 +++++++-
 .../admin/products/ProductService.java        |  4 +
 .../admin/products/ProductServiceImpl.java    | 46 ++++++---
 .../products/request/ProductRequest.java      |  2 +-
 .../exception/ProductGroupInUseException.java |  7 ++
 .../templates/{edit.html => editProduct.html} |  4 +-
 .../resources/templates/editProductGroup.html | 93 +++++++++++++++++++
 src/main/resources/templates/products.html    | 16 +---
 8 files changed, 181 insertions(+), 31 deletions(-)
 create mode 100644 src/main/java/ch/wisv/payments/exception/ProductGroupInUseException.java
 rename src/main/resources/templates/{edit.html => editProduct.html} (97%)
 create mode 100644 src/main/resources/templates/editProductGroup.html

diff --git a/src/main/java/ch/wisv/payments/admin/products/ProductController.java b/src/main/java/ch/wisv/payments/admin/products/ProductController.java
index f40cbed..b0d56af 100644
--- a/src/main/java/ch/wisv/payments/admin/products/ProductController.java
+++ b/src/main/java/ch/wisv/payments/admin/products/ProductController.java
@@ -4,6 +4,7 @@
 import ch.wisv.payments.admin.products.request.ProductGroupRequest;
 import ch.wisv.payments.admin.products.request.ProductRequest;
 import ch.wisv.payments.model.Product;
+import ch.wisv.payments.model.ProductGroup;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Controller;
 import org.springframework.ui.Model;
@@ -43,7 +44,7 @@ public String productEdit(@PathVariable Integer productId, Model model) {
         Product product = productService.getProductById(productId);
         ProductRequest productRequest = new ProductRequest();
 
-        productRequest.setProductId(product.getId());
+        productRequest.setId(product.getId());
         productRequest.setName(product.getName());
         productRequest.setDescription(product.getDescription());
         productRequest.setPrice(product.getPrice());
@@ -58,7 +59,7 @@ public String productEdit(@PathVariable Integer productId, Model model) {
 
         model.addAttribute("product", productRequest);
 
-        return "edit";
+        return "editProduct";
     }
 
     @PostMapping(value = "/add")
@@ -96,9 +97,40 @@ public String addProductGroup(@ModelAttribute @Validated ProductGroupRequest pro
         return "redirect:/products";
     }
 
+    @GetMapping(value = "/group/edit/{productGroupId}")
+    public String productGroupEdit(@PathVariable Integer productGroupId, Model model) {
+        model.addAttribute("committees", committeeService.getAllCommittees());
+
+        ProductGroup productGroup = productService.getProductGroupById(productGroupId);
+        ProductGroupRequest productGroupRequest = new ProductGroupRequest();
+
+        productGroupRequest.setId(productGroup.getId());
+        productGroupRequest.setName(productGroup.getName());
+        productGroupRequest.setCommitteeId(productGroup.getCommittee().getId());
+        productGroupRequest.setDescription(productGroup.getDescription());
+        productGroupRequest.setGroupLimit(productGroup.getGroupLimit());
+
+        model.addAttribute("productGroup", productGroupRequest);
+
+        return "editProductGroup";
+    }
+
+    @PostMapping(value = "/group/edit")
+    public String editProductGroup(@ModelAttribute @Validated ProductGroupRequest productGroupRequest, RedirectAttributes redirectAttributes) {
+        productService.editProductGroup(productGroupRequest);
+
+        redirectAttributes.addFlashAttribute("message", productGroupRequest.getName() + " successfully updated!");
+
+        return "redirect:/products";
+    }
+
     @PostMapping(value = "/group/delete/{productGroupId}")
-    public String deleteProductGroup(@PathVariable int productGroupId) {
-        productService.deleteProductGroup(productGroupId);
+    public String deleteProductGroup(@PathVariable int productGroupId, RedirectAttributes redirectAttributes) {
+        try {
+            productService.deleteProductGroup(productGroupId);
+        } catch (RuntimeException e) {
+            redirectAttributes.addFlashAttribute("error", e.getMessage());
+        }
 
         return "redirect:/products";
     }
diff --git a/src/main/java/ch/wisv/payments/admin/products/ProductService.java b/src/main/java/ch/wisv/payments/admin/products/ProductService.java
index 94388b5..1d1e2f6 100644
--- a/src/main/java/ch/wisv/payments/admin/products/ProductService.java
+++ b/src/main/java/ch/wisv/payments/admin/products/ProductService.java
@@ -40,4 +40,8 @@ public interface ProductService {
     void addProductToGroup(Product product, ProductGroup productGroup);
 
     void deleteProductGroup(int productGroupId);
+
+    ProductGroup getProductGroupById(Integer productGroupId);
+
+    void editProductGroup(ProductGroupRequest productGroupRequest);
 }
diff --git a/src/main/java/ch/wisv/payments/admin/products/ProductServiceImpl.java b/src/main/java/ch/wisv/payments/admin/products/ProductServiceImpl.java
index 45d4750..b410332 100644
--- a/src/main/java/ch/wisv/payments/admin/products/ProductServiceImpl.java
+++ b/src/main/java/ch/wisv/payments/admin/products/ProductServiceImpl.java
@@ -4,6 +4,7 @@
 import ch.wisv.payments.admin.products.request.ProductGroupRequest;
 import ch.wisv.payments.admin.products.request.ProductRequest;
 import ch.wisv.payments.exception.CommmitteeNotFoundException;
+import ch.wisv.payments.exception.ProductGroupInUseException;
 import ch.wisv.payments.exception.ProductInUseException;
 import ch.wisv.payments.model.*;
 import ch.wisv.payments.rest.OrderService;
@@ -79,9 +80,9 @@ public void addProductToGroup(Product product, ProductGroup productGroup) {
 
     @Override
     public void editProduct(ProductRequest productRequest) {
-        if (productRequest.getProductId() != 0) {
+        if (productRequest.getId() != 0) {
             Committee committee = committeeRepository.findOne(productRequest.getCommitteeId());
-            Product product = productRepository.findOne(productRequest.getProductId());
+            Product product = productRepository.findOne(productRequest.getId());
 
             product.setName(productRequest.getName());
             product.setDescription(productRequest.getDescription());
@@ -102,6 +103,17 @@ public void editProduct(ProductRequest productRequest) {
         }
     }
 
+    @Override
+    public void deleteProduct(int productId) {
+        List<Order> orders = orderService.getOrdersByProductId(productId);
+
+        if (orders.size() > 0) {
+            throw new ProductInUseException("Products are already ordered");
+        } else {
+            productRepository.delete(productId);
+        }
+    }
+
     @Override
     public Product getProductById(Integer productId) {
         return productRepository.findOne(productId);
@@ -130,20 +142,32 @@ public boolean isProductAvailable(Integer productId) {
     }
 
     @Override
-    public void deleteProduct(int productId) {
-        List<Order> orders = orderService.getOrdersByProductId(productId);
+    public ProductGroup getProductGroupById(Integer productGroupId) {
+        return productGroupRepository.findOne(productGroupId);
+    }
 
-        if (orders.size() > 0) {
-            throw new ProductInUseException("Products are already ordered");
-        } else {
-            productRepository.delete(productId);
+    @Override
+    public void editProductGroup(ProductGroupRequest productGroupRequest) {
+        if (productGroupRequest.getId() != 0) {
+            Committee committee = committeeRepository.findOne(productGroupRequest.getCommitteeId());
+            ProductGroup productGroup = productGroupRepository.findOne(productGroupRequest.getId());
+
+            productGroup.setCommittee(committee);
+            productGroup.setName(productGroupRequest.getName());
+            productGroup.setDescription(productGroupRequest.getDescription());
+            productGroup.setGroupLimit(productGroupRequest.getGroupLimit());
+
+            productGroupRepository.saveAndFlush(productGroup);
         }
     }
 
     @Override
     public void deleteProductGroup(int productGroupId) {
-        productGroupRepository.findOne(productGroupId).getProducts()
-                .forEach(p -> p.setProductGroup(null));
-        productGroupRepository.delete(productGroupId);
+        ProductGroup productGroup = productGroupRepository.findOne(productGroupId);
+        if (!productGroup.getProducts().isEmpty()) {
+            throw new ProductGroupInUseException("Product group must be empty");
+        } else {
+            productGroupRepository.delete(productGroupId);
+        }
     }
 }
diff --git a/src/main/java/ch/wisv/payments/admin/products/request/ProductRequest.java b/src/main/java/ch/wisv/payments/admin/products/request/ProductRequest.java
index 1e8e674..c9bcd20 100644
--- a/src/main/java/ch/wisv/payments/admin/products/request/ProductRequest.java
+++ b/src/main/java/ch/wisv/payments/admin/products/request/ProductRequest.java
@@ -10,7 +10,7 @@ public class ProductRequest {
 
     @Getter
     @Setter
-    int productId;
+    int id;
     @Setter
     @Getter
     int committeeId;
diff --git a/src/main/java/ch/wisv/payments/exception/ProductGroupInUseException.java b/src/main/java/ch/wisv/payments/exception/ProductGroupInUseException.java
new file mode 100644
index 0000000..99edb80
--- /dev/null
+++ b/src/main/java/ch/wisv/payments/exception/ProductGroupInUseException.java
@@ -0,0 +1,7 @@
+package ch.wisv.payments.exception;
+
+public class ProductGroupInUseException extends RuntimeException {
+    public ProductGroupInUseException(String s) {
+        super(s);
+    }
+}
diff --git a/src/main/resources/templates/edit.html b/src/main/resources/templates/editProduct.html
similarity index 97%
rename from src/main/resources/templates/edit.html
rename to src/main/resources/templates/editProduct.html
index 7fd5747..6c0509d 100644
--- a/src/main/resources/templates/edit.html
+++ b/src/main/resources/templates/editProduct.html
@@ -49,7 +49,7 @@ <h3 class="panel-title">Edit</h3>
                     <!--/*@thymesVar id="product" type="ch.wisv.payments.admin.products.request.ProductRequest"*/-->
                     <form class="form-horizontal" th:action="@{/products/edit}" th:object="${product}"
                           method="post">
-                        <input type="hidden" th:field="*{productId}">
+                        <input type="hidden" th:field="*{id}">
                         <div class="form-group">
                             <label for="committeeName">Committee</label>
                             <select class="form-control" th:field="*{committeeId}" id="committeeName">
@@ -110,7 +110,7 @@ <h3 class="panel-title">Edit</h3>
                             <input type="text" class="form-control" th:field="*{returnURL}" id="ReturnURL"
                                    placeholder="Return URL">
                         </div>
-                        <button type="submit" class="btn btn-default">Edit product</button>
+                        <button type="submit" class="btn btn-success">Save product</button>
                     </form>
                 </div>
             </div>
diff --git a/src/main/resources/templates/editProductGroup.html b/src/main/resources/templates/editProductGroup.html
new file mode 100644
index 0000000..8ac9016
--- /dev/null
+++ b/src/main/resources/templates/editProductGroup.html
@@ -0,0 +1,93 @@
+<!DOCTYPE html>
+<html xmlns:th="http://www.thymeleaf.org">
+<head>
+    <meta charset="utf-8">
+    <meta http-equiv="X-UA-Compatible" content="IE=edge">
+    <meta name="viewport" content="width=device-width, initial-scale=1">
+    <!-- The above 3 meta tags *must* come first in the head; any other head content must come *after* these tags -->
+    <meta name="description" content="">
+    <meta name="author" content="">
+    <link rel="icon" href="../../favicon.ico">
+
+    <title>CH Payments</title>
+
+    <!-- Bootstrap core CSS -->
+    <link th:href="@{/webjars/bootstrap/3.3.7-1/css/bootstrap.min.css}" rel="stylesheet">
+    <link th:href="@{/webjars/wisvch-bootstrap-theme/0.0.3/dist/css/bootstrap.min.css}"
+          rel="stylesheet" media="screen"/>
+
+    <!-- Custom styles for this template -->
+    <link th:href="@{/css/dashboard.css}" rel="stylesheet">
+
+    <link rel="stylesheet" type="text/css" href="https://cdn.datatables.net/v/bs/dt-1.10.12/datatables.min.css"/>
+
+    <!-- HTML5 shim and Respond.js for IE8 support of HTML5 elements and media queries -->
+    <!--[if lt IE 9]>
+    <script src="https://oss.maxcdn.com/html5shiv/3.7.3/html5shiv.min.js"></script>
+    <script src="https://oss.maxcdn.com/respond/1.4.2/respond.min.js"></script>
+    <![endif]-->
+</head>
+
+<body>
+<div th:replace="fragments/header :: header">
+    <nav class="navbar navbar-inverse navbar-fixed-top"></nav>
+</div>
+
+<div class="container-fluid">
+    <div class="row">
+        <div th:replace="fragments/sidebar :: sidebar"></div>
+    </div>
+    <div class="col-sm-9 col-sm-offset-3 col-md-10 col-md-offset-2 main">
+        <h1 class="page-header">Products</h1>
+
+        <div class="row">
+            <div class="panel panel-default">
+                <div class="panel-heading">
+                    <h3 class="panel-title">Edit</h3>
+                </div>
+                <div class="panel-body col-lg-12">
+                    <!--/*@thymesVar id="productGroup" type="ch.wisv.payments.admin.products.request.ProductGroupRequest"*/-->
+                    <form class="form-horizontal" th:action="@{/products/group/edit}" th:object="${productGroup}"
+                          method="post">
+                        <input type="hidden" th:field="*{id}">
+                        <div class="form-group">
+                            <label for="committeeName">Committee</label>
+                            <select class="form-control" th:field="*{committeeId}" id="committeeName">
+                                <option th:each="committee : ${committees}"
+                                        th:value="${committee.id}"
+                                        th:text="${committee.getName().getName()} + ' ' +  ${committee.year}">
+                                </option>
+                            </select>
+                        </div>
+                        <div class="form-group">
+                            <label for="productName">Group Name</label>
+                            <input type="text" class="form-control" th:field="*{name}" id="productName"
+                                   placeholder="Name"
+                                   required>
+                        </div>
+                        <div class="form-group">
+                            <label for="productDescription">Description</label>
+                            <input type="text" class="form-control" th:field="*{description}" id="productDescription"
+                                   placeholder="Description" required>
+                        </div>
+                        <div class="form-group">
+                            <label for="groupLimit">Group Limit</label>
+                            <div class="input-group">
+                                <input type="number" step="1" th:field="*{groupLimit}" class="form-control"
+                                       id="groupLimit"
+                                       placeholder="Max tickets sold in group">
+                            </div>
+                        </div>
+                        <button type="submit" class="btn btn-success">Save product group</button>
+                    </form>
+                </div>
+            </div>
+        </div>
+    </div>
+</div>
+
+<script src="https://ajax.googleapis.com/ajax/libs/jquery/1.12.4/jquery.min.js"></script>
+<script>window.jQuery || document.write('<script src="../../assets/js/vendor/jquery.min.js"><\/script>')</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
index d0733af..7318161 100644
--- a/src/main/resources/templates/products.html
+++ b/src/main/resources/templates/products.html
@@ -217,22 +217,12 @@ <h3 class="panel-title">Add Product Group</h3>
                             <li th:text="${product.name}">List item</li>
                         </ul>
                     </td>
-                    <td>
-                        <!--<div class="btn-group" role="group" aria-label="...">-->
-                        <!--<button type="button" class="btn btn-info" aria-label="Edit">-->
-                        <!--<span class="glyphicon glyphicon-edit" aria-hidden="true"></span>-->
-                        <!--</button>-->
-                        <!--<button type="button" class="btn btn-danger" aria-label="Remove">-->
-                        <!--<span class="glyphicon glyphicon-remove" aria-hidden="true"></span>-->
-                        <!--</button>-->
-                        <!--</div>-->
-                    </td>
                     <td>
                         <form th:action="@{/products/group/delete/} + ${group.id}" method="post">
                             <div class="btn-group" role="group" aria-label="...">
-                                <!--<a class="btn btn-info" th:href="@{/products/edit/} + ${product.id}" href="#">-->
-                                    <!--<span class="glyphicon glyphicon-edit" aria-hidden="true"></span>-->
-                                <!--</a>-->
+                                <a class="btn btn-info" th:href="@{/products/group/edit/} + ${group.id}" href="#">
+                                    <span class="glyphicon glyphicon-edit" aria-hidden="true"></span>
+                                </a>
                                 <button type="submit" class="btn btn-danger" aria-label="Remove">
                                     <span class="glyphicon glyphicon-remove" aria-hidden="true"></span>
                                 </button>

From 31170feb2da15fe1114b7e05965585da5c5fe065 Mon Sep 17 00:00:00 2001
From: Martijn Janssen <martijn9612@gmail.com>
Date: Fri, 17 Mar 2017 21:41:13 +0100
Subject: [PATCH 3/5] Fix comments on PR

---
 .../admin/committees/CommitteeService.java    |  6 ++++
 .../committees/CommitteeServiceImpl.java      | 17 ++++++++-
 .../admin/products/ProductController.java     | 36 ++++++++++---------
 .../admin/products/ProductServiceImpl.java    | 23 ++++++------
 .../exception/CommitteeNotFoundException.java |  4 +++
 .../CommmitteeNotFoundException.java          |  4 ---
 .../exception/EmptyOrderException.java        |  2 +-
 src/main/resources/templates/products.html    |  2 +-
 8 files changed, 59 insertions(+), 35 deletions(-)
 create mode 100644 src/main/java/ch/wisv/payments/exception/CommitteeNotFoundException.java
 delete mode 100644 src/main/java/ch/wisv/payments/exception/CommmitteeNotFoundException.java

diff --git a/src/main/java/ch/wisv/payments/admin/committees/CommitteeService.java b/src/main/java/ch/wisv/payments/admin/committees/CommitteeService.java
index 596232f..8968703 100644
--- a/src/main/java/ch/wisv/payments/admin/committees/CommitteeService.java
+++ b/src/main/java/ch/wisv/payments/admin/committees/CommitteeService.java
@@ -1,12 +1,18 @@
 package ch.wisv.payments.admin.committees;
 
 import ch.wisv.payments.model.Committee;
+import ch.wisv.payments.model.CommitteeEnum;
 
 import java.util.List;
+import java.util.Optional;
 
 public interface CommitteeService {
 
     List<Committee> getAllCommittees();
 
     void addCommittee(Committee committee);
+
+    Committee getCommitteeById(int committeeId);
+
+    Committee getCommittee(CommitteeEnum committeeEnum, int year);
 }
diff --git a/src/main/java/ch/wisv/payments/admin/committees/CommitteeServiceImpl.java b/src/main/java/ch/wisv/payments/admin/committees/CommitteeServiceImpl.java
index ed79dd0..5460a94 100644
--- a/src/main/java/ch/wisv/payments/admin/committees/CommitteeServiceImpl.java
+++ b/src/main/java/ch/wisv/payments/admin/committees/CommitteeServiceImpl.java
@@ -1,11 +1,15 @@
 package ch.wisv.payments.admin.committees;
 
+import ch.wisv.payments.exception.CommitteeNotFoundException;
 import ch.wisv.payments.model.Committee;
+import ch.wisv.payments.model.CommitteeEnum;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.dao.DuplicateKeyException;
 import org.springframework.stereotype.Service;
 
+import javax.swing.text.html.Option;
 import java.util.List;
+import java.util.Optional;
 
 @Service
 public class CommitteeServiceImpl implements CommitteeService {
@@ -25,8 +29,19 @@ public List<Committee> getAllCommittees() {
     @Override
     public void addCommittee(Committee committee) {
         if (committeeRepository.findOneByNameAndYear(committee.getName(), committee.getYear()).isPresent()) {
-            throw new DuplicateKeyException("Commitee already exists!");
+            throw new DuplicateKeyException("Committee already exists!");
         }
         committeeRepository.save(committee);
     }
+
+    @Override
+    public Committee getCommitteeById(int committeeId) {
+        return committeeRepository.findOne(committeeId);
+    }
+
+    @Override
+    public Committee getCommittee(CommitteeEnum committeeEnum, int year) {
+        return committeeRepository.findOneByNameAndYear(committeeEnum, year)
+                .orElseThrow(CommitteeNotFoundException::new);
+    }
 }
diff --git a/src/main/java/ch/wisv/payments/admin/products/ProductController.java b/src/main/java/ch/wisv/payments/admin/products/ProductController.java
index b0d56af..fe067a2 100644
--- a/src/main/java/ch/wisv/payments/admin/products/ProductController.java
+++ b/src/main/java/ch/wisv/payments/admin/products/ProductController.java
@@ -63,9 +63,10 @@ public String productEdit(@PathVariable Integer productId, Model model) {
     }
 
     @PostMapping(value = "/add")
-    public String addProduct(@ModelAttribute @Validated ProductRequest productRequest) {
+    public String addProduct(@ModelAttribute @Validated ProductRequest productRequest, RedirectAttributes redirectAttributes) {
         productService.addProduct(productRequest);
 
+        redirectAttributes.addFlashAttribute("message", productRequest.getName() + " successfully added.");
         return "redirect:/products";
     }
 
@@ -73,26 +74,23 @@ public String addProduct(@ModelAttribute @Validated ProductRequest productReques
     public String editProduct(@ModelAttribute @Validated ProductRequest productRequest, RedirectAttributes redirectAttributes) {
         productService.editProduct(productRequest);
 
-        redirectAttributes.addFlashAttribute("message", productRequest.getName() + " successfully updated!");
-
+        redirectAttributes.addFlashAttribute("message", productRequest.getName() + " successfully updated.");
         return "redirect:/products";
     }
 
     @PostMapping(value = "/delete/{productId}")
     public String deleteProduct(@PathVariable int productId, RedirectAttributes redirectAttributes) {
-        try {
-            productService.deleteProduct(productId);
-        } catch (RuntimeException e) {
-            redirectAttributes.addFlashAttribute("error", e.getMessage());
-        }
+        productService.deleteProduct(productId);
+        redirectAttributes.addFlashAttribute("message", "Product successfully removed.");
 
         return "redirect:/products";
     }
 
-    @PostMapping(value = "/group")
-    public String addProductGroup(@ModelAttribute @Validated ProductGroupRequest productGroupRequest) {
+    @PostMapping(value = "/group/add")
+    public String addProductGroup(@ModelAttribute @Validated ProductGroupRequest productGroupRequest, RedirectAttributes redirectAttributes) {
         productService.addProductGroup(productGroupRequest);
-        System.out.println("here");
+
+        redirectAttributes.addFlashAttribute("message", "Product group " + productGroupRequest.getName() + " successfully added.");
 
         return "redirect:/products";
     }
@@ -119,18 +117,22 @@ public String productGroupEdit(@PathVariable Integer productGroupId, Model model
     public String editProductGroup(@ModelAttribute @Validated ProductGroupRequest productGroupRequest, RedirectAttributes redirectAttributes) {
         productService.editProductGroup(productGroupRequest);
 
-        redirectAttributes.addFlashAttribute("message", productGroupRequest.getName() + " successfully updated!");
+        redirectAttributes.addFlashAttribute("message", productGroupRequest.getName() + " successfully updated.");
 
         return "redirect:/products";
     }
 
     @PostMapping(value = "/group/delete/{productGroupId}")
     public String deleteProductGroup(@PathVariable int productGroupId, RedirectAttributes redirectAttributes) {
-        try {
-            productService.deleteProductGroup(productGroupId);
-        } catch (RuntimeException e) {
-            redirectAttributes.addFlashAttribute("error", e.getMessage());
-        }
+        productService.deleteProductGroup(productGroupId);
+        redirectAttributes.addFlashAttribute("message", "Product group successfully removed.");
+
+        return "redirect:/products";
+    }
+
+    @ExceptionHandler(RuntimeException.class)
+    public String formErrorHandler(RuntimeException e, RedirectAttributes redirectAttributes) {
+        redirectAttributes.addFlashAttribute("error", e.getMessage());
 
         return "redirect:/products";
     }
diff --git a/src/main/java/ch/wisv/payments/admin/products/ProductServiceImpl.java b/src/main/java/ch/wisv/payments/admin/products/ProductServiceImpl.java
index b410332..17ab7cf 100644
--- a/src/main/java/ch/wisv/payments/admin/products/ProductServiceImpl.java
+++ b/src/main/java/ch/wisv/payments/admin/products/ProductServiceImpl.java
@@ -1,13 +1,16 @@
 package ch.wisv.payments.admin.products;
 
 import ch.wisv.payments.admin.committees.CommitteeRepository;
+import ch.wisv.payments.admin.committees.CommitteeService;
+import ch.wisv.payments.admin.committees.CommitteeServiceImpl;
 import ch.wisv.payments.admin.products.request.ProductGroupRequest;
 import ch.wisv.payments.admin.products.request.ProductRequest;
-import ch.wisv.payments.exception.CommmitteeNotFoundException;
+import ch.wisv.payments.exception.CommitteeNotFoundException;
 import ch.wisv.payments.exception.ProductGroupInUseException;
 import ch.wisv.payments.exception.ProductInUseException;
 import ch.wisv.payments.model.*;
 import ch.wisv.payments.rest.OrderService;
+import ch.wisv.payments.rest.OrderServiceImpl;
 import ch.wisv.payments.rest.repository.ProductGroupRepository;
 import ch.wisv.payments.rest.repository.ProductRepository;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -21,14 +24,13 @@ public class ProductServiceImpl implements ProductService {
 
     private ProductRepository productRepository;
     private ProductGroupRepository productGroupRepository;
-    private CommitteeRepository committeeRepository;
+    private CommitteeService committeeService;
     private OrderService orderService;
 
-    @Autowired
-    public ProductServiceImpl(ProductRepository productRepository, ProductGroupRepository productGroupRepository, CommitteeRepository committeeRepository, OrderService orderService) {
+    public ProductServiceImpl(ProductRepository productRepository, ProductGroupRepository productGroupRepository, CommitteeService committeeService, OrderService orderService) {
         this.productRepository = productRepository;
         this.productGroupRepository = productGroupRepository;
-        this.committeeRepository = committeeRepository;
+        this.committeeService = committeeService;
         this.orderService = orderService;
     }
 
@@ -39,7 +41,7 @@ public List<Product> getAllProducts() {
 
     @Override
     public void addProduct(ProductRequest productRequest) {
-        Committee committee = committeeRepository.findOne(productRequest.getCommitteeId());
+        Committee committee = committeeService.getCommitteeById(productRequest.getCommitteeId());
         Product product = new Product(committee,
                 productRequest.getName(),
                 productRequest.getDescription(),
@@ -57,7 +59,7 @@ public void addProduct(ProductRequest productRequest) {
 
     @Override
     public void addProductGroup(ProductGroupRequest productGroupRequest) {
-        Committee committee = committeeRepository.findOne(productGroupRequest.getCommitteeId());
+        Committee committee = committeeService.getCommitteeById(productGroupRequest.getCommitteeId());
         ProductGroup group = new ProductGroup(productGroupRequest.getName(),
                 productGroupRequest.getDescription(), productGroupRequest.getGroupLimit(), committee);
 
@@ -81,7 +83,7 @@ public void addProductToGroup(Product product, ProductGroup productGroup) {
     @Override
     public void editProduct(ProductRequest productRequest) {
         if (productRequest.getId() != 0) {
-            Committee committee = committeeRepository.findOne(productRequest.getCommitteeId());
+            Committee committee = committeeService.getCommitteeById(productRequest.getCommitteeId());
             Product product = productRepository.findOne(productRequest.getId());
 
             product.setName(productRequest.getName());
@@ -121,8 +123,7 @@ public Product getProductById(Integer productId) {
 
     @Override
     public Set<Product> getProductByCommittee(CommitteeEnum committeeEnum, int year) {
-        Committee committee = committeeRepository.findOneByNameAndYear(committeeEnum, year)
-                .orElseThrow(CommmitteeNotFoundException::new);
+        Committee committee = committeeService.getCommittee(committeeEnum, year);
 
         return productRepository.findByCommittee(committee);
     }
@@ -149,7 +150,7 @@ public ProductGroup getProductGroupById(Integer productGroupId) {
     @Override
     public void editProductGroup(ProductGroupRequest productGroupRequest) {
         if (productGroupRequest.getId() != 0) {
-            Committee committee = committeeRepository.findOne(productGroupRequest.getCommitteeId());
+            Committee committee = committeeService.getCommitteeById(productGroupRequest.getCommitteeId());
             ProductGroup productGroup = productGroupRepository.findOne(productGroupRequest.getId());
 
             productGroup.setCommittee(committee);
diff --git a/src/main/java/ch/wisv/payments/exception/CommitteeNotFoundException.java b/src/main/java/ch/wisv/payments/exception/CommitteeNotFoundException.java
new file mode 100644
index 0000000..411bafd
--- /dev/null
+++ b/src/main/java/ch/wisv/payments/exception/CommitteeNotFoundException.java
@@ -0,0 +1,4 @@
+package ch.wisv.payments.exception;
+
+public class CommitteeNotFoundException extends RuntimeException {
+}
diff --git a/src/main/java/ch/wisv/payments/exception/CommmitteeNotFoundException.java b/src/main/java/ch/wisv/payments/exception/CommmitteeNotFoundException.java
deleted file mode 100644
index 1c604b1..0000000
--- a/src/main/java/ch/wisv/payments/exception/CommmitteeNotFoundException.java
+++ /dev/null
@@ -1,4 +0,0 @@
-package ch.wisv.payments.exception;
-
-public class CommmitteeNotFoundException extends RuntimeException {
-}
diff --git a/src/main/java/ch/wisv/payments/exception/EmptyOrderException.java b/src/main/java/ch/wisv/payments/exception/EmptyOrderException.java
index 21b23a0..ee7c105 100644
--- a/src/main/java/ch/wisv/payments/exception/EmptyOrderException.java
+++ b/src/main/java/ch/wisv/payments/exception/EmptyOrderException.java
@@ -1,8 +1,8 @@
 package ch.wisv.payments.exception;
 
 public class EmptyOrderException extends RuntimeException {
-
     public EmptyOrderException(String s) {
         super(s);
     }
 }
+
diff --git a/src/main/resources/templates/products.html b/src/main/resources/templates/products.html
index 7318161..992ece3 100644
--- a/src/main/resources/templates/products.html
+++ b/src/main/resources/templates/products.html
@@ -155,7 +155,7 @@ <h3 class="panel-title">Add Product Group</h3>
             </div>
             <div class="panel-body">
                 <!--/*@thymesVar id="productGroup" type="ch.wisv.payments.admin.products.request.ProductGroupRequest"*/-->
-                <form class="form-inline" th:action="@{/products/group}" th:object="${productGroup}"
+                <form class="form-inline" th:action="@{/products/group/add}" th:object="${productGroup}"
                       method="post">
                     <div class="form-group">
                         <label class="sr-only" for="committeeNameGroup">Committee</label>

From 4e8e76f7518a35d3ecd0ef419dfbf913dafe22b4 Mon Sep 17 00:00:00 2001
From: Martijn Janssen <martijn9612@gmail.com>
Date: Fri, 17 Mar 2017 21:44:16 +0100
Subject: [PATCH 4/5] Remove unused imports

---
 .../ch/wisv/payments/admin/committees/CommitteeService.java  | 1 -
 .../wisv/payments/admin/committees/CommitteeServiceImpl.java | 2 --
 .../ch/wisv/payments/admin/products/ProductServiceImpl.java  | 5 -----
 3 files changed, 8 deletions(-)

diff --git a/src/main/java/ch/wisv/payments/admin/committees/CommitteeService.java b/src/main/java/ch/wisv/payments/admin/committees/CommitteeService.java
index 8968703..0751fe7 100644
--- a/src/main/java/ch/wisv/payments/admin/committees/CommitteeService.java
+++ b/src/main/java/ch/wisv/payments/admin/committees/CommitteeService.java
@@ -4,7 +4,6 @@
 import ch.wisv.payments.model.CommitteeEnum;
 
 import java.util.List;
-import java.util.Optional;
 
 public interface CommitteeService {
 
diff --git a/src/main/java/ch/wisv/payments/admin/committees/CommitteeServiceImpl.java b/src/main/java/ch/wisv/payments/admin/committees/CommitteeServiceImpl.java
index 5460a94..3d2d190 100644
--- a/src/main/java/ch/wisv/payments/admin/committees/CommitteeServiceImpl.java
+++ b/src/main/java/ch/wisv/payments/admin/committees/CommitteeServiceImpl.java
@@ -7,9 +7,7 @@
 import org.springframework.dao.DuplicateKeyException;
 import org.springframework.stereotype.Service;
 
-import javax.swing.text.html.Option;
 import java.util.List;
-import java.util.Optional;
 
 @Service
 public class CommitteeServiceImpl implements CommitteeService {
diff --git a/src/main/java/ch/wisv/payments/admin/products/ProductServiceImpl.java b/src/main/java/ch/wisv/payments/admin/products/ProductServiceImpl.java
index 17ab7cf..f04a9ca 100644
--- a/src/main/java/ch/wisv/payments/admin/products/ProductServiceImpl.java
+++ b/src/main/java/ch/wisv/payments/admin/products/ProductServiceImpl.java
@@ -1,19 +1,14 @@
 package ch.wisv.payments.admin.products;
 
-import ch.wisv.payments.admin.committees.CommitteeRepository;
 import ch.wisv.payments.admin.committees.CommitteeService;
-import ch.wisv.payments.admin.committees.CommitteeServiceImpl;
 import ch.wisv.payments.admin.products.request.ProductGroupRequest;
 import ch.wisv.payments.admin.products.request.ProductRequest;
-import ch.wisv.payments.exception.CommitteeNotFoundException;
 import ch.wisv.payments.exception.ProductGroupInUseException;
 import ch.wisv.payments.exception.ProductInUseException;
 import ch.wisv.payments.model.*;
 import ch.wisv.payments.rest.OrderService;
-import ch.wisv.payments.rest.OrderServiceImpl;
 import ch.wisv.payments.rest.repository.ProductGroupRepository;
 import ch.wisv.payments.rest.repository.ProductRepository;
-import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 
 import java.util.List;

From bf2ed000e7852561ba06c3b9be133e97086bb7ca Mon Sep 17 00:00:00 2001
From: Martijn Janssen <martijn9612@gmail.com>
Date: Fri, 17 Mar 2017 22:31:55 +0100
Subject: [PATCH 5/5] Fix formatting in forms

---
 src/main/resources/templates/editProduct.html    |  3 +--
 .../resources/templates/editProductGroup.html    |  3 +--
 src/main/resources/templates/products.html       | 16 +++++++---------
 3 files changed, 9 insertions(+), 13 deletions(-)

diff --git a/src/main/resources/templates/editProduct.html b/src/main/resources/templates/editProduct.html
index 6c0509d..e97889a 100644
--- a/src/main/resources/templates/editProduct.html
+++ b/src/main/resources/templates/editProduct.html
@@ -47,8 +47,7 @@ <h3 class="panel-title">Edit</h3>
                 </div>
                 <div class="panel-body col-lg-12">
                     <!--/*@thymesVar id="product" type="ch.wisv.payments.admin.products.request.ProductRequest"*/-->
-                    <form class="form-horizontal" th:action="@{/products/edit}" th:object="${product}"
-                          method="post">
+                    <form th:action="@{/products/edit}" th:object="${product}" method="post">
                         <input type="hidden" th:field="*{id}">
                         <div class="form-group">
                             <label for="committeeName">Committee</label>
diff --git a/src/main/resources/templates/editProductGroup.html b/src/main/resources/templates/editProductGroup.html
index 8ac9016..32af118 100644
--- a/src/main/resources/templates/editProductGroup.html
+++ b/src/main/resources/templates/editProductGroup.html
@@ -47,8 +47,7 @@ <h3 class="panel-title">Edit</h3>
                 </div>
                 <div class="panel-body col-lg-12">
                     <!--/*@thymesVar id="productGroup" type="ch.wisv.payments.admin.products.request.ProductGroupRequest"*/-->
-                    <form class="form-horizontal" th:action="@{/products/group/edit}" th:object="${productGroup}"
-                          method="post">
+                    <form th:action="@{/products/group/edit}" th:object="${productGroup}" method="post">
                         <input type="hidden" th:field="*{id}">
                         <div class="form-group">
                             <label for="committeeName">Committee</label>
diff --git a/src/main/resources/templates/products.html b/src/main/resources/templates/products.html
index 992ece3..3f6b185 100644
--- a/src/main/resources/templates/products.html
+++ b/src/main/resources/templates/products.html
@@ -49,8 +49,7 @@ <h3 class="panel-title">Add products</h3>
                 </div>
                 <div class="panel-body">
                     <!--/*@thymesVar id="product" type="ch.wisv.payments.admin.products.request.ProductRequest"*/-->
-                    <form class="form-inline" th:action="@{/products/add}" th:object="${product}"
-                          method="post">
+                    <form class="form-inline" th:action="@{/products/add}" th:object="${product}" method="post">
                         <div class="form-group">
                             <label class="sr-only" for="committeeName">Committee</label>
                             <select class="form-control" th:field="*{committeeId}" id="committeeName">
@@ -71,7 +70,7 @@ <h3 class="panel-title">Add products</h3>
                             <input type="text" class="form-control" th:field="*{description}" id="productDescription"
                                    placeholder="Description" required>
                         </div>
-                        <!--<div class="form-group">
+                        <div class="form-group">
                             <label class="sr-only" for="productGroupId">Product Group</label>
                             <select class="form-control" th:field="*{groupId}" id="productGroupId">
                                 <option th:value="0">No Product Group</option>
@@ -80,10 +79,10 @@ <h3 class="panel-title">Add products</h3>
                                         th:text="${group.getName()}">
                                 </option>
                             </select>
-                        </div>-->
+                        </div>
                         <div class="form-group">
                             <label for="productPrice">Price</label>
-                            <div class="input-group col-xs-6">
+                            <div class="input-group">
                                 <div class="input-group-addon">€</div>
                                 <input type="number" step="0.01" th:field="*{price}" class="form-control"
                                        id="productPrice"
@@ -92,7 +91,7 @@ <h3 class="panel-title">Add products</h3>
                         </div>
                         <div class="form-group">
                             <label for="productLimit">Product Limit</label>
-                            <div class="input-group col-xs-4">
+                            <div class="input-group">
                                 <input type="number" step="1" th:field="*{availableProducts}" class="form-control"
                                        id="productLimit"
                                        placeholder="Limit" required>
@@ -155,8 +154,7 @@ <h3 class="panel-title">Add Product Group</h3>
             </div>
             <div class="panel-body">
                 <!--/*@thymesVar id="productGroup" type="ch.wisv.payments.admin.products.request.ProductGroupRequest"*/-->
-                <form class="form-inline" th:action="@{/products/group/add}" th:object="${productGroup}"
-                      method="post">
+                <form class="form-inline" th:action="@{/products/group/}" th:object="${productGroup}" method="post">
                     <div class="form-group">
                         <label class="sr-only" for="committeeNameGroup">Committee</label>
                         <select class="form-control" th:field="*{committeeId}" id="committeeNameGroup">
@@ -174,7 +172,7 @@ <h3 class="panel-title">Add Product Group</h3>
                     </div>
                     <div class="form-group">
                         <label for="productLimit">Limit</label>
-                        <div class="input-group col-xs-4">
+                        <div class="input-group">
                             <input type="number" step="1" th:field="*{groupLimit}" class="form-control"
                                    id="groupLimit"
                                    placeholder="Limit" required>