Merge pull request #62 from Zenfulcode/order-shippinginfo-relation

gustaavik · web-flow · commit 5497993ff2d8 · 2024-12-23T15:44:57.000+01:00
Order address relation rework
diff --git a/src/main/java/com/zenfulcode/commercify/commercify/api/requests/RegisterUserRequest.java b/src/main/java/com/zenfulcode/commercify/commercify/api/requests/RegisterUserRequest.java
@@ -10,8 +10,7 @@ public record RegisterUserRequest(
         String firstName,
         String lastName,
         Boolean isGuest,
-        AddressDTO shippingAddress,
-        AddressDTO billingAddress) {
+        AddressDTO defaultAddress) {
     // Set a secure default password
     public RegisterUserRequest {
         if (password == null || password.isBlank()) {
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,9 +1,13 @@
 package com.zenfulcode.commercify.commercify.api.requests.orders;
 
+import com.zenfulcode.commercify.commercify.dto.AddressDTO;
+
 import java.util.List;
 
 public record CreateOrderRequest(
         String currency,
-        List<CreateOrderLineRequest> orderLines
+        List<CreateOrderLineRequest> orderLines,
+        AddressDTO shippingAddress,
+        AddressDTO billingAddress
 ) {
 }
diff --git a/src/main/java/com/zenfulcode/commercify/commercify/component/AdminDataLoader.java b/src/main/java/com/zenfulcode/commercify/commercify/component/AdminDataLoader.java
@@ -1,5 +1,6 @@
 package com.zenfulcode.commercify.commercify.component;
 
+import com.zenfulcode.commercify.commercify.entity.AddressEntity;
 import com.zenfulcode.commercify.commercify.entity.UserEntity;
 import com.zenfulcode.commercify.commercify.repository.UserRepository;
 import lombok.RequiredArgsConstructor;
@@ -27,14 +28,21 @@ public class AdminDataLoader {
     public CommandLineRunner loadData() {
         return args -> {
             if (userRepository.findByEmail(email).isEmpty()) {
+                AddressEntity defaultAddress = AddressEntity.builder()
+                        .street("123 Main St")
+                        .city("Springfield")
+                        .state("IL")
+                        .zipCode("62701")
+                        .country("US")
+                        .build();
+
                 UserEntity adminUser = UserEntity.builder()
                         .email(email)
                         .password(passwordEncoder.encode(password))
                         .firstName("Admin")
                         .lastName("User")
                         .roles(List.of("ADMIN", "USER"))
-                        .shippingAddress(null)
-                        .billingAddress(null)
+                        .defaultAddress(defaultAddress)
                         .emailConfirmed(true)
                         .build();
 
diff --git a/src/main/java/com/zenfulcode/commercify/commercify/controller/OrderController.java b/src/main/java/com/zenfulcode/commercify/commercify/controller/OrderController.java
@@ -10,7 +10,6 @@
 import com.zenfulcode.commercify.commercify.dto.OrderDetailsDTO;
 import com.zenfulcode.commercify.commercify.exception.*;
 import com.zenfulcode.commercify.commercify.service.order.OrderService;
-import com.zenfulcode.commercify.commercify.service.order.OrderValidationService;
 import com.zenfulcode.commercify.commercify.viewmodel.OrderViewModel;
 import lombok.AllArgsConstructor;
 import lombok.extern.slf4j.Slf4j;
@@ -32,7 +31,6 @@
 public class OrderController {
 
     private final OrderService orderService;
-    private final OrderValidationService orderValidationService;
     private final PagedResourcesAssembler<OrderViewModel> pagedResourcesAssembler;
 
     private static final Set<String> VALID_SORT_FIELDS = Set.of(
@@ -43,7 +41,6 @@ public class OrderController {
     @PostMapping("/{userId}")
     public ResponseEntity<?> createOrder(@PathVariable Long userId, @Validated @RequestBody CreateOrderRequest orderRequest) {
         try {
-            orderValidationService.validateCreateOrderRequest(orderRequest);
             OrderDTO orderDTO = orderService.createOrder(userId, orderRequest);
             return ResponseEntity.ok(CreateOrderResponse.from(OrderViewModel.fromDTO(orderDTO)));
         } catch (IllegalArgumentException e) {
diff --git a/src/main/java/com/zenfulcode/commercify/commercify/controller/UserManagementController.java b/src/main/java/com/zenfulcode/commercify/commercify/controller/UserManagementController.java
@@ -57,28 +57,16 @@ public ResponseEntity<Void> deleteUser(@PathVariable Long id) {
         return ResponseEntity.ok().build();
     }
 
-    @PostMapping("/{id}/shipping-address")
+    @PostMapping("/{id}/address")
     @PreAuthorize("hasRole('ADMIN') or #id == authentication.principal.id")
-    public ResponseEntity<AddressDTO> setShippingAddress(@PathVariable Long id, @RequestBody AddressDTO request) {
-        return ResponseEntity.ok(userManagementService.setShippingAddress(id, request));
+    public ResponseEntity<AddressDTO> setAddress(@PathVariable Long id, @RequestBody AddressDTO request) {
+        return ResponseEntity.ok(userManagementService.setDefaultAddress(id, request));
     }
 
-    @PostMapping("/{id}/billing-address")
+    @DeleteMapping("/{id}/address")
     @PreAuthorize("hasRole('ADMIN') or #id == authentication.principal.id")
-    public ResponseEntity<AddressDTO> setBillingAddress(@PathVariable Long id, @RequestBody AddressDTO request) {
-        return ResponseEntity.ok(userManagementService.setBillingAddress(id, request));
-    }
-
-    @DeleteMapping("/{id}/shipping-address")
-    @PreAuthorize("hasRole('ADMIN') or #id == authentication.principal.id")
-    public ResponseEntity<UserDTO> removeShippingAddress(@PathVariable Long id) {
-        return ResponseEntity.ok(userManagementService.removeShippingAddress(id));
-    }
-
-    @DeleteMapping("/{id}/billing-address")
-    @PreAuthorize("hasRole('ADMIN') or #id == authentication.principal.id")
-    public ResponseEntity<UserDTO> removeBillingAddress(@PathVariable Long id) {
-        return ResponseEntity.ok(userManagementService.removeBillingAddress(id));
+    public ResponseEntity<UserDTO> removeAddress(@PathVariable Long id) {
+        return ResponseEntity.ok(userManagementService.removeDefaultAddress(id));
     }
 
     @PostMapping("/{id}/roles")
diff --git a/src/main/java/com/zenfulcode/commercify/commercify/dto/UserDTO.java b/src/main/java/com/zenfulcode/commercify/commercify/dto/UserDTO.java
@@ -16,7 +16,6 @@ public class UserDTO {
     private String firstName;
     private String lastName;
     private Date createdAt;
-    private AddressDTO shippingAddress;
-    private AddressDTO billingAddress;
+    private AddressDTO defaultAddress;
     private List<String> roles;
 }
diff --git a/src/main/java/com/zenfulcode/commercify/commercify/dto/mapper/UserMapper.java b/src/main/java/com/zenfulcode/commercify/commercify/dto/mapper/UserMapper.java
@@ -24,12 +24,8 @@ public UserDTO apply(UserEntity user) {
                 .roles(user.getAuthorities().stream().map(GrantedAuthority::getAuthority).toList())
                 .createdAt(Date.from(user.getCreatedAt()));
 
-        if (user.getShippingAddress() != null) {
-            userBuilder.shippingAddress(addressDTOMapper.apply(user.getShippingAddress()));
-        }
-
-        if (user.getBillingAddress() != null) {
-            userBuilder.billingAddress(addressDTOMapper.apply(user.getBillingAddress()));
+        if (user.getDefaultAddress() != null) {
+            userBuilder.defaultAddress(addressDTOMapper.apply(user.getDefaultAddress()));
         }
 
         return userBuilder.build();
diff --git a/src/main/java/com/zenfulcode/commercify/commercify/entity/AddressEntity.java b/src/main/java/com/zenfulcode/commercify/commercify/entity/AddressEntity.java
@@ -33,12 +33,6 @@ public class AddressEntity {
     @Column(nullable = false)
     private String country;
 
-    @OneToOne(mappedBy = "shippingAddress")
-    private UserEntity shippingUser;
-
-    @OneToOne(mappedBy = "billingAddress")
-    private UserEntity billingUser;
-
     @Column(name = "created_at", nullable = false)
     @CreationTimestamp
     private Instant createdAt;
diff --git a/src/main/java/com/zenfulcode/commercify/commercify/entity/OrderEntity.java b/src/main/java/com/zenfulcode/commercify/commercify/entity/OrderEntity.java
@@ -46,6 +46,11 @@ public class OrderEntity {
     @Column(name = "total_amount")
     private Double totalAmount;
 
+    @ToString.Exclude
+    @ManyToOne(cascade = CascadeType.ALL)
+    @JoinColumn(name = "order_shipping_info_id")
+    private OrderShippingInfo orderShippingInfo;
+
     @Column(name = "created_at", nullable = false)
     @CreationTimestamp
     private Instant createdAt;
diff --git a/src/main/java/com/zenfulcode/commercify/commercify/entity/OrderShippingInfo.java b/src/main/java/com/zenfulcode/commercify/commercify/entity/OrderShippingInfo.java
@@ -0,0 +1,41 @@
+package com.zenfulcode.commercify.commercify.entity;
+
+import jakarta.persistence.*;
+import lombok.*;
+
+@Table(name = "order_shipping_info")
+@Entity
+@Getter
+@Setter
+@ToString
+@Builder
+@NoArgsConstructor
+@AllArgsConstructor
+public class OrderShippingInfo {
+    @Id
+    @GeneratedValue(strategy = GenerationType.IDENTITY)
+    @Column(name = "id", nullable = false)
+    private Long id;
+
+    @Column(name = "shipping_street", nullable = false)
+    private String shippingStreet;
+    @Column(name = "shipping_city", nullable = false)
+    private String shippingCity;
+    @Column(name = "shipping_state")
+    private String shippingState;
+    @Column(name = "shipping_zip", nullable = false)
+    private String shippingZip;
+    @Column(name = "shipping_country", nullable = false)
+    private String shippingCountry;
+
+    @Column(name = "billing_street")
+    private String billingStreet;
+    @Column(name = "billing_city")
+    private String billingCity;
+    @Column(name = "billing_state")
+    private String billingState;
+    @Column(name = "billing_zip")
+    private String billingZip;
+    @Column(name = "billing_country")
+    private String billingCountry;
+}
diff --git a/src/main/java/com/zenfulcode/commercify/commercify/entity/UserEntity.java b/src/main/java/com/zenfulcode/commercify/commercify/entity/UserEntity.java
@@ -40,13 +40,10 @@ public class UserEntity implements UserDetails {
     @Column(name = "phone_number", length = 20)
     private String phoneNumber;
 
-    @OneToOne(cascade = CascadeType.ALL, orphanRemoval = true)
-    @JoinColumn(name = "shipping_address_id")
-    private AddressEntity shippingAddress;
-
-    @OneToOne(cascade = CascadeType.ALL, orphanRemoval = true)
-    @JoinColumn(name = "billing_address_id")
-    private AddressEntity billingAddress;
+    @ToString.Exclude
+    @ManyToOne(cascade = CascadeType.ALL)
+    @JoinColumn(name = "default_address_id")
+    private AddressEntity defaultAddress;
 
     @ElementCollection(fetch = FetchType.EAGER)
     @CollectionTable(name = "user_roles", joinColumns = @JoinColumn(name = "id"))
@@ -75,26 +72,6 @@ public Collection<? extends GrantedAuthority> getAuthorities() {
                 .collect(Collectors.toList());
     }
 
-    public void setShippingAddress(AddressEntity address) {
-        if (this.shippingAddress != null) {
-            this.shippingAddress.setShippingUser(null);
-        }
-        this.shippingAddress = address;
-        if (address != null) {
-            address.setShippingUser(this);
-        }
-    }
-
-    public void setBillingAddress(AddressEntity address) {
-        if (this.billingAddress != null) {
-            this.billingAddress.setBillingUser(null);
-        }
-        this.billingAddress = address;
-        if (address != null) {
-            address.setBillingUser(this);
-        }
-    }
-
     @Override
     public String getUsername() {
         return email;
diff --git a/src/main/java/com/zenfulcode/commercify/commercify/repository/OrderShippingInfoRepository.java b/src/main/java/com/zenfulcode/commercify/commercify/repository/OrderShippingInfoRepository.java
@@ -0,0 +1,7 @@
+package com.zenfulcode.commercify.commercify.repository;
+
+import com.zenfulcode.commercify.commercify.entity.OrderShippingInfo;
+import org.springframework.data.jpa.repository.JpaRepository;
+
+public interface OrderShippingInfoRepository extends JpaRepository<OrderShippingInfo, Long> {
+}
diff --git a/src/main/java/com/zenfulcode/commercify/commercify/service/AuthenticationService.java b/src/main/java/com/zenfulcode/commercify/commercify/service/AuthenticationService.java
@@ -38,38 +38,24 @@ public UserDTO registerUser(RegisterUserRequest registerRequest) {
         }
 
         AddressEntity shippingAddress = null;
-        AddressEntity billingAddress;
 
-        if (registerRequest.shippingAddress() != null) {
+        if (registerRequest.defaultAddress() != null) {
             shippingAddress = AddressEntity.builder()
-                    .street(registerRequest.shippingAddress().getStreet())
-                    .city(registerRequest.shippingAddress().getCity())
-                    .state(registerRequest.shippingAddress().getState())
-                    .zipCode(registerRequest.shippingAddress().getZipCode())
-                    .country(registerRequest.shippingAddress().getCountry())
+                    .street(registerRequest.defaultAddress().getStreet())
+                    .city(registerRequest.defaultAddress().getCity())
+                    .state(registerRequest.defaultAddress().getState())
+                    .zipCode(registerRequest.defaultAddress().getZipCode())
+                    .country(registerRequest.defaultAddress().getCountry())
                     .build();
         }
 
-        if (registerRequest.billingAddress() != null) {
-            billingAddress = AddressEntity.builder()
-                    .street(registerRequest.billingAddress().getStreet())
-                    .city(registerRequest.billingAddress().getCity())
-                    .state(registerRequest.billingAddress().getState())
-                    .zipCode(registerRequest.billingAddress().getZipCode())
-                    .country(registerRequest.billingAddress().getCountry())
-                    .build();
-        } else {
-            billingAddress = shippingAddress;
-        }
-
         UserEntity user = UserEntity.builder()
                 .firstName(registerRequest.firstName())
                 .lastName(registerRequest.lastName())
                 .email(registerRequest.email())
                 .password(passwordEncoder.encode(registerRequest.password()))
                 .roles(List.of("USER"))
-                .shippingAddress(shippingAddress)
-                .billingAddress(billingAddress)
+                .defaultAddress(shippingAddress)
                 .emailConfirmed(false)
                 .build();
 
diff --git a/src/main/java/com/zenfulcode/commercify/commercify/service/UserManagementService.java b/src/main/java/com/zenfulcode/commercify/commercify/service/UserManagementService.java
@@ -57,7 +57,7 @@ public void deleteUser(Long id) {
     }
 
     @Transactional
-    public AddressDTO setShippingAddress(Long userId, AddressDTO request) {
+    public AddressDTO setDefaultAddress(Long userId, AddressDTO request) {
         UserEntity user = userRepository.findById(userId)
                 .orElseThrow(() -> new RuntimeException("User not found"));
 
@@ -69,44 +69,17 @@ public AddressDTO setShippingAddress(Long userId, AddressDTO request) {
                 .country(request.getCountry())
                 .build();
 
-        user.setShippingAddress(address);
+        user.setDefaultAddress(address);
         userRepository.save(user);
 
         return addressMapper.apply(address);
     }
 
     @Transactional
-    public AddressDTO setBillingAddress(Long userId, AddressDTO request) {
+    public UserDTO removeDefaultAddress(Long userId) {
         UserEntity user = userRepository.findById(userId)
                 .orElseThrow(() -> new RuntimeException("User not found"));
-
-        AddressEntity address = AddressEntity.builder()
-                .street(request.getStreet())
-                .city(request.getCity())
-                .state(request.getState())
-                .zipCode(request.getZipCode())
-                .country(request.getCountry())
-                .build();
-
-        user.setBillingAddress(address);
-        userRepository.save(user);
-
-        return addressMapper.apply(address);
-    }
-
-    @Transactional
-    public UserDTO removeShippingAddress(Long userId) {
-        UserEntity user = userRepository.findById(userId)
-                .orElseThrow(() -> new RuntimeException("User not found"));
-        user.setShippingAddress(null);
-        return mapper.apply(userRepository.save(user));
-    }
-
-    @Transactional
-    public UserDTO removeBillingAddress(Long userId) {
-        UserEntity user = userRepository.findById(userId)
-                .orElseThrow(() -> new RuntimeException("User not found"));
-        user.setBillingAddress(null);
+        user.setDefaultAddress(null);
         return mapper.apply(userRepository.save(user));
     }
 
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
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
diff --git a/src/main/resources/db/changelog/db.changelog-master.xml b/src/main/resources/db/changelog/db.changelog-master.xml
diff --git a/src/main/resources/db/changelog/migrations/241223151914-changelog.xml b/src/main/resources/db/changelog/migrations/241223151914-changelog.xml
diff --git a/src/test/java/com/zenfulcode/commercify/commercify/service/AuthenticationServiceTest.java b/src/test/java/com/zenfulcode/commercify/commercify/service/AuthenticationServiceTest.java
diff --git a/src/test/java/com/zenfulcode/commercify/commercify/service/UserAddressServiceTest.java b/src/test/java/com/zenfulcode/commercify/commercify/service/UserAddressServiceTest.java
diff --git a/src/test/java/com/zenfulcode/commercify/commercify/service/order/OrderServiceTest.java b/src/test/java/com/zenfulcode/commercify/commercify/service/order/OrderServiceTest.java

Original file line number	Diff line number	Diff line change
`@@ -16,7 +16,6 @@ public class UserDTO {`
`16`	`16`	`private String firstName;`
`17`	`17`	`private String lastName;`
`18`	`18`	`private Date createdAt;`
`19`		`- private AddressDTO shippingAddress;`
`20`		`- private AddressDTO billingAddress;`
	`19`	`+ private AddressDTO defaultAddress;`
`21`	`20`	`private List<String> roles;`
`22`	`21`	`}`