Merge pull request #66 from Zenfulcode/65-fix-order-customer-details

gustaavik · web-flow · commit 151a392bde2d · 2024-12-29T21:22:23.000+01:00
65 fix order customer details
diff --git a/pom.xml b/pom.xml
@@ -135,6 +135,7 @@
         <dependency>
             <groupId>org.liquibase</groupId>
             <artifactId>liquibase-core</artifactId>
+            <version>4.30.0</version>
         </dependency>
         <dependency>
             <groupId>org.springframework.retry</groupId>
diff --git a/src/main/java/com/zenfulcode/commercify/commercify/api/requests/orders/CreateOrderRequest.java b/src/main/java/com/zenfulcode/commercify/commercify/api/requests/orders/CreateOrderRequest.java
@@ -1,11 +1,13 @@
 package com.zenfulcode.commercify.commercify.api.requests.orders;
 
 import com.zenfulcode.commercify.commercify.dto.AddressDTO;
+import com.zenfulcode.commercify.commercify.dto.CustomerDetailsDTO;
 
 import java.util.List;
 
 public record CreateOrderRequest(
         String currency,
+        CustomerDetailsDTO customerDetails,
         List<CreateOrderLineRequest> orderLines,
         AddressDTO shippingAddress,
         AddressDTO billingAddress
diff --git a/src/main/java/com/zenfulcode/commercify/commercify/controller/OrderController.java b/src/main/java/com/zenfulcode/commercify/commercify/controller/OrderController.java
@@ -37,9 +37,8 @@ public class OrderController {
             "id", "userId", "status", "currency", "totalAmount", "createdAt", "updatedAt"
     );
 
-    @PreAuthorize("hasRole('USER') and #userId == authentication.principal.id")
     @PostMapping("/{userId}")
-    public ResponseEntity<?> createOrder(@PathVariable Long userId, @Validated @RequestBody CreateOrderRequest orderRequest) {
+    public ResponseEntity<?> createOrder(@PathVariable Long userId, @RequestBody CreateOrderRequest orderRequest) {
         try {
             OrderDTO orderDTO = orderService.createOrder(userId, orderRequest);
             return ResponseEntity.ok(CreateOrderResponse.from(OrderViewModel.fromDTO(orderDTO)));
@@ -62,6 +61,30 @@ public ResponseEntity<?> createOrder(@PathVariable Long userId, @Validated @Requ
         }
     }
 
+    @PostMapping
+    public ResponseEntity<?> createOrder(@RequestBody CreateOrderRequest orderRequest) {
+        try {
+            OrderDTO orderDTO = orderService.createOrder(orderRequest);
+            return ResponseEntity.ok(CreateOrderResponse.from(OrderViewModel.fromDTO(orderDTO)));
+        } catch (IllegalArgumentException e) {
+            return ResponseEntity.badRequest()
+                    .body(CreateOrderResponse.from("Invalid request: " + e.getMessage()));
+        } catch (ProductNotFoundException e) {
+            return ResponseEntity.badRequest()
+                    .body(CreateOrderResponse.from("Product not found: " + e.getMessage()));
+        } catch (InsufficientStockException e) {
+            return ResponseEntity.badRequest()
+                    .body(CreateOrderResponse.from("Insufficient stock: " + e.getMessage()));
+        } catch (OrderValidationException e) {
+            return ResponseEntity.badRequest()
+                    .body(CreateOrderResponse.from(e.getMessage()));
+        } catch (Exception e) {
+            log.error("Error creating order", e);
+            return ResponseEntity.internalServerError()
+                    .body(CreateOrderResponse.from("Error creating order: " + e.getMessage()));
+        }
+    }
+
     @PreAuthorize("hasRole('USER') and #userId == authentication.principal.id or hasRole('ADMIN')")
     @GetMapping("/user/{userId}")
     public ResponseEntity<?> getOrdersByUserId(
diff --git a/src/main/java/com/zenfulcode/commercify/commercify/dto/CustomerDetailsDTO.java b/src/main/java/com/zenfulcode/commercify/commercify/dto/CustomerDetailsDTO.java
@@ -0,0 +1,15 @@
+package com.zenfulcode.commercify.commercify.dto;
+
+import lombok.AllArgsConstructor;
+import lombok.Builder;
+import lombok.Data;
+
+@Builder
+@Data
+@AllArgsConstructor
+public class CustomerDetailsDTO {
+    private String firstName;
+    private String lastName;
+    private String email;
+    private String phone;
+}
diff --git a/src/main/java/com/zenfulcode/commercify/commercify/dto/OrderDTO.java b/src/main/java/com/zenfulcode/commercify/commercify/dto/OrderDTO.java
@@ -13,9 +13,9 @@
 public class OrderDTO {
     private Long id;
     private Long userId;
-    private OrderStatus orderStatus;
     private String currency;
     private Double totalAmount;
+    private OrderStatus orderStatus;
     private Instant createdAt;
     private Instant updatedAt;
 }
diff --git a/src/main/java/com/zenfulcode/commercify/commercify/dto/OrderDetailsDTO.java b/src/main/java/com/zenfulcode/commercify/commercify/dto/OrderDetailsDTO.java
@@ -12,4 +12,7 @@
 public class OrderDetailsDTO {
     private OrderDTO order;
     private List<OrderLineDTO> orderLines;
+    private CustomerDetailsDTO customerDetails;
+    private AddressDTO shippingAddress;
+    private AddressDTO billingAddress;
 }
diff --git a/src/main/java/com/zenfulcode/commercify/commercify/dto/mapper/OrderMapper.java b/src/main/java/com/zenfulcode/commercify/commercify/dto/mapper/OrderMapper.java
@@ -23,5 +23,4 @@ public OrderDTO apply(OrderEntity order) {
                 .totalAmount(order.getTotalAmount())
                 .build();
     }
-
 }
diff --git a/src/main/java/com/zenfulcode/commercify/commercify/entity/OrderEntity.java b/src/main/java/com/zenfulcode/commercify/commercify/entity/OrderEntity.java
@@ -30,7 +30,7 @@ public class OrderEntity {
     @Column(name = "id", nullable = false)
     private Long id;
 
-    @Column(name = "user_id", nullable = false)
+    @Column(name = "user_id")
     private Long userId;
 
     @ToString.Exclude
diff --git a/src/main/java/com/zenfulcode/commercify/commercify/entity/OrderShippingInfo.java b/src/main/java/com/zenfulcode/commercify/commercify/entity/OrderShippingInfo.java
@@ -17,6 +17,15 @@ public class OrderShippingInfo {
     @Column(name = "id", nullable = false)
     private Long id;
 
+    @Column(name = "customer_first_name")
+    private String customerFirstName;
+    @Column(name = "customer_last_name")
+    private String customerLastName;
+    @Column(name = "customer_email")
+    private String customerEmail;
+    @Column(name = "customer_phone")
+    private String customerPhone;
+
     @Column(name = "shipping_street", nullable = false)
     private String shippingStreet;
     @Column(name = "shipping_city", nullable = false)
diff --git a/src/main/java/com/zenfulcode/commercify/commercify/service/order/OrderService.java b/src/main/java/com/zenfulcode/commercify/commercify/service/order/OrderService.java
@@ -3,10 +3,7 @@
 import com.zenfulcode.commercify.commercify.OrderStatus;
 import com.zenfulcode.commercify.commercify.api.requests.orders.CreateOrderLineRequest;
 import com.zenfulcode.commercify.commercify.api.requests.orders.CreateOrderRequest;
-import com.zenfulcode.commercify.commercify.dto.AddressDTO;
-import com.zenfulcode.commercify.commercify.dto.OrderDTO;
-import com.zenfulcode.commercify.commercify.dto.OrderDetailsDTO;
-import com.zenfulcode.commercify.commercify.dto.OrderLineDTO;
+import com.zenfulcode.commercify.commercify.dto.*;
 import com.zenfulcode.commercify.commercify.dto.mapper.OrderMapper;
 import com.zenfulcode.commercify.commercify.dto.mapper.ProductMapper;
 import com.zenfulcode.commercify.commercify.dto.mapper.ProductVariantMapper;
@@ -44,6 +41,11 @@ public class OrderService {
     private final ProductVariantMapper productVariantMapper;
     private final OrderShippingInfoRepository orderShippingInfoRepository;
 
+    @Transactional
+    public OrderDTO createOrder(CreateOrderRequest request) {
+        return createOrder(null, request);
+    }
+
     @Transactional
     public OrderDTO createOrder(Long userId, CreateOrderRequest request) {
         // Validate request and check stock
@@ -83,6 +85,11 @@ private OrderShippingInfo getShippingInformation(CreateOrderRequest request) {
                     .billingCountry(billingAddress.getCountry());
         }
 
+        shippingInfo.customerEmail(request.customerDetails().getEmail())
+                .customerFirstName(request.customerDetails().getFirstName())
+                .customerLastName(request.customerDetails().getLastName())
+                .customerPhone(request.customerDetails().getPhone());
+
         return shippingInfo.build();
     }
 
@@ -250,6 +257,34 @@ private OrderDetailsDTO buildOrderDetailsDTO(OrderEntity order) {
                 })
                 .collect(Collectors.toList());
 
-        return new OrderDetailsDTO(orderMapper.apply(order), orderLines);
+        OrderDTO orderDTO = orderMapper.apply(order);
+
+        OrderShippingInfo shippingInfo = order.getOrderShippingInfo();
+
+        System.out.println("shippingInfo = " + shippingInfo);
+
+        CustomerDetailsDTO customerDetails = CustomerDetailsDTO.builder()
+                .email(shippingInfo.getCustomerEmail())
+                .firstName(shippingInfo.getCustomerFirstName())
+                .lastName(shippingInfo.getCustomerLastName())
+                .build();
+
+        AddressDTO shippingAddress = AddressDTO.builder()
+                .city(shippingInfo.getShippingCity())
+                .country(shippingInfo.getShippingCountry())
+                .state(shippingInfo.getShippingState())
+                .street(shippingInfo.getShippingStreet())
+                .zipCode(shippingInfo.getShippingZip())
+                .build();
+
+        AddressDTO billingAddress = AddressDTO.builder()
+                .city(shippingInfo.getBillingCity())
+                .country(shippingInfo.getBillingCountry())
+                .state(shippingInfo.getBillingState())
+                .street(shippingInfo.getBillingStreet())
+                .zipCode(shippingInfo.getBillingZip())
+                .build();
+
+        return new OrderDetailsDTO(orderDTO, orderLines, customerDetails, shippingAddress, billingAddress);
     }
 }
diff --git a/src/main/java/com/zenfulcode/commercify/commercify/service/order/OrderValidationService.java b/src/main/java/com/zenfulcode/commercify/commercify/service/order/OrderValidationService.java
@@ -54,6 +54,22 @@ public void validateCreateOrderRequest(CreateOrderRequest request) {
             }
         }
 
+        if (request.customerDetails() == null) {
+            errors.add("Customer details are required");
+        }
+
+        if (request.customerDetails() != null) {
+            if (request.customerDetails().getFirstName() == null || request.customerDetails().getFirstName().isBlank()) {
+                errors.add("Customer first name is required");
+            }
+            if (request.customerDetails().getLastName() == null || request.customerDetails().getLastName().isBlank()) {
+                errors.add("Customer last name is required");
+            }
+            if (request.customerDetails().getEmail() == null || request.customerDetails().getEmail().isBlank()) {
+                errors.add("Customer email is required");
+            }
+        }
+
         if (!errors.isEmpty()) {
             throw new OrderValidationException("Order validation failed: " + String.join(", ", errors));
         }
diff --git a/src/main/resources/db/changelog/db.changelog-master.xml b/src/main/resources/db/changelog/db.changelog-master.xml
@@ -12,4 +12,5 @@
     <include file="db/changelog/migrations/241127144629-changelog.xml"/>
     <include file="db/changelog/migrations/241201215506-changelog.xml"/>
     <include file="db/changelog/migrations/241223151914-changelog.xml"/>
+    <include file="db/changelog/migrations/db.changelog-master.xml"/>
 </databaseChangeLog>
diff --git a/src/main/resources/db/changelog/migrations/db.changelog-master.xml b/src/main/resources/db/changelog/migrations/db.changelog-master.xml
@@ -0,0 +1,20 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<databaseChangeLog
+        xmlns="http://www.liquibase.org/xml/ns/dbchangelog"
+        xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+        xsi:schemaLocation="http://www.liquibase.org/xml/ns/dbchangelog
+                      http://www.liquibase.org/xml/ns/dbchangelog/dbchangelog-4.30.xsd"
+        objectQuotingStrategy="QUOTE_ONLY_RESERVED_WORDS">
+    <changeSet id="1735503484260-2" author="gkhaavik">
+        <addColumn tableName="order_shipping_info">
+            <column name="customer_email" type="VARCHAR(255)"/>
+            <column name="customer_first_name" type="VARCHAR(255)"/>
+            <column name="customer_last_name" type="VARCHAR(255)"/>
+            <column name="customer_phone" type="VARCHAR(255)"/>
+        </addColumn>
+    </changeSet>
+    <changeSet id="1735503484260-1" author="gkhaavik">
+        <dropNotNullConstraint columnDataType="bigint" columnName="user_id" tableName="orders"/>
+    </changeSet>
+
+</databaseChangeLog>

Original file line number	Diff line number	Diff line change
`@@ -12,4 +12,7 @@`
`12`	`12`	`public class OrderDetailsDTO {`
`13`	`13`	`private OrderDTO order;`
`14`	`14`	`private List<OrderLineDTO> orderLines;`
	`15`	`+ private CustomerDetailsDTO customerDetails;`
	`16`	`+ private AddressDTO shippingAddress;`
	`17`	`+ private AddressDTO billingAddress;`
`15`	`18`	`}`
Original file line number	Diff line number	Diff line change
`@@ -23,5 +23,4 @@ public OrderDTO apply(OrderEntity order) {`
`23`	`23`	`.totalAmount(order.getTotalAmount())`
`24`	`24`	`.build();`
`25`	`25`	`}`
`26`		`-`
`27`	`26`	`}`