Feature/4750 controller delegate to service

java/src/main/java/com/amido/stacks/workloads/menu/api/v1/CategoryController.java

@@ -9,10 +9,12 @@
 import com.amido.stacks.core.api.dto.response.ResourceUpdatedResponse;
 import com.amido.stacks.workloads.menu.api.v1.dto.request.CreateCategoryRequest;
 import com.amido.stacks.workloads.menu.api.v1.dto.request.UpdateCategoryRequest;
+import com.amido.stacks.workloads.menu.service.v1.CategoryService;
 import io.swagger.v3.oas.annotations.Operation;
 import io.swagger.v3.oas.annotations.Parameter;
 import java.util.UUID;
 import javax.validation.Valid;
+import lombok.RequiredArgsConstructor;
 import org.springframework.http.HttpStatus;
 import org.springframework.http.MediaType;
 import org.springframework.http.ResponseEntity;
@@ -29,21 +31,24 @@
     path = "/v1/menu/{id}/category",
     produces = MediaType.APPLICATION_JSON_VALUE + "; charset=utf-8")
 @RestController
+@RequiredArgsConstructor
 public class CategoryController {
 
+  private final CategoryService categoryService;
+
   @PostMapping
   @Operation(
       tags = "Category",
       summary = "Create a category in the menu",
       description = "Adds a category to menu",
       operationId = "AddMenuCategory")
   @CreateAPIResponses
-  ResponseEntity<ResourceCreatedResponse> addMenuCategory(
+  ResponseEntity<ResourceCreatedResponse> createCategory(
       @Parameter(description = "Menu id", required = true) @PathVariable("id") UUID menuId,
       @Valid @RequestBody CreateCategoryRequest body,
       @Parameter(hidden = true) @RequestAttribute("CorrelationId") String correlationId) {
 
-    return new ResponseEntity<>(new ResourceCreatedResponse(UUID.randomUUID()), HttpStatus.CREATED);
+    return new ResponseEntity<>(categoryService.create(body, correlationId), HttpStatus.CREATED);
   }
 
   @PutMapping("/{categoryId}")
@@ -53,14 +58,15 @@ ResponseEntity<ResourceCreatedResponse> addMenuCategory(
       description = "Update a category to menu",
       operationId = "UpdateMenuCategory")
   @UpdateAPIResponses
-  ResponseEntity<ResourceUpdatedResponse> updateMenuCategory(
+  ResponseEntity<ResourceUpdatedResponse> updateCategory(
       @Parameter(description = "Menu id", required = true) @PathVariable("id") UUID menuId,
       @Parameter(description = "Category id", required = true) @PathVariable("categoryId")
           UUID categoryId,
       @Valid @RequestBody UpdateCategoryRequest body,
       @Parameter(hidden = true) @RequestAttribute("CorrelationId") String correlationId) {
 
-    return new ResponseEntity<>(new ResourceUpdatedResponse(UUID.randomUUID()), OK);
+    return new ResponseEntity<>(
+        categoryService.update(menuId, categoryId, body, correlationId), OK);
   }
 
   @DeleteMapping("/{categoryId}")

java/src/main/java/com/amido/stacks/workloads/menu/api/v1/ItemController.java

@@ -9,10 +9,12 @@
 import com.amido.stacks.core.api.dto.response.ResourceUpdatedResponse;
 import com.amido.stacks.workloads.menu.api.v1.dto.request.CreateItemRequest;
 import com.amido.stacks.workloads.menu.api.v1.dto.request.UpdateItemRequest;
+import com.amido.stacks.workloads.menu.service.v1.ItemService;
 import io.swagger.v3.oas.annotations.Operation;
 import io.swagger.v3.oas.annotations.Parameter;
 import java.util.UUID;
 import javax.validation.Valid;
+import lombok.RequiredArgsConstructor;
 import org.springframework.http.HttpStatus;
 import org.springframework.http.MediaType;
 import org.springframework.http.ResponseEntity;
@@ -29,23 +31,27 @@
     path = "/v1/menu/{id}/category/{categoryId}/items",
     produces = MediaType.APPLICATION_JSON_VALUE + "; charset=utf-8")
 @RestController
+@RequiredArgsConstructor
 public class ItemController {
 
+  private final ItemService itemService;
+
   @PostMapping
   @Operation(
       tags = "Item",
       summary = "Add an item to an existing category in a menu",
       description = "Adds a menu item",
       operationId = "AddMenuItem")
   @CreateAPIResponses
-  ResponseEntity<ResourceCreatedResponse> addMenuItem(
+  ResponseEntity<ResourceCreatedResponse> createItem(
       @Parameter(description = "Menu id", required = true) @PathVariable("id") UUID menuId,
       @Parameter(description = "Category id", required = true) @PathVariable("categoryId")
           UUID categoryId,
       @Valid @RequestBody CreateItemRequest body,
       @Parameter(hidden = true) @RequestAttribute("CorrelationId") String correlationId) {
 
-    return new ResponseEntity<>(new ResourceCreatedResponse(UUID.randomUUID()), HttpStatus.CREATED);
+    return new ResponseEntity<>(
+        itemService.create(menuId, categoryId, body, correlationId), HttpStatus.CREATED);
   }
 
   @PutMapping("/{itemId}")
@@ -63,7 +69,8 @@ ResponseEntity<ResourceUpdatedResponse> updateItem(
       @Valid @RequestBody UpdateItemRequest body,
       @Parameter(hidden = true) @RequestAttribute("CorrelationId") String correlationId) {
 
-    return new ResponseEntity<>(new ResourceUpdatedResponse(UUID.randomUUID()), HttpStatus.OK);
+    return new ResponseEntity<>(
+        itemService.update(menuId, categoryId, body, correlationId), HttpStatus.OK);
   }
 
   @DeleteMapping("/{itemId}")

java/src/main/java/com/amido/stacks/workloads/menu/api/v1/MenuController.java

@@ -13,24 +13,15 @@
 import com.amido.stacks.workloads.menu.api.v1.dto.request.UpdateMenuRequest;
 import com.amido.stacks.workloads.menu.api.v1.dto.response.MenuDTO;
 import com.amido.stacks.workloads.menu.api.v1.dto.response.SearchMenuResult;
-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.mappers.MenuMapper;
-import com.amido.stacks.workloads.menu.mappers.SearchMenuResultItemMapper;
+import com.amido.stacks.workloads.menu.service.v1.MenuService;
 import io.swagger.v3.oas.annotations.Operation;
 import io.swagger.v3.oas.annotations.Parameter;
 import io.swagger.v3.oas.annotations.media.Content;
 import io.swagger.v3.oas.annotations.media.Schema;
 import io.swagger.v3.oas.annotations.responses.ApiResponse;
-import java.util.ArrayList;
-import java.util.List;
 import java.util.UUID;
-import java.util.stream.Collectors;
 import javax.validation.Valid;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-import org.springframework.beans.factory.annotation.Autowired;
+import lombok.RequiredArgsConstructor;
 import org.springframework.http.HttpStatus;
 import org.springframework.http.MediaType;
 import org.springframework.http.ResponseEntity;
@@ -47,13 +38,10 @@
 
 @RequestMapping(path = "/v1/menu", produces = MediaType.APPLICATION_JSON_VALUE + "; charset=utf-8")
 @RestController
+@RequiredArgsConstructor
 public class MenuController {
 
-  Logger logger = LoggerFactory.getLogger(MenuController.class);
-
-  @Autowired private MenuMapper menuMapper;
-
-  @Autowired private SearchMenuResultItemMapper searchMenuResultItemMapper;
+  private final MenuService menuService;
 
   @PostMapping
   @Operation(
@@ -66,7 +54,7 @@ ResponseEntity<ResourceCreatedResponse> createMenu(
       @Valid @RequestBody CreateMenuRequest body,
       @Parameter(hidden = true) @RequestAttribute("CorrelationId") String correlationId) {
 
-    return new ResponseEntity<>(new ResourceCreatedResponse(UUID.randomUUID()), HttpStatus.CREATED);
+    return new ResponseEntity<>(menuService.create(body, correlationId), HttpStatus.CREATED);
   }
 
   @GetMapping
@@ -90,34 +78,7 @@ ResponseEntity<SearchMenuResult> searchMenu(
       @RequestParam(value = "pageNumber", required = false, defaultValue = "1")
           Integer pageNumber) {
 
-    List<Menu> menuList = new ArrayList<>();
-
-    final String menuId = "d5785e28-306b-4e23-add0-3f9092d395f8";
-
-    Menu mockMenu;
-    if (restaurantId == null) {
-      mockMenu =
-          new Menu(
-              menuId,
-              "58a1df85-6bdc-412a-a118-0f0e394c1342",
-              "name",
-              "description",
-              new ArrayList<>(),
-              true);
-    } else {
-      mockMenu =
-          new Menu(menuId, restaurantId.toString(), "name", "description", new ArrayList<>(), true);
-    }
-
-    menuList.add(mockMenu);
-
-    return ResponseEntity.ok(
-        new SearchMenuResult(
-            pageSize,
-            pageNumber,
-            menuList.stream()
-                .map(m -> searchMenuResultItemMapper.toDto(m))
-                .collect(Collectors.toList())));
+    return ResponseEntity.ok(menuService.search(searchTerm, restaurantId, pageSize, pageNumber));
   }
 
   @GetMapping(value = "/{id}")
@@ -138,17 +99,7 @@ ResponseEntity<MenuDTO> getMenu(
       @PathVariable(name = "id") UUID id,
       @Parameter(hidden = true) @RequestAttribute("CorrelationId") String correlationId) {
 
-    final String restaurantId = "58a1df85-6bdc-412a-a118-0f0e394c1342";
-    final String categoryId = "2c43dbda-7d4d-46fb-b246-bec2bd348ca1";
-    final String itemId = "7e46a698-080b-45e6-a529-2c196d00791c";
-
-    Menu menu =
-        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);
-
-    return ResponseEntity.ok(menuMapper.toDto(menu));
+    return ResponseEntity.ok(menuService.get(id, correlationId));
   }
 
   @PutMapping(value = "/{id}")
@@ -162,7 +113,7 @@ ResponseEntity<ResourceUpdatedResponse> updateMenu(
       @Valid @RequestBody UpdateMenuRequest body,
       @Parameter(hidden = true) @RequestAttribute("CorrelationId") String correlationId) {
 
-    return new ResponseEntity<>(new ResourceUpdatedResponse(UUID.randomUUID()), HttpStatus.OK);
+    return new ResponseEntity<>(menuService.update(body, correlationId), HttpStatus.OK);
   }
 
   @DeleteMapping(value = "/{id}")

java/src/main/java/com/amido/stacks/workloads/menu/api/v2/MenuControllerV2.java

@@ -2,16 +2,14 @@
 
 import com.amido.stacks.core.api.annotations.ReadAPIResponses;
 import com.amido.stacks.workloads.menu.api.v1.dto.response.MenuDTO;
-import com.amido.stacks.workloads.menu.domain.Menu;
-import com.amido.stacks.workloads.menu.mappers.MenuMapper;
+import com.amido.stacks.workloads.menu.service.v2.MenuServiceV2;
 import io.swagger.v3.oas.annotations.Operation;
 import io.swagger.v3.oas.annotations.Parameter;
 import io.swagger.v3.oas.annotations.media.Content;
 import io.swagger.v3.oas.annotations.media.Schema;
 import io.swagger.v3.oas.annotations.responses.ApiResponse;
-import java.util.ArrayList;
 import java.util.UUID;
-import org.springframework.beans.factory.annotation.Autowired;
+import lombok.RequiredArgsConstructor;
 import org.springframework.http.MediaType;
 import org.springframework.http.ResponseEntity;
 import org.springframework.web.bind.annotation.GetMapping;
@@ -22,9 +20,10 @@
 
 @RequestMapping(path = "/v2/menu", produces = MediaType.APPLICATION_JSON_VALUE + "; charset=utf-8")
 @RestController
+@RequiredArgsConstructor
 public class MenuControllerV2 {
 
-  @Autowired private MenuMapper menuMapper;
+  private final MenuServiceV2 menuServiceV2;
 
   @GetMapping(value = "/{id}")
   @Operation(
@@ -45,12 +44,6 @@ ResponseEntity<MenuDTO> getMenu(
       @PathVariable(name = "id") UUID id,
       @Parameter(hidden = true) @RequestAttribute("CorrelationId") String correlationId) {
 
-    String restaurantId = "3930ddff-82ce-4f7e-b910-b0709b276cf0";
-
-    Menu menu =
-        new Menu(
-            id.toString(), restaurantId, "0 Menu", "0 Menu Description", new ArrayList<>(), true);
-
-    return ResponseEntity.ok(menuMapper.toDto(menu));
+    return ResponseEntity.ok(menuServiceV2.get(id, correlationId));
   }
 }

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

@@ -0,0 +1,24 @@
+package com.amido.stacks.workloads.menu.service.v1;
+
+import com.amido.stacks.core.api.dto.response.ResourceCreatedResponse;
+import com.amido.stacks.core.api.dto.response.ResourceUpdatedResponse;
+import com.amido.stacks.workloads.menu.api.v1.dto.request.CreateCategoryRequest;
+import com.amido.stacks.workloads.menu.api.v1.dto.request.UpdateCategoryRequest;
+import java.util.UUID;
+import javax.validation.Valid;
+import lombok.RequiredArgsConstructor;
+import org.springframework.stereotype.Service;
+
+@Service
+@RequiredArgsConstructor
+public class CategoryService {
+
+  public ResourceCreatedResponse create(@Valid CreateCategoryRequest body, String correlationId) {
+    return new ResourceCreatedResponse(UUID.randomUUID());
+  }
+
+  public ResourceUpdatedResponse update(
+      UUID menuId, UUID categoryId, @Valid UpdateCategoryRequest body, String correlationId) {
+    return new ResourceUpdatedResponse(UUID.randomUUID());
+  }
+}

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

@@ -0,0 +1,23 @@
+package com.amido.stacks.workloads.menu.service.v1;
+
+import com.amido.stacks.core.api.dto.response.ResourceCreatedResponse;
+import com.amido.stacks.core.api.dto.response.ResourceUpdatedResponse;
+import com.amido.stacks.workloads.menu.api.v1.dto.request.CreateItemRequest;
+import com.amido.stacks.workloads.menu.api.v1.dto.request.UpdateItemRequest;
+import java.util.UUID;
+import javax.validation.Valid;
+import org.springframework.stereotype.Service;
+
+@Service
+public class ItemService {
+
+  public ResourceCreatedResponse create(
+      UUID menuId, UUID categoryId, @Valid CreateItemRequest body, String correlationId) {
+    return new ResourceCreatedResponse(UUID.randomUUID());
+  }
+
+  public ResourceUpdatedResponse update(
+      UUID menuId, UUID categoryId, @Valid UpdateItemRequest body, String correlationId) {
+    return new ResourceUpdatedResponse(UUID.randomUUID());
+  }
+}