Find Customer order and ordered items are done.

Author: manirDev

src/main/java/com/manir/springbootecommercerestapi/config/SecurityConfig.java

@@ -11,14 +11,8 @@
 import org.springframework.security.config.annotation.web.builders.HttpSecurity;
 import org.springframework.security.config.annotation.web.configuration.EnableWebSecurity;
 import org.springframework.security.config.annotation.web.configuration.WebSecurityConfigurerAdapter;
-import org.springframework.security.core.userdetails.User;
-import org.springframework.security.core.userdetails.UserDetails;
-import org.springframework.security.core.userdetails.UserDetailsService;
 import org.springframework.security.crypto.bcrypt.BCryptPasswordEncoder;
 import org.springframework.security.crypto.password.PasswordEncoder;
-import org.springframework.security.provisioning.InMemoryUserDetailsManager;
-
-import javax.annotation.Resource;
 
 @Configuration
 @EnableWebSecurity

src/main/java/com/manir/springbootecommercerestapi/controller/OrderController.java

@@ -1,10 +1,11 @@
 package com.manir.springbootecommercerestapi.controller;
 
 import com.manir.springbootecommercerestapi.dto.OrderDto;
+import com.manir.springbootecommercerestapi.dto.OrderProductsDto;
 import com.manir.springbootecommercerestapi.exception.EcommerceApiException;
-import com.manir.springbootecommercerestapi.model.Order;
 import com.manir.springbootecommercerestapi.model.User;
 import com.manir.springbootecommercerestapi.repository.UserRepository;
+import com.manir.springbootecommercerestapi.service.OrderProductsService;
 import com.manir.springbootecommercerestapi.service.OrderService;
 import com.manir.springbootecommercerestapi.utils.isAuthenticatedAsAdminOrUser;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -30,6 +31,8 @@ public class OrderController {
     private UserRepository userRepository;
     @Autowired
     private OrderService orderService;
+    @Autowired
+    private OrderProductsService orderProductsService;
 
     //place order complete order api
     @isAuthenticatedAsAdminOrUser
@@ -60,4 +63,19 @@ public List<OrderDto> listOrdersByCustomer(@AuthenticationPrincipal Authenticati
             throw new EcommerceApiException("User not authenticated", HttpStatus.BAD_REQUEST);
         }
     }
+
+    //find ordered items by Customer
+    @isAuthenticatedAsAdminOrUser
+    @GetMapping("/findOrderedItemsByCustomer")
+    public List<OrderProductsDto> findOrderedItemsByCustomer(@AuthenticationPrincipal Authentication authentication){
+        authentication = SecurityContextHolder.getContext().getAuthentication();
+        if (!(authentication instanceof AnonymousAuthenticationToken)){
+            String currentUserEmail = authentication.getName();
+            User customer = userRepository.findByEmail(currentUserEmail).orElseThrow(() -> new UsernameNotFoundException("Customer Not found"));
+            List<OrderProductsDto> customerOrderedItems =  orderProductsService.findOrderItemsByCustomer(customer);
+            return customerOrderedItems;
+        }else{
+            throw new EcommerceApiException("User not authenticated", HttpStatus.BAD_REQUEST);
+        }
+    }
 }

src/main/java/com/manir/springbootecommercerestapi/dto/OrderDto.java

@@ -1,5 +1,6 @@
 package com.manir.springbootecommercerestapi.dto;
 
+import com.fasterxml.jackson.annotation.JsonIgnore;
 import com.manir.springbootecommercerestapi.model.User;
 import lombok.Data;
 
@@ -14,5 +15,6 @@ public class OrderDto {
     private String note;
     private  String status;
 
+    @JsonIgnore
     private User customer;
 }

src/main/java/com/manir/springbootecommercerestapi/repository/OrderProductsRepository.java

@@ -1,8 +1,11 @@
 package com.manir.springbootecommercerestapi.repository;
 
 import com.manir.springbootecommercerestapi.model.OrderProducts;
+import com.manir.springbootecommercerestapi.model.User;
 import org.springframework.data.jpa.repository.JpaRepository;
 
-public interface OrderProductsRepository extends JpaRepository<OrderProducts, Long> {
+import java.util.List;
 
+public interface OrderProductsRepository extends JpaRepository<OrderProducts, Long> {
+    List<OrderProducts> findByCustomer(User customer);
 }

src/main/java/com/manir/springbootecommercerestapi/service/Impl/OrderProductsServiceImpl.java

@@ -1,22 +1,53 @@
 package com.manir.springbootecommercerestapi.service.Impl;
 
+import com.manir.springbootecommercerestapi.dto.OrderProductsDto;
+import com.manir.springbootecommercerestapi.exception.EcommerceApiException;
 import com.manir.springbootecommercerestapi.model.OrderProducts;
+import com.manir.springbootecommercerestapi.model.User;
 import com.manir.springbootecommercerestapi.repository.OrderProductsRepository;
 import com.manir.springbootecommercerestapi.service.OrderProductsService;
 import lombok.AllArgsConstructor;
+import org.modelmapper.ModelMapper;
+import org.modelmapper.convention.MatchingStrategies;
+import org.springframework.http.HttpStatus;
 import org.springframework.stereotype.Service;
 
 import javax.annotation.Resource;
+import java.util.List;
+import java.util.stream.Collectors;
 
 @Service
 @AllArgsConstructor
 public class OrderProductsServiceImpl implements OrderProductsService {
 
     @Resource(name = "orderProductsRepository")
     private final OrderProductsRepository orderProductsRepository;
+    @Resource(name = "modelMapper")
+    private final ModelMapper modelMapper;
 
     @Override
     public void addOrderProducts(OrderProducts orderProducts) {
         orderProductsRepository.save(orderProducts);
     }
+
+    @Override
+    public List<OrderProductsDto> findOrderItemsByCustomer(User customer) {
+
+        List<OrderProducts> orderProducts = orderProductsRepository.findByCustomer(customer);
+        if (orderProducts.size() == 0){
+            throw new EcommerceApiException("User has no ordered products", HttpStatus.BAD_REQUEST);
+        }
+        List<OrderProductsDto> orderProductsDtoList =  orderProducts.stream()
+                                                                            .map(orderProduct -> mapToDto(orderProduct))
+                                                                            .collect(Collectors.toList());
+        return orderProductsDtoList;
+    }
+
+    //map to dto
+    private OrderProductsDto mapToDto(OrderProducts orderProducts){
+        modelMapper.getConfiguration().setMatchingStrategy(MatchingStrategies.STRICT);
+        OrderProductsDto orderProductsDto = modelMapper.map(orderProducts, OrderProductsDto.class);
+
+        return orderProductsDto;
+    }
 }

src/main/java/com/manir/springbootecommercerestapi/service/Impl/OrderServiceImpl.java

@@ -45,6 +45,7 @@ public void placeOrder(User customer) {
         orderDto.setTotalPrice(cartItemDto.getTotalCost());
         orderDto.setEmail(customer.getEmail());
         orderDto.setName(customer.getName());
+        orderDto.setCustomer(customer);
         OrderDto savedOrder = saveOrder(orderDto, customer);
         List<CartItemDto> cartItemDtoList = cartItemDto.getContent();
         for(CartItemDto cartItem : cartItemDtoList){
@@ -54,7 +55,7 @@ public void placeOrder(User customer) {
             orderProducts.setOrder(mapToEntity(savedOrder));
             orderProducts.setProductPrice(cartItem.getProduct().getPrice());
             orderProducts.setProductQuantity(cartItem.getQuantity());
-            orderProducts.setTotalPrice(cartItemDto.getTotalCost());
+            orderProducts.setTotalPrice(cartItem.getProduct().getPrice()*cartItem.getQuantity());
             orderProductsService.addOrderProducts(orderProducts);
         }
         cartItemRepository.deleteByCustomerId(customer.getId());

src/main/java/com/manir/springbootecommercerestapi/service/OrderProductsService.java

@@ -1,7 +1,12 @@
 package com.manir.springbootecommercerestapi.service;
 
+import com.manir.springbootecommercerestapi.dto.OrderProductsDto;
 import com.manir.springbootecommercerestapi.model.OrderProducts;
+import com.manir.springbootecommercerestapi.model.User;
+
+import java.util.List;
 
 public interface OrderProductsService {
     void addOrderProducts(OrderProducts orderProducts);
+    List<OrderProductsDto> findOrderItemsByCustomer(User customer);
 }