diff --git a/src/main/java/com/cheise_proj/auditing/Address.java b/src/main/java/com/cheise_proj/auditing/Address.java index 20c8b1b..dc2eead 100644 --- a/src/main/java/com/cheise_proj/auditing/Address.java +++ b/src/main/java/com/cheise_proj/auditing/Address.java @@ -1,5 +1,6 @@ package com.cheise_proj.auditing; +import com.fasterxml.jackson.annotation.JsonIgnore; import jakarta.persistence.*; import lombok.*; @@ -24,17 +25,23 @@ class Address { @Column(name = "zip_code") private String zipCode; - @ManyToOne + @JsonIgnore + @ManyToOne(fetch = FetchType.LAZY) @JoinColumn(name = "customer_id") + @ToString.Exclude private Customer customer; - static Address of(CustomerDto.CustomerAddress customerAddress) { + @Column(name = "customer_id", insertable = false, updatable = false) + private Long customerId; + + static Address of(CustomerDto.CustomerAddress customerAddress, Customer customer) { return Address.builder() .city(customerAddress.city()) .streetAddress(customerAddress.streetAddress()) .stateCode(customerAddress.stateCode()) .country(customerAddress.country()) .zipCode(customerAddress.zipCode()) + .customer(customer) .build(); } diff --git a/src/main/java/com/cheise_proj/auditing/Customer.java b/src/main/java/com/cheise_proj/auditing/Customer.java index b9def59..df04e58 100644 --- a/src/main/java/com/cheise_proj/auditing/Customer.java +++ b/src/main/java/com/cheise_proj/auditing/Customer.java @@ -33,23 +33,21 @@ class Customer { private String emailAddress; @ToString.Exclude - @OneToMany(mappedBy = "customer", orphanRemoval = true) + @OneToMany(mappedBy = "customer", orphanRemoval = true, cascade = CascadeType.ALL, fetch = FetchType.LAZY) private Set
addresses; static Customer of(CustomerDto.CreateCustomer customer) { - Customer customerEntity = Customer.builder() + return Customer.builder() .firstName(customer.firstName()) .lastName(customer.lastName()) .emailAddress(customer.emailAddress()) .build(); - customerEntity.setAddresses(customer.customerAddress()); - return customerEntity; } - void setAddresses(Set customerAddresses) { + void setAddresses(Set customerAddresses, Customer customer) { if (customerAddresses == null) return; this.addresses = (this.addresses == null) ? new LinkedHashSet<>() : this.addresses; - Set
addressSet = customerAddresses.stream().map(Address::of).collect(Collectors.toSet()); + Set
addressSet = customerAddresses.stream().map(customerAddress -> Address.of(customerAddress, customer)).collect(Collectors.toSet()); this.addresses.addAll(addressSet); } } diff --git a/src/main/java/com/cheise_proj/auditing/CustomerController.java b/src/main/java/com/cheise_proj/auditing/CustomerController.java index fe5addb..7c5d564 100644 --- a/src/main/java/com/cheise_proj/auditing/CustomerController.java +++ b/src/main/java/com/cheise_proj/auditing/CustomerController.java @@ -1,14 +1,15 @@ package com.cheise_proj.auditing; import jakarta.validation.Valid; +import org.springframework.data.domain.Page; +import org.springframework.data.domain.PageRequest; import org.springframework.http.ResponseEntity; -import org.springframework.web.bind.annotation.PostMapping; -import org.springframework.web.bind.annotation.RequestBody; -import org.springframework.web.bind.annotation.RequestMapping; -import org.springframework.web.bind.annotation.RestController; +import org.springframework.web.bind.annotation.*; import org.springframework.web.util.UriComponentsBuilder; import java.net.URI; +import java.util.List; +import java.util.Map; @RestController @RequestMapping("/customers") @@ -25,4 +26,22 @@ ResponseEntity createCustomer(@RequestBody @Valid CustomerDto.CreateCustome URI location = UriComponentsBuilder.fromPath("/customers/{id}").buildAndExpand(customer.getId()).toUri(); return ResponseEntity.created(location).build(); } + + @GetMapping + ResponseEntity index( + @RequestParam(required = false, defaultValue = "0") int page, + @RequestParam(required = false, defaultValue = "10") int size + ) { + Page customerPage = customerService.getCustomers(PageRequest.of(page, size)); + List customerList = customerPage.getContent().stream().map(CustomerDto::toGetCustomer).toList(); + Map customers = Map.of("customers", customerList, "total", customerPage.getTotalElements()); + return ResponseEntity.ok(customers); + } + + @GetMapping("{id}") + ResponseEntity getCustomer(@PathVariable("id") Long id) { + Customer customer = customerService.getCustomer(id); + return ResponseEntity.ok(CustomerDto.toCustomer(customer)); + } + } diff --git a/src/main/java/com/cheise_proj/auditing/CustomerDto.java b/src/main/java/com/cheise_proj/auditing/CustomerDto.java index ae34c42..bd6bbe6 100644 --- a/src/main/java/com/cheise_proj/auditing/CustomerDto.java +++ b/src/main/java/com/cheise_proj/auditing/CustomerDto.java @@ -6,6 +6,7 @@ import lombok.Builder; import java.util.Set; +import java.util.stream.Collectors; interface CustomerDto { @Builder @@ -13,7 +14,7 @@ record CreateCustomer( @NotBlank @JsonProperty String firstName, @NotBlank @JsonProperty String lastName, @Email @JsonProperty("email") String emailAddress, - Set customerAddress + @JsonProperty Set customerAddress ) implements CustomerDto { } @@ -26,4 +27,39 @@ record CustomerAddress( @JsonProperty String zipCode ) { } + + @Builder + record GetCustomer( + @JsonProperty String firstName, + @JsonProperty String lastName, + @JsonProperty("email") String emailAddress, + Set customerAddress + ) implements CustomerDto { + } + + static GetCustomer toGetCustomer(Customer customer) { + Set customerAddresses = null; + if (customer.getAddresses() != null) { + customerAddresses = customer.getAddresses().stream().map(address -> CustomerAddress.builder() + .zipCode(address.getZipCode()) + .city(address.getCity()) + .country(address.getCountry()) + .stateCode(address.getStateCode()) + .streetAddress(address.getStreetAddress()) + .build()).collect(Collectors.toSet()); + } + return GetCustomer.builder() + .firstName(customer.getFirstName()) + .lastName(customer.getLastName()) + .emailAddress(customer.getEmailAddress()) + .customerAddress(customerAddresses) + .build(); + } + static GetCustomer toCustomer(Customer customer) { + return GetCustomer.builder() + .firstName(customer.getFirstName()) + .lastName(customer.getLastName()) + .emailAddress(customer.getEmailAddress()) + .build(); + } } diff --git a/src/main/java/com/cheise_proj/auditing/CustomerExceptionAdviser.java b/src/main/java/com/cheise_proj/auditing/CustomerExceptionAdviser.java new file mode 100644 index 0000000..a750738 --- /dev/null +++ b/src/main/java/com/cheise_proj/auditing/CustomerExceptionAdviser.java @@ -0,0 +1,18 @@ +package com.cheise_proj.auditing; + +import jakarta.persistence.EntityNotFoundException; +import org.springframework.http.HttpStatus; +import org.springframework.http.ProblemDetail; +import org.springframework.web.bind.annotation.ExceptionHandler; +import org.springframework.web.bind.annotation.ResponseStatus; +import org.springframework.web.bind.annotation.RestControllerAdvice; + +@RestControllerAdvice +class CustomerExceptionAdviser { + + @ExceptionHandler(value = {EntityNotFoundException.class}) + @ResponseStatus(value = HttpStatus.NOT_FOUND) + public ProblemDetail resourceNotFoundException(EntityNotFoundException ex) { + return ProblemDetail.forStatusAndDetail(HttpStatus.NOT_FOUND, ex.getMessage()); + } +} diff --git a/src/main/java/com/cheise_proj/auditing/CustomerRepository.java b/src/main/java/com/cheise_proj/auditing/CustomerRepository.java index ec7259f..ce98ec2 100644 --- a/src/main/java/com/cheise_proj/auditing/CustomerRepository.java +++ b/src/main/java/com/cheise_proj/auditing/CustomerRepository.java @@ -1,6 +1,12 @@ package com.cheise_proj.auditing; +import org.springframework.data.domain.Page; +import org.springframework.data.domain.Pageable; +import org.springframework.data.jpa.repository.EntityGraph; import org.springframework.data.jpa.repository.JpaRepository; interface CustomerRepository extends JpaRepository { + @EntityGraph(attributePaths = "addresses") + @Override + Page findAll(Pageable pageable); } diff --git a/src/main/java/com/cheise_proj/auditing/CustomerService.java b/src/main/java/com/cheise_proj/auditing/CustomerService.java index c3ab5bc..4787509 100644 --- a/src/main/java/com/cheise_proj/auditing/CustomerService.java +++ b/src/main/java/com/cheise_proj/auditing/CustomerService.java @@ -1,5 +1,8 @@ package com.cheise_proj.auditing; +import jakarta.persistence.EntityNotFoundException; +import org.springframework.data.domain.Page; +import org.springframework.data.domain.Pageable; import org.springframework.stereotype.Service; @Service @@ -12,6 +15,17 @@ class CustomerService { Customer createCustomer(CustomerDto.CreateCustomer customer) { Customer newCustomer = Customer.of(customer); + newCustomer.setAddresses(customer.customerAddress(), newCustomer); return customerRepository.save(newCustomer); } + + Page getCustomers(Pageable pageable) { + return customerRepository.findAll(pageable); + } + + public Customer getCustomer(Long id) { + return customerRepository.findById(id) + .orElseThrow(() -> new EntityNotFoundException("Customer with id %d not found".formatted(id))); + } + } diff --git a/src/main/resources/application.yml b/src/main/resources/application.yml index eeaeac6..7a16f7a 100644 --- a/src/main/resources/application.yml +++ b/src/main/resources/application.yml @@ -1,4 +1,5 @@ spring: application: name: auditing - + jpa: + open-in-view: false diff --git a/src/test/java/com/cheise_proj/auditing/CustomerControllerIT.java b/src/test/java/com/cheise_proj/auditing/CustomerControllerIT.java index 7be0b17..7e24416 100644 --- a/src/test/java/com/cheise_proj/auditing/CustomerControllerIT.java +++ b/src/test/java/com/cheise_proj/auditing/CustomerControllerIT.java @@ -56,4 +56,46 @@ void createCustomer_returns_400() throws Exception { ).andExpect(MockMvcResultMatchers.status().isBadRequest()) .andDo(result -> log.info("result: {}", result.getResponse().getHeaderValue("location"))); } + + @Test + void getCustomers_With_Address_returns_200() throws Exception { + mockMvc.perform(MockMvcRequestBuilders.post("/customers") + .contentType(MediaType.APPLICATION_JSON) + .content(CustomerFixture.createCustomerWithAddress(objectMapper)) + ).andExpectAll(MockMvcResultMatchers.status().isCreated()) + .andDo(result -> log.info("result: {}", result.getResponse().getHeaderValue("location"))); + + mockMvc.perform(MockMvcRequestBuilders.get("/customers") + .contentType(MediaType.APPLICATION_JSON) + ).andExpectAll(MockMvcResultMatchers.status().isOk()) + .andDo(result -> log.info("result: {}", result.getResponse().getContentAsString())); + } + + @Test + void getCustomer_by_id_returns_200() throws Exception { + mockMvc.perform(MockMvcRequestBuilders.post("/customers") + .contentType(MediaType.APPLICATION_JSON) + .content(CustomerFixture.createCustomerWithAddress(objectMapper)) + ).andExpectAll(MockMvcResultMatchers.status().isCreated()) + .andDo(result -> log.info("result: {}", result.getResponse().getHeaderValue("location"))); + + mockMvc.perform(MockMvcRequestBuilders.get("/customers/1") + .contentType(MediaType.APPLICATION_JSON) + ).andExpectAll(MockMvcResultMatchers.status().isOk()) + .andDo(result -> log.info("result: {}", result.getResponse().getContentAsString())); + } + + @Test + void getCustomer_by_id_returns_404() throws Exception { + mockMvc.perform(MockMvcRequestBuilders.post("/customers") + .contentType(MediaType.APPLICATION_JSON) + .content(CustomerFixture.createCustomerWithAddress(objectMapper)) + ).andExpectAll(MockMvcResultMatchers.status().isCreated()) + .andDo(result -> log.info("result: {}", result.getResponse().getHeaderValue("location"))); + + mockMvc.perform(MockMvcRequestBuilders.get("/customers/10") + .contentType(MediaType.APPLICATION_JSON) + ).andExpectAll(MockMvcResultMatchers.status().isNotFound()) + .andDo(result -> log.info("result: {}", result.getResponse().getContentAsString())); + } } \ No newline at end of file diff --git a/src/test/java/com/cheise_proj/auditing/CustomerExceptionAdviserTest.java b/src/test/java/com/cheise_proj/auditing/CustomerExceptionAdviserTest.java new file mode 100644 index 0000000..49cece9 --- /dev/null +++ b/src/test/java/com/cheise_proj/auditing/CustomerExceptionAdviserTest.java @@ -0,0 +1,22 @@ +package com.cheise_proj.auditing; + +import jakarta.persistence.EntityNotFoundException; +import org.junit.jupiter.api.Test; +import org.junit.jupiter.api.extension.ExtendWith; +import org.mockito.InjectMocks; +import org.mockito.junit.jupiter.MockitoExtension; +import org.springframework.http.ProblemDetail; + +import static org.junit.jupiter.api.Assertions.assertNotNull; + +@ExtendWith(MockitoExtension.class) +class CustomerExceptionAdviserTest { + @InjectMocks + private CustomerExceptionAdviser sut; + + @Test + void resourceNotFoundException() { + ProblemDetail notFound = sut.resourceNotFoundException(new EntityNotFoundException("not found")); + assertNotNull(notFound); + } +} \ No newline at end of file diff --git a/src/test/java/com/cheise_proj/auditing/CustomerServiceTest.java b/src/test/java/com/cheise_proj/auditing/CustomerServiceTest.java index 82a12f6..7671a23 100644 --- a/src/test/java/com/cheise_proj/auditing/CustomerServiceTest.java +++ b/src/test/java/com/cheise_proj/auditing/CustomerServiceTest.java @@ -1,12 +1,19 @@ package com.cheise_proj.auditing; +import jakarta.persistence.EntityNotFoundException; import org.junit.jupiter.api.AfterEach; +import org.junit.jupiter.api.Assertions; import org.junit.jupiter.api.BeforeEach; import org.junit.jupiter.api.Test; import org.junit.jupiter.api.extension.ExtendWith; import org.mockito.*; import org.mockito.junit.jupiter.MockitoExtension; +import org.springframework.data.domain.Page; +import org.springframework.data.domain.PageImpl; +import org.springframework.data.domain.Pageable; +import java.util.List; +import java.util.Optional; import java.util.Set; import static org.junit.jupiter.api.Assertions.assertEquals; @@ -37,7 +44,7 @@ void createCustomer() { .emailAddress("claribel.zieme@gmail.com") .build(); sut.createCustomer(customerDto); - Mockito.verify(customerRepository,Mockito.atMostOnce()).save(customerArgumentCaptor.capture()); + Mockito.verify(customerRepository, Mockito.atMostOnce()).save(customerArgumentCaptor.capture()); Customer customer = customerArgumentCaptor.getValue(); assertNotNull(customer); assertEquals("Claribel", customer.getFirstName()); @@ -52,17 +59,45 @@ void createCustomerWithAddress() { .lastName("Zieme") .emailAddress("claribel.zieme@gmail.com") .customerAddress(Set.of(CustomerDto.CustomerAddress.builder() - .city("Risaberg") - .country("USA") - .streetAddress("942 Walker Street") - .stateCode("WV") - .zipCode("88742") + .city("Risaberg") + .country("USA") + .streetAddress("942 Walker Street") + .stateCode("WV") + .zipCode("88742") .build())) .build(); sut.createCustomer(customerDto); - Mockito.verify(customerRepository,Mockito.atMostOnce()).save(customerArgumentCaptor.capture()); + Mockito.verify(customerRepository, Mockito.atMostOnce()).save(customerArgumentCaptor.capture()); Customer customer = customerArgumentCaptor.getValue(); assertNotNull(customer); - assertEquals(1,customer.getAddresses().size()); + assertEquals(1, customer.getAddresses().size()); + } + + @Test + void getCustomers() { + List customerList = List.of(Customer.builder().id(1L).build()); + Mockito.when(customerRepository.findAll(ArgumentMatchers.any(Pageable.class))) + .thenReturn(new PageImpl<>(customerList)); + Page customerPage = sut.getCustomers(Pageable.ofSize(1)); + assertNotNull(customerPage); + assertEquals(1, customerPage.getTotalElements()); + assertEquals(1, customerPage.getContent().size()); + } + + @Test + void getCustomer() { + Mockito.when(customerRepository.findById(ArgumentMatchers.anyLong())) + .thenReturn(Optional.of(Customer.builder().id(1L).build())); + Customer customer = sut.getCustomer(1L); + assertNotNull(customer); + } + + @Test + void getCustomer_throw_if_customer_not_found() { + EntityNotFoundException exception = Assertions.assertThrows( + EntityNotFoundException.class, + () -> sut.getCustomer(1L) + ); + assertEquals("Customer with id 1 not found", exception.getMessage()); } } \ No newline at end of file