From 27d64bb8fef653e076ead7f26dbb1dd962af5b2a Mon Sep 17 00:00:00 2001 From: droideparanoico Date: Sat, 8 Oct 2022 12:27:21 +0200 Subject: [PATCH] Corrected use of service port --- .../application/adapter/CartController.java | 22 +++++++++---------- .../api/adapter/CartControllerTest.java | 20 ++++++++--------- 2 files changed, 21 insertions(+), 21 deletions(-) diff --git a/src/main/java/com/rviewer/skeletons/application/adapter/CartController.java b/src/main/java/com/rviewer/skeletons/application/adapter/CartController.java index 7d2f5be..0445f88 100644 --- a/src/main/java/com/rviewer/skeletons/application/adapter/CartController.java +++ b/src/main/java/com/rviewer/skeletons/application/adapter/CartController.java @@ -4,7 +4,7 @@ import com.rviewer.skeletons.application.exception.CartAlreadyExistsException; import com.rviewer.skeletons.application.exception.CartNotFoundException; import com.rviewer.skeletons.domain.model.Cart; import com.rviewer.skeletons.domain.model.Item; -import com.rviewer.skeletons.domain.service.CartService; +import com.rviewer.skeletons.domain.ports.primary.CartServicePort; import com.rviewer.skeletons.application.request.CreateCartReq; import com.rviewer.skeletons.application.request.UpdateCartReq; import org.springframework.http.HttpStatus; @@ -25,23 +25,23 @@ import java.util.UUID; @RequestMapping("/carts") public class CartController { - private final CartService cartService; + private final CartServicePort cartServicePort; - public CartController(CartService cartService) { - this.cartService = cartService; + public CartController(CartServicePort cartServicePort) { + this.cartServicePort = cartServicePort; } @GetMapping("/{id}") public ResponseEntity getCart(@PathVariable String id) { - return ResponseEntity.status(HttpStatus.OK).body(cartService.get(id).orElseThrow(CartNotFoundException::new)); + return ResponseEntity.status(HttpStatus.OK).body(cartServicePort.get(id).orElseThrow(CartNotFoundException::new)); } @PostMapping("/{id}") public ResponseEntity saveCart(@PathVariable String id, @Valid @RequestBody CreateCartReq createCartReq) { - if (cartService.get(id).isPresent()) { + if (cartServicePort.get(id).isPresent()) { throw new CartAlreadyExistsException(); } else { - cartService.save(new Cart(UUID.fromString(id), createCartReq.getItems() + cartServicePort.save(new Cart(UUID.fromString(id), createCartReq.getItems() .stream() .map(item -> new Item(item.getId(), item.getName(), item.getQuantity(), item.getPrice())) .toList())); @@ -51,18 +51,18 @@ public class CartController { @PatchMapping("/{id}") public ResponseEntity updateCart(@PathVariable String id, @Valid @RequestBody UpdateCartReq updateCartReq) { - Cart cart = cartService.get(id).orElseThrow(CartNotFoundException::new); + Cart cart = cartServicePort.get(id).orElseThrow(CartNotFoundException::new); cart.setItems(updateCartReq.getItems()); - cartService.save(cart); + cartServicePort.save(cart); return ResponseEntity.status(HttpStatus.OK).build(); } @DeleteMapping("/{id}") public ResponseEntity deleteCart(@PathVariable String id) { - if (cartService.get(id).isEmpty()) { + if (cartServicePort.get(id).isEmpty()) { throw new CartNotFoundException(); } else { - cartService.delete(id); + cartServicePort.delete(id); return ResponseEntity.status(HttpStatus.OK).build(); } } diff --git a/src/test/java/com/rviewer/skeletons/infrastructure/inbound/api/adapter/CartControllerTest.java b/src/test/java/com/rviewer/skeletons/infrastructure/inbound/api/adapter/CartControllerTest.java index 178d018..75a2c80 100644 --- a/src/test/java/com/rviewer/skeletons/infrastructure/inbound/api/adapter/CartControllerTest.java +++ b/src/test/java/com/rviewer/skeletons/infrastructure/inbound/api/adapter/CartControllerTest.java @@ -3,7 +3,7 @@ package com.rviewer.skeletons.infrastructure.inbound.api.adapter; import com.fasterxml.jackson.databind.ObjectMapper; import com.rviewer.skeletons.domain.model.Cart; import com.rviewer.skeletons.domain.model.Item; -import com.rviewer.skeletons.domain.service.CartService; +import com.rviewer.skeletons.domain.ports.primary.CartServicePort; import com.rviewer.skeletons.application.exception.CartAlreadyExistsException; import com.rviewer.skeletons.application.exception.CartNotFoundException; import org.junit.jupiter.api.Test; @@ -35,7 +35,7 @@ class CartControllerTest { @Autowired private MockMvc mockMvc; @MockBean - private CartService cartService; + private CartServicePort cartServicePort; @Test void should_return_cart() throws Exception { @@ -43,7 +43,7 @@ class CartControllerTest { Item item = new Item(UUID.randomUUID(), "item", 1, 100F); Cart expectedCart = new Cart(id, List.of(item)); - when(cartService.get(id.toString())).thenReturn(Optional.of(expectedCart)); + when(cartServicePort.get(id.toString())).thenReturn(Optional.of(expectedCart)); mockMvc.perform(MockMvcRequestBuilders.get("/carts/" + id)) .andExpect(status().isOk()) @@ -58,7 +58,7 @@ class CartControllerTest { void should_not_return_non_existing_cart() throws Exception { UUID id = UUID.randomUUID(); - when(cartService.get(id.toString())).thenReturn(Optional.empty()); + when(cartServicePort.get(id.toString())).thenReturn(Optional.empty()); mockMvc.perform(MockMvcRequestBuilders.get("/carts/" + id)) .andExpect(status().isNotFound()) @@ -83,7 +83,7 @@ class CartControllerTest { Item item = new Item(UUID.randomUUID(), "item", 1, 100F); Cart oldCart = new Cart(id, List.of(item)); - when(cartService.get(id.toString())).thenReturn(Optional.of(oldCart)); + when(cartServicePort.get(id.toString())).thenReturn(Optional.of(oldCart)); mockMvc.perform(MockMvcRequestBuilders.post("/carts/" + id) .content(asJsonString(oldCart)) @@ -126,13 +126,13 @@ class CartControllerTest { Item item = new Item(UUID.randomUUID(), "item", 1, 100F); Cart oldCart = new Cart(id, List.of(item)); - when(cartService.get(id.toString())).thenReturn(Optional.of(oldCart)); + when(cartServicePort.get(id.toString())).thenReturn(Optional.of(oldCart)); mockMvc.perform(MockMvcRequestBuilders.patch("/carts/" + id) .content(asJsonString(oldCart).replace("100.0", "1000.0")) .contentType(MediaType.APPLICATION_JSON)) .andExpect(status().isOk()) - .andExpect(result -> assertEquals(1000F, cartService.get(id.toString()).orElseThrow().getItems().get(0).getPrice())); + .andExpect(result -> assertEquals(1000F, cartServicePort.get(id.toString()).orElseThrow().getItems().get(0).getPrice())); } @Test @@ -141,7 +141,7 @@ class CartControllerTest { Item item = new Item(UUID.randomUUID(), "item", 1, 100F); Cart nonExistingCart = new Cart(id, List.of(item)); - when(cartService.get(id.toString())).thenReturn(Optional.empty()); + when(cartServicePort.get(id.toString())).thenReturn(Optional.empty()); mockMvc.perform(MockMvcRequestBuilders.patch("/carts/" + id) .content(asJsonString(nonExistingCart)) @@ -184,7 +184,7 @@ class CartControllerTest { Item item = new Item(UUID.randomUUID(), "item", 1, 100F); Cart oldCart = new Cart(id, List.of(item)); - when(cartService.get(id.toString())).thenReturn(Optional.of(oldCart)); + when(cartServicePort.get(id.toString())).thenReturn(Optional.of(oldCart)); mockMvc.perform(MockMvcRequestBuilders.delete("/carts/" + id) .content(asJsonString(oldCart)) @@ -198,7 +198,7 @@ class CartControllerTest { Item item = new Item(UUID.randomUUID(), "item", 1, 100F); Cart nonExistingCart = new Cart(id, List.of(item)); - when(cartService.get(id.toString())).thenReturn(Optional.empty()); + when(cartServicePort.get(id.toString())).thenReturn(Optional.empty()); mockMvc.perform(MockMvcRequestBuilders.delete("/carts/" + id) .content(asJsonString(nonExistingCart))