Remove repo reference in helper utility

Author: sdavis-amido

java/src/main/java/com/amido/stacks/workloads/menu/service/v1/CategoryService.java

@@ -13,6 +13,7 @@
 import com.amido.stacks.workloads.menu.mappers.CategoryMapper;
 import com.amido.stacks.workloads.menu.mappers.wrappers.CreateCategoryMapper;
 import com.amido.stacks.workloads.menu.mappers.wrappers.UpdateCategoryMapper;
+import com.amido.stacks.workloads.menu.repository.MenuRepository;
 import com.amido.stacks.workloads.menu.service.data.MenuQueryService;
 import com.amido.stacks.workloads.menu.service.v1.utility.MenuHelperService;
 import java.util.Optional;
@@ -25,6 +26,8 @@
 @RequiredArgsConstructor
 public class CategoryService {
 
+  private final MenuRepository menuRepository;
+
   private final MenuQueryService menuQueryService;
 
   private final MenuHelperService menuHelperService;
@@ -48,7 +51,7 @@ public ResourceCreatedResponse create(
     categoryDTO.setId(categoryId.toString());
 
     menuHelperService.addOrUpdateCategory(menu, categoryMapper.fromDto(categoryDTO));
-    menuHelperService.save(menu);
+    menuRepository.save(menu);
 
     return new ResourceCreatedResponse(categoryId);
   }
@@ -69,7 +72,7 @@ public ResourceUpdatedResponse update(
     updatedCategory.setItems(category.getItems());
 
     menuHelperService.addOrUpdateCategory(menu, updatedCategory);
-    menuHelperService.save(menu);
+    menuRepository.save(menu);
 
     return new ResourceUpdatedResponse(categoryId);
   }
@@ -81,7 +84,7 @@ public void delete(UUID menuId, UUID categoryId, String correlationId) {
     menuHelperService.checkCategoryExistsById(menu, categoryId);
 
     menuHelperService.removeCategory(menu, categoryId);
-    menuHelperService.save(menu);
+    menuRepository.save(menu);
   }
 
   private Menu getMenu(UUID menuId) {

java/src/main/java/com/amido/stacks/workloads/menu/service/v1/ItemService.java

@@ -12,6 +12,7 @@
 import com.amido.stacks.workloads.menu.mappers.ItemMapper;
 import com.amido.stacks.workloads.menu.mappers.wrappers.CreateItemMapper;
 import com.amido.stacks.workloads.menu.mappers.wrappers.UpdateItemMapper;
+import com.amido.stacks.workloads.menu.repository.MenuRepository;
 import com.amido.stacks.workloads.menu.service.data.MenuQueryService;
 import com.amido.stacks.workloads.menu.service.v1.utility.MenuHelperService;
 import java.util.Optional;
@@ -24,6 +25,8 @@
 @RequiredArgsConstructor
 public class ItemService {
 
+  private final MenuRepository menuRepository;
+
   private final MenuQueryService menuQueryService;
 
   private final MenuHelperService menuHelperService;
@@ -49,7 +52,7 @@ public ResourceCreatedResponse create(
     itemDTO.setId(itemId.toString());
 
     menuHelperService.addOrUpdateItem(category, itemMapper.fromDto(itemDTO));
-    menuHelperService.save(menu);
+    menuRepository.save(menu);
 
     return new ResourceCreatedResponse(itemId);
   }
@@ -73,7 +76,7 @@ public ResourceUpdatedResponse update(
     itemDTO.setId(item.getId());
 
     menuHelperService.addOrUpdateItem(category, itemMapper.fromDto(itemDTO));
-    menuHelperService.save(menu);
+    menuRepository.save(menu);
 
     return new ResourceUpdatedResponse(itemId);
   }
@@ -87,7 +90,7 @@ public void delete(UUID menuId, UUID categoryId, UUID itemId, String correlation
     menuHelperService.checkItemExistsById(menuId, category, itemId);
 
     menuHelperService.removeItem(category, itemId);
-    menuHelperService.save(menu);
+    menuRepository.save(menu);
   }
 
   private Menu getMenu(UUID menuId) {

java/src/main/java/com/amido/stacks/workloads/menu/service/v1/utility/MenuHelperService.java

@@ -103,8 +103,4 @@ public void removeItem(Category category, UUID itemId) {
   public void removeCategory(Menu menu, UUID categoryId) {
     menu.getCategories().removeIf(c -> c.getId().equals(categoryId.toString()));
   }
-
-  public Menu save(Menu menu) {
-    return menuRepository.save(menu);
-  }
 }

java/src/test/java/com/amido/stacks/workloads/menu/service/data/CosmosMenuQueryServiceTest.java

@@ -60,6 +60,31 @@ void findAll() {
     then(actualResults).isEqualTo(results);
   }
 
+  @Test
+  void findAllNextPage() {
+
+    MenuRepository repository = mock(MenuRepository.class);
+    MenuQueryService menuQueryService = new CosmosMenuQueryService(repository);
+
+    Pageable pageable = mock(Pageable.class);
+
+    List<Menu> results = MenuHelper.createMenus(2);
+    Page<Menu> page1 = new PageImpl<>(results, pageable, 2);
+    Page<Menu> page2 = new PageImpl<>(results, pageable, 2);
+
+    Page<Menu> mockPage1 = (Page<Menu>) mock(Page.class);
+
+    // Given
+    given(repository.findAll(any(Pageable.class))).willReturn(page1);
+    given(repository.findAll(eq(pageable))).willReturn(page2);
+
+    // When
+    List<Menu> actualResults = menuQueryService.findAll(2, 5);
+
+    // Then
+    then(actualResults).isEqualTo(results);
+  }
+
   @Test
   void findAllByRestaurantId() {