Merge remote-tracking branch 'origin/product' into product

Author: drp5

src/main/java/cat/udl/eps/softarch/demo/domain/Basket.java

@@ -0,0 +1,42 @@
+package cat.udl.eps.softarch.demo.domain;
+
+import com.fasterxml.jackson.annotation.JsonIdentityReference;
+import jakarta.persistence.*;
+import jakarta.validation.constraints.NotNull;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+
+import java.time.ZonedDateTime;
+
+@Entity
+@Data
+@EqualsAndHashCode(callSuper = true)
+public class Basket extends UriEntity<Long> {
+
+    @Id
+    @GeneratedValue(strategy = GenerationType.IDENTITY)
+    private Long id;
+
+    @NotNull
+    @OneToOne
+    @JsonIdentityReference(alwaysAsId = true)
+    private Customer customer;
+
+    @Column(nullable = false, updatable = false)
+    private ZonedDateTime createdAt;
+
+    @Column(nullable = false)
+    private ZonedDateTime updatedAt;
+
+    @PrePersist
+    protected void onCreate() {
+        ZonedDateTime now = ZonedDateTime.now();
+        this.createdAt = now;
+        this.updatedAt = now;
+    }
+
+    @PreUpdate
+    protected void onUpdate() {
+        this.updatedAt = ZonedDateTime.now();
+    }
+}

src/main/java/cat/udl/eps/softarch/demo/domain/Business.java

@@ -2,14 +2,18 @@
 
 import com.fasterxml.jackson.annotation.JsonProperty;
 import com.fasterxml.jackson.annotation.JsonValue;
+import jakarta.persistence.CascadeType;
 import jakarta.persistence.Entity;
+import jakarta.persistence.OneToMany;
 import jakarta.validation.constraints.NotEmpty;
 import lombok.Data;
 import lombok.EqualsAndHashCode;
 import org.springframework.security.core.GrantedAuthority;
 import org.springframework.security.core.authority.AuthorityUtils;
+import java.util.ArrayList;
 
 import java.util.Collection;
+import java.util.List;
 
 @Entity
 @Data
@@ -30,4 +34,7 @@ public class Business extends User {
     public Collection<? extends GrantedAuthority> getAuthorities() {
         return AuthorityUtils.commaSeparatedStringToAuthorityList("ROLE_BUSINESS");
     }
+
+
+
 }

src/main/java/cat/udl/eps/softarch/demo/domain/Customer.java

@@ -1,8 +1,11 @@
 package cat.udl.eps.softarch.demo.domain;
 
+import com.fasterxml.jackson.annotation.JsonIdentityReference;
 import com.fasterxml.jackson.annotation.JsonProperty;
 import com.fasterxml.jackson.annotation.JsonValue;
+import jakarta.persistence.CascadeType;
 import jakarta.persistence.Entity;
+import jakarta.persistence.OneToOne;
 import jakarta.validation.constraints.NotEmpty;
 import lombok.Data;
 import lombok.EqualsAndHashCode;
@@ -22,17 +25,13 @@ public class Customer extends User {
     @NotEmpty
     private String phoneNumber;
 
-
     @Override
     @JsonValue(value = false)
     @JsonProperty(access = JsonProperty.Access.READ_ONLY)
     public Collection<? extends GrantedAuthority> getAuthorities() {
         return AuthorityUtils.commaSeparatedStringToAuthorityList("ROLE_CUSTOMER");
     }
 
-    //TODO
-    // @OneToOne
-    // private Basket basket;
 
     //TODO
     // @OneToMany(mappedBy = "products")

src/main/java/cat/udl/eps/softarch/demo/domain/Inventory.java

@@ -26,5 +26,8 @@ public class Inventory extends UriEntity {
 
     private int totalStock;
 
+    @ManyToOne
+    private Business business;
+
 
 }

src/main/java/cat/udl/eps/softarch/demo/repository/BasketRepository.java

@@ -0,0 +1,12 @@
+package cat.udl.eps.softarch.demo.repository;
+
+import java.util.Optional;
+import cat.udl.eps.softarch.demo.domain.Basket;
+import cat.udl.eps.softarch.demo.domain.Customer;
+import org.springframework.data.repository.CrudRepository;
+import org.springframework.data.repository.PagingAndSortingRepository;
+
+public interface BasketRepository extends CrudRepository<Basket, Long>, PagingAndSortingRepository<Basket, Long> {
+
+    Optional<Basket> findByCustomer(Customer customer);
+}

src/main/java/cat/udl/eps/softarch/demo/repository/CustomerRepository.java

@@ -6,7 +6,7 @@
 
 import java.util.List;
 
-public interface CustomerRepository extends CrudRepository<Customer, Long>, PagingAndSortingRepository<Customer, Long> {
+public interface CustomerRepository extends CrudRepository<Customer, String>, PagingAndSortingRepository<Customer, String> {
 
     List<Customer> findByPhoneNumber(String phone);
     List<Customer> findByName(String name);