Code refactoring.

suoapvs · Mar 14, 2018 · 434192c · 434192c
1 parent 119462a
commit 434192c
Show file tree

Hide file tree

Showing 4 changed files with 18 additions and 12 deletions.
diff --git a/src/main/java/ua/com/alexcoffee/controller/admin/AdminUsersController.java b/src/main/java/ua/com/alexcoffee/controller/admin/AdminUsersController.java
@@ -98,7 +98,6 @@ public ModelAndView viewUser(@PathVariable(value = "id") final long id) {
      * члена персонала (администратора или менеджера).
      * URL запроса "/admin/user/add", метод GET.
      *
-     * @param modelAndView Объект класса {@link ModelAndView}.
      * @return Объект класса {@link ModelAndView}.
      */
     @RequestMapping(

diff --git a/src/main/java/ua/com/alexcoffee/model/order/OrderBuilder.java b/src/main/java/ua/com/alexcoffee/model/order/OrderBuilder.java
@@ -54,6 +54,7 @@ public Order build() {
         order.setClient(getClient());
         order.setManager(getManager());
         order.setSalePositions(getSalePositions());
+        updateSalePositions(order);
         return super.build(order);
     }
 
@@ -174,18 +175,16 @@ private User getClient() {
     }
 
     private User getManager() {
-        final User manager;
-        if (isNotNull(this.manager)) {
-            manager = this.manager;
-        } else {
-            final UserBuilder userBuilder = User.getBuilder();
-            userBuilder.addRole(UserRole.MANAGER);
-            manager = userBuilder.build();
-        }
-        return manager;
+        return this.manager;
     }
 
     private Collection<SalePosition> getSalePositions() {
         return this.salePositions;
     }
+
+    private void updateSalePositions(final Order order) {
+        for (SalePosition position : this.salePositions) {
+            position.setOrder(order);
+        }
+    }
 }
diff --git a/src/main/java/ua/com/alexcoffee/model/order/OrderStatus.java b/src/main/java/ua/com/alexcoffee/model/order/OrderStatus.java
@@ -30,5 +30,9 @@ public enum OrderStatus {
     /**
      * Отказ заказа.
      */
-    REJECTION
+    REJECTION;
+
+    public String getDescription() {
+        return toString();
+    }
 }
diff --git a/src/main/java/ua/com/alexcoffee/model/user/UserRole.java b/src/main/java/ua/com/alexcoffee/model/user/UserRole.java
@@ -20,5 +20,9 @@ public enum UserRole {
     /**
      * Роль для менеджера сайта.
      */
-    MANAGER
+    MANAGER;
+
+    public String getDescription() {
+        return toString();
+    }
 }