order and ordered products is implemented successfully.

manirDev · manirDev · commit 4f28a19f8aa7 · 2022-11-15T14:52:20.000+03:00
diff --git a/src/main/java/com/manir/springbootecommercerestapi/controller/OrderController.java b/src/main/java/com/manir/springbootecommercerestapi/controller/OrderController.java
@@ -0,0 +1,63 @@
+package com.manir.springbootecommercerestapi.controller;
+
+import com.manir.springbootecommercerestapi.dto.OrderDto;
+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.OrderService;
+import com.manir.springbootecommercerestapi.utils.isAuthenticatedAsAdminOrUser;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.http.HttpStatus;
+import org.springframework.http.ResponseEntity;
+import org.springframework.security.authentication.AnonymousAuthenticationToken;
+import org.springframework.security.core.Authentication;
+import org.springframework.security.core.annotation.AuthenticationPrincipal;
+import org.springframework.security.core.context.SecurityContextHolder;
+import org.springframework.security.core.userdetails.UsernameNotFoundException;
+import org.springframework.web.bind.annotation.GetMapping;
+import org.springframework.web.bind.annotation.PostMapping;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RestController;
+
+import java.util.List;
+
+@RestController
+@RequestMapping(value = "api/v1/order")
+public class OrderController {
+
+    @Autowired
+    private UserRepository userRepository;
+    @Autowired
+    private OrderService orderService;
+
+    //place order complete order api
+    @isAuthenticatedAsAdminOrUser
+    @PostMapping("/placeOrder")
+    public ResponseEntity<?> placeOrder(@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"));
+            orderService.placeOrder(customer);
+            return new ResponseEntity<>("Order placed successfully", HttpStatus.CREATED);
+        }else{
+            throw new EcommerceApiException("User not authenticated", HttpStatus.BAD_REQUEST);
+        }
+    }
+
+    //find order by customer api
+    @isAuthenticatedAsAdminOrUser
+    @GetMapping("/findByCustomer")
+    public List<OrderDto> listOrdersByCustomer(@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<OrderDto> customerOrders =  orderService.listOrdersByCustomer(customer);
+            return customerOrders;
+        }else{
+            throw new EcommerceApiException("User not authenticated", HttpStatus.BAD_REQUEST);
+        }
+    }
+}
diff --git a/src/main/java/com/manir/springbootecommercerestapi/controller/ShoppingCartController.java b/src/main/java/com/manir/springbootecommercerestapi/controller/ShoppingCartController.java
@@ -4,6 +4,7 @@
 import com.manir.springbootecommercerestapi.model.User;
 import com.manir.springbootecommercerestapi.repository.UserRepository;
 import com.manir.springbootecommercerestapi.response.CartItemResponse;
+import com.manir.springbootecommercerestapi.service.OrderService;
 import com.manir.springbootecommercerestapi.service.ShoppingCartService;
 import com.manir.springbootecommercerestapi.utils.isAuthenticatedAsAdminOrUser;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -24,10 +25,10 @@ public class ShoppingCartController {
 
     @Resource
     private ShoppingCartService shoppingCartService;
-
     @Autowired
     private UserRepository userRepository;
-
+    @Autowired
+    private OrderService orderService;
 
     //find by customer api
     @isAuthenticatedAsAdminOrUser
@@ -96,4 +97,8 @@ public ResponseEntity<String> deleteItemProduct(@AuthenticationPrincipal Authent
             throw new EcommerceApiException("User not authenticated", HttpStatus.BAD_REQUEST);
         }
     }
+
+
+
+
 }
diff --git a/src/main/java/com/manir/springbootecommercerestapi/dto/OrderDto.java b/src/main/java/com/manir/springbootecommercerestapi/dto/OrderDto.java
@@ -1,5 +1,6 @@
 package com.manir.springbootecommercerestapi.dto;
 
+import com.manir.springbootecommercerestapi.model.User;
 import lombok.Data;
 
 @Data
@@ -12,4 +13,6 @@ public class OrderDto {
     private double totalPrice;
     private String note;
     private  String status;
+
+    private User customer;
 }
diff --git a/src/main/java/com/manir/springbootecommercerestapi/dto/OrderProductsDto.java b/src/main/java/com/manir/springbootecommercerestapi/dto/OrderProductsDto.java
@@ -0,0 +1,13 @@
+package com.manir.springbootecommercerestapi.dto;
+
+import lombok.Data;
+
+@Data
+public class OrderProductsDto {
+    private Long id;
+    private double productPrice;
+    private Integer productQuantity;
+    private double totalPrice;
+    private String note;
+    private String status;
+}
diff --git a/src/main/java/com/manir/springbootecommercerestapi/model/Order.java b/src/main/java/com/manir/springbootecommercerestapi/model/Order.java
@@ -1,15 +1,14 @@
 package com.manir.springbootecommercerestapi.model;
 
-import lombok.AllArgsConstructor;
-import lombok.Data;
-import lombok.NoArgsConstructor;
+import lombok.*;
 
 import javax.persistence.*;
 import java.util.Set;
 
 @AllArgsConstructor
 @NoArgsConstructor
-@Data
+@Getter
+@Setter
 @Entity
 @Table(name = "orders")
 public class Order {
diff --git a/src/main/java/com/manir/springbootecommercerestapi/model/User.java b/src/main/java/com/manir/springbootecommercerestapi/model/User.java
@@ -1,11 +1,14 @@
 package com.manir.springbootecommercerestapi.model;
 
-import lombok.Data;
+import lombok.*;
 
 import javax.persistence.*;
 import java.util.Set;
 
-@Data
+@Getter
+@Setter
+@AllArgsConstructor
+@NoArgsConstructor
 @Entity
 @Table(name = "users", uniqueConstraints = {@UniqueConstraint(columnNames = {"userName"}),
         @UniqueConstraint(columnNames = {"email"})
diff --git a/src/main/java/com/manir/springbootecommercerestapi/repository/CartItemRepository.java b/src/main/java/com/manir/springbootecommercerestapi/repository/CartItemRepository.java
@@ -23,4 +23,8 @@ public interface CartItemRepository extends JpaRepository<CartItem, Long> {
     @Modifying
     void deleteByCustomerAndProduct(Long customerId, Long productId);
 
+    @Query("DELETE FROM CartItem c WHERE c.customer.id = ?1")
+    @Modifying
+    void deleteByCustomerId(Long customerId);
+
 }
diff --git a/src/main/java/com/manir/springbootecommercerestapi/repository/OrderProductsRepository.java b/src/main/java/com/manir/springbootecommercerestapi/repository/OrderProductsRepository.java
@@ -0,0 +1,8 @@
+package com.manir.springbootecommercerestapi.repository;
+
+import com.manir.springbootecommercerestapi.model.OrderProducts;
+import org.springframework.data.jpa.repository.JpaRepository;
+
+public interface OrderProductsRepository extends JpaRepository<OrderProducts, Long> {
+
+}
diff --git a/src/main/java/com/manir/springbootecommercerestapi/repository/OrderRepository.java b/src/main/java/com/manir/springbootecommercerestapi/repository/OrderRepository.java
@@ -0,0 +1,12 @@
+package com.manir.springbootecommercerestapi.repository;
+
+import com.manir.springbootecommercerestapi.model.Order;
+import com.manir.springbootecommercerestapi.model.User;
+import org.springframework.data.jpa.repository.JpaRepository;
+
+import java.util.List;
+
+public interface OrderRepository extends JpaRepository<Order, Long> {
+
+    List<Order> findByCustomer(User customer);
+}
diff --git a/src/main/java/com/manir/springbootecommercerestapi/service/Impl/OrderProductsServiceImpl.java b/src/main/java/com/manir/springbootecommercerestapi/service/Impl/OrderProductsServiceImpl.java
@@ -0,0 +1,22 @@
+package com.manir.springbootecommercerestapi.service.Impl;
+
+import com.manir.springbootecommercerestapi.model.OrderProducts;
+import com.manir.springbootecommercerestapi.repository.OrderProductsRepository;
+import com.manir.springbootecommercerestapi.service.OrderProductsService;
+import lombok.AllArgsConstructor;
+import org.springframework.stereotype.Service;
+
+import javax.annotation.Resource;
+
+@Service
+@AllArgsConstructor
+public class OrderProductsServiceImpl implements OrderProductsService {
+
+    @Resource(name = "orderProductsRepository")
+    private final OrderProductsRepository orderProductsRepository;
+
+    @Override
+    public void addOrderProducts(OrderProducts orderProducts) {
+        orderProductsRepository.save(orderProducts);
+    }
+}
diff --git a/src/main/java/com/manir/springbootecommercerestapi/service/Impl/OrderServiceImpl.java b/src/main/java/com/manir/springbootecommercerestapi/service/Impl/OrderServiceImpl.java
@@ -0,0 +1,94 @@
+package com.manir.springbootecommercerestapi.service.Impl;
+
+import com.manir.springbootecommercerestapi.dto.CartItemDto;
+import com.manir.springbootecommercerestapi.dto.OrderDto;
+import com.manir.springbootecommercerestapi.exception.EcommerceApiException;
+import com.manir.springbootecommercerestapi.model.Order;
+import com.manir.springbootecommercerestapi.model.OrderProducts;
+import com.manir.springbootecommercerestapi.model.User;
+import com.manir.springbootecommercerestapi.repository.CartItemRepository;
+import com.manir.springbootecommercerestapi.repository.OrderRepository;
+import com.manir.springbootecommercerestapi.response.CartItemResponse;
+import com.manir.springbootecommercerestapi.service.OrderProductsService;
+import com.manir.springbootecommercerestapi.service.OrderService;
+import com.manir.springbootecommercerestapi.service.ShoppingCartService;
+import lombok.AllArgsConstructor;
+import org.modelmapper.ModelMapper;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.http.HttpStatus;
+import org.springframework.stereotype.Service;
+
+import javax.transaction.Transactional;
+import java.util.List;
+import java.util.stream.Collectors;
+
+@Service
+@AllArgsConstructor
+public class OrderServiceImpl implements OrderService {
+
+    @Autowired
+    private final OrderRepository orderRepository;
+    @Autowired
+    private final OrderProductsService orderProductsService;
+    @Autowired
+    private final CartItemRepository cartItemRepository;
+    @Autowired
+    private final ShoppingCartService shoppingCartService;
+    @Autowired
+    private final ModelMapper modelMapper;
+
+    @Override
+    @Transactional
+    public void placeOrder(User customer) {
+        CartItemResponse cartItemDto = shoppingCartService.findByCustomer(customer);
+        OrderDto orderDto = new OrderDto();
+        orderDto.setTotalPrice(cartItemDto.getTotalCost());
+        orderDto.setEmail(customer.getEmail());
+        orderDto.setName(customer.getName());
+        OrderDto savedOrder = saveOrder(orderDto, customer);
+        List<CartItemDto> cartItemDtoList = cartItemDto.getContent();
+        for(CartItemDto cartItem : cartItemDtoList){
+            OrderProducts orderProducts = new OrderProducts();
+            orderProducts.setCustomer(customer);
+            orderProducts.setProduct(cartItem.getProduct());
+            orderProducts.setOrder(mapToEntity(savedOrder));
+            orderProducts.setProductPrice(cartItem.getProduct().getPrice());
+            orderProducts.setProductQuantity(cartItem.getQuantity());
+            orderProducts.setTotalPrice(cartItemDto.getTotalCost());
+            orderProductsService.addOrderProducts(orderProducts);
+        }
+        cartItemRepository.deleteByCustomerId(customer.getId());
+    }
+
+    @Override
+    public OrderDto saveOrder(OrderDto orderDto, User customer) {
+        //convert to entity
+        Order order = mapToEntity(orderDto);
+        //save order to db
+        Order placedOrder = orderRepository.save(order);
+        return mapToDto(placedOrder);
+    }
+
+    @Override
+    public List<OrderDto> listOrdersByCustomer(User customer) {
+        List<Order> orders = orderRepository.findByCustomer(customer);
+        if (orders.size() == 0){
+            throw new EcommerceApiException("User has no order", HttpStatus.BAD_REQUEST);
+        }
+        List<OrderDto> orderDtoList = orders.stream()
+                                                    .map(order -> mapToDto(order))
+                                                    .collect(Collectors.toList());
+        return orderDtoList;
+    }
+
+    //map to Entity
+    private Order mapToEntity(OrderDto orderDto){
+        Order order = modelMapper.map(orderDto, Order.class);
+        return order;
+    }
+    //map to Dto
+    private OrderDto mapToDto(Order order){
+        OrderDto orderDto = modelMapper.map(order, OrderDto.class);
+        return orderDto;
+    }
+}
diff --git a/src/main/java/com/manir/springbootecommercerestapi/service/OrderProductsService.java b/src/main/java/com/manir/springbootecommercerestapi/service/OrderProductsService.java
@@ -0,0 +1,7 @@
+package com.manir.springbootecommercerestapi.service;
+
+import com.manir.springbootecommercerestapi.model.OrderProducts;
+
+public interface OrderProductsService {
+    void addOrderProducts(OrderProducts orderProducts);
+}
diff --git a/src/main/java/com/manir/springbootecommercerestapi/service/OrderService.java b/src/main/java/com/manir/springbootecommercerestapi/service/OrderService.java
@@ -0,0 +1,13 @@
+package com.manir.springbootecommercerestapi.service;
+
+import com.manir.springbootecommercerestapi.dto.OrderDto;
+import com.manir.springbootecommercerestapi.model.User;
+
+import java.util.List;
+
+public interface OrderService {
+
+    void placeOrder(User customer);
+    OrderDto saveOrder(OrderDto orderDto, User customer);
+    List<OrderDto> listOrdersByCustomer(User customer);
+}

Original file line number	Diff line number	Diff line change
`@@ -23,4 +23,8 @@ public interface CartItemRepository extends JpaRepository<CartItem, Long> {`
`23`	`23`	`@Modifying`
`24`	`24`	`void deleteByCustomerAndProduct(Long customerId, Long productId);`
`25`	`25`
	`26`	`+ @Query("DELETE FROM CartItem c WHERE c.customer.id = ?1")`
	`27`	`+ @Modifying`
	`28`	`+ void deleteByCustomerId(Long customerId);`
	`29`	`+`
`26`	`30`	`}`