Additional Refactoring

Ensono · Jul 26, 2022 · 021d2f8 · 021d2f8
1 parent e232b5c
commit 021d2f8
Show file tree

Hide file tree

Showing 8 changed files with 75 additions and 39 deletions.
diff --git a/java/src/main/java/com/amido/stacks/workloads/menu/domain/Category.java b/java/src/main/java/com/amido/stacks/workloads/menu/domain/Category.java
@@ -2,7 +2,6 @@
 
 import java.util.ArrayList;
 import java.util.List;
-import java.util.stream.Collectors;
 import lombok.AllArgsConstructor;
 import lombok.Builder;
 import lombok.Data;
@@ -18,16 +17,4 @@ public class Category {
   private String description;
 
   @Builder.Default private List<Item> items = new ArrayList<>();
-
-  public Category addOrUpdateItem(Item item) {
-    if (this.items == null) {
-      this.items = new ArrayList<>();
-    }
-    this.items =
-        this.items.stream()
-            .filter(c -> !c.getId().equals(item.getId()))
-            .collect(Collectors.toList());
-    this.items.add(item);
-    return this;
-  }
 }
diff --git a/java/src/main/java/com/amido/stacks/workloads/menu/domain/Menu.java b/java/src/main/java/com/amido/stacks/workloads/menu/domain/Menu.java
@@ -2,7 +2,6 @@
 
 import java.util.ArrayList;
 import java.util.List;
-import java.util.stream.Collectors;
 import lombok.AllArgsConstructor;
 import lombok.Builder;
 import lombok.Data;
@@ -24,16 +23,4 @@ public class Menu {
   @Builder.Default private List<Category> categories = new ArrayList<>();
 
   private Boolean enabled;
-
-  public Menu addOrUpdateCategory(Category category) {
-    if (this.categories == null) {
-      this.categories = new ArrayList<>();
-    }
-    this.categories =
-        this.categories.stream()
-            .filter(c -> !c.getId().equals(category.getId()))
-            .collect(Collectors.toList());
-    this.categories.add(category);
-    return this;
-  }
 }
diff --git a/java/src/main/java/com/amido/stacks/workloads/menu/service/utility/MenuHelperService.java b/java/src/main/java/com/amido/stacks/workloads/menu/service/utility/MenuHelperService.java
@@ -0,0 +1,45 @@
+package com.amido.stacks.workloads.menu.service.utility;
+
+import com.amido.stacks.workloads.menu.domain.Category;
+import com.amido.stacks.workloads.menu.domain.Item;
+import com.amido.stacks.workloads.menu.domain.Menu;
+import java.util.ArrayList;
+import java.util.List;
+import java.util.stream.Collectors;
+import org.springframework.stereotype.Component;
+
+@Component
+public class MenuHelperService {
+
+  public void addOrUpdateCategory(Menu menu, Category category) {
+
+    if (menu.getCategories() == null) {
+      menu.setCategories(new ArrayList<>());
+    }
+
+    List<Category> newCategories =
+        menu.getCategories().stream()
+            .filter(c -> !c.getId().equals(category.getId()))
+            .collect(Collectors.toList());
+
+    newCategories.add(category);
+
+    menu.setCategories(newCategories);
+  }
+
+  public void addOrUpdateItem(Category category, Item item) {
+
+    if (category.getItems() == null) {
+      category.setItems(new ArrayList<>());
+    }
+
+    List<Item> newItems =
+        category.getItems().stream()
+            .filter(c -> !c.getId().equals(item.getId()))
+            .collect(Collectors.toList());
+
+    newItems.add(item);
+
+    category.setItems(newItems);
+  }
+}
diff --git a/java/src/main/java/com/amido/stacks/workloads/menu/service/v1/MenuService.java b/java/src/main/java/com/amido/stacks/workloads/menu/service/v1/MenuService.java
@@ -11,6 +11,7 @@
 import com.amido.stacks.workloads.menu.domain.Menu;
 import com.amido.stacks.workloads.menu.mappers.MenuMapper;
 import com.amido.stacks.workloads.menu.mappers.SearchMenuResultItemMapper;
+import com.amido.stacks.workloads.menu.service.utility.MenuHelperService;
 import java.util.ArrayList;
 import java.util.List;
 import java.util.UUID;
@@ -28,6 +29,8 @@ public class MenuService {
 
   private final SearchMenuResultItemMapper searchMenuResultItemMapper;
 
+  private final MenuHelperService menuHelperService;
+
   public ResourceCreatedResponse create(@Valid CreateMenuRequest body, String correlationId) {
 
     return new ResourceCreatedResponse(UUID.randomUUID());
@@ -73,7 +76,8 @@ public MenuDTO get(UUID id, String correlationId) {
         new Menu(id.toString(), restaurantId, "name", "description", new ArrayList<>(), true);
     Item item = new Item(itemId, "item name", "item description", 5.99d, true);
     Category category = new Category(categoryId, "cat name", "cat description", List.of(item));
-    menu.addOrUpdateCategory(category);
+
+    menuHelperService.addOrUpdateCategory(menu, category);
 
     return menuMapper.toDto(menu);
   }

diff --git a/java/src/main/java/com/amido/stacks/workloads/menu/service/v2/MenuServiceV2.java b/java/src/main/java/com/amido/stacks/workloads/menu/service/v2/MenuServiceV2.java
@@ -4,6 +4,7 @@
 import com.amido.stacks.workloads.menu.domain.Menu;
 import com.amido.stacks.workloads.menu.mappers.MenuMapper;
 import com.amido.stacks.workloads.menu.mappers.SearchMenuResultItemMapper;
+import com.amido.stacks.workloads.menu.service.utility.MenuHelperService;
 import com.amido.stacks.workloads.menu.service.v1.MenuService;
 import java.util.ArrayList;
 import java.util.UUID;
@@ -13,8 +14,10 @@
 public class MenuServiceV2 extends MenuService {
 
   public MenuServiceV2(
-      MenuMapper menuMapper, SearchMenuResultItemMapper searchMenuResultItemMapper) {
-    super(menuMapper, searchMenuResultItemMapper);
+      MenuMapper menuMapper,
+      SearchMenuResultItemMapper searchMenuResultItemMapper,
+      MenuHelperService menuHelperService) {
+    super(menuMapper, searchMenuResultItemMapper, menuHelperService);
   }
 
   @Override

diff --git a/java/src/test/java/com/amido/stacks/workloads/menu/api/v1/CategoryControllerTest.java b/java/src/test/java/com/amido/stacks/workloads/menu/api/v1/CategoryControllerTest.java
@@ -18,6 +18,7 @@
 import com.amido.stacks.workloads.menu.api.v1.dto.request.UpdateCategoryRequest;
 import com.amido.stacks.workloads.menu.domain.Category;
 import com.amido.stacks.workloads.menu.domain.Menu;
+import com.amido.stacks.workloads.menu.service.utility.MenuHelperService;
 import java.util.List;
 import org.junit.jupiter.api.Tag;
 import org.junit.jupiter.api.Test;
@@ -47,6 +48,8 @@ public class CategoryControllerTest {
 
   @Autowired private TestRestTemplate testRestTemplate;
 
+  @Autowired private MenuHelperService menuHelperService;
+
   @Test
   void testInvalidMenuIdWilThrowBadRequest() {
     // Given
@@ -90,7 +93,8 @@ void testUpdateCategorySuccess() {
     // Given
     Menu menu = createMenu(0);
     Category category = createCategory(0);
-    menu.addOrUpdateCategory(category);
+
+    menuHelperService.addOrUpdateCategory(menu, category);
 
     UpdateCategoryRequest request = new UpdateCategoryRequest("new Category", "new Description");
 
@@ -194,8 +198,8 @@ void testDeleteCategoryWithAnItem() {
     // Given
     Menu menu = createMenu(1);
     Category category = createCategory(0);
-    category.addOrUpdateItem(createItem(0));
-    menu.addOrUpdateCategory(category);
+    menuHelperService.addOrUpdateItem(category, createItem(0));
+    menuHelperService.addOrUpdateCategory(menu, category);
 
     // When
     String requestUrl =

diff --git a/java/src/test/java/com/amido/stacks/workloads/menu/api/v1/ItemControllerTest.java b/java/src/test/java/com/amido/stacks/workloads/menu/api/v1/ItemControllerTest.java
@@ -19,6 +19,7 @@
 import com.amido.stacks.workloads.menu.domain.Category;
 import com.amido.stacks.workloads.menu.domain.Item;
 import com.amido.stacks.workloads.menu.domain.Menu;
+import com.amido.stacks.workloads.menu.service.utility.MenuHelperService;
 import java.util.ArrayList;
 import java.util.List;
 import java.util.UUID;
@@ -51,13 +52,15 @@ public class ItemControllerTest {
 
   @Autowired private TestRestTemplate testRestTemplate;
 
+  @Autowired private MenuHelperService menuHelperService;
+
   @Test
   void testAddItem() {
     // Given
     Menu menu = createMenu(1);
     Category category =
         new Category(randomUUID().toString(), "cat name", "cat description", new ArrayList<>());
-    menu.addOrUpdateCategory(category);
+    menuHelperService.addOrUpdateCategory(menu, category);
 
     CreateItemRequest request =
         new CreateItemRequest("Some Name", "Some Description", 13.56d, true);
@@ -101,8 +104,8 @@ void testUpdateItemSuccess() {
     Menu menu = createMenu(0);
     Category category = createCategory(0);
     Item item = createItem(0);
-    category.addOrUpdateItem(item);
-    menu.addOrUpdateCategory(category);
+    menuHelperService.addOrUpdateItem(category, item);
+    menuHelperService.addOrUpdateCategory(menu, category);
 
     UpdateItemRequest request =
         new UpdateItemRequest("Some Name", "Some Description", 13.56d, true);
@@ -130,7 +133,7 @@ void testUpdateItemDescription() {
     Category category = createCategory(0);
     List<Item> items = createItems(2);
     category.setItems(items);
-    menu.addOrUpdateCategory(category);
+    menuHelperService.addOrUpdateCategory(menu, category);
 
     UpdateItemRequest request =
         new UpdateItemRequest(items.get(0).getName(), "Some Description2", 13.56d, true);
@@ -158,8 +161,8 @@ void testDeleteItemSuccess() {
     Menu menu = createMenu(1);
     Category category = createCategory(0);
     Item item = new Item(UUID.randomUUID().toString(), "New Item", "Item description", 12.2d, true);
-    category.addOrUpdateItem(item);
-    menu.addOrUpdateCategory(category);
+    menuHelperService.addOrUpdateItem(category, item);
+    menuHelperService.addOrUpdateCategory(menu, category);
 
     // When
     String requestUrl =

diff --git a/java/src/test/java/com/amido/stacks/workloads/menu/api/v1/MenuControllerTest.java b/java/src/test/java/com/amido/stacks/workloads/menu/api/v1/MenuControllerTest.java
@@ -24,6 +24,7 @@
 import com.amido.stacks.workloads.menu.mappers.ItemMapper;
 import com.amido.stacks.workloads.menu.mappers.MenuMapper;
 import com.amido.stacks.workloads.menu.mappers.SearchMenuResultItemMapper;
+import com.amido.stacks.workloads.menu.service.utility.MenuHelperService;
 import java.util.ArrayList;
 import java.util.Arrays;
 import java.util.Collections;
@@ -70,6 +71,8 @@ public class MenuControllerTest {
 
   @Autowired private SearchMenuResultItemMapper searchMenuResultItemMapper;
 
+  @Autowired private MenuHelperService menuHelperService;
+
   @Test
   void testCreateNewMenu() {
     // Given
@@ -154,7 +157,7 @@ public void getMenuById() {
     Item item = new Item(itemId, "item name", "item description", 5.99d, true);
     Category category =
         new Category(categoryId, "cat name", "cat description", Arrays.asList(item));
-    menu.addOrUpdateCategory(category);
+    menuHelperService.addOrUpdateCategory(menu, category);
 
     MenuDTO expectedResponse = menuMapper.toDto(menu);