diff --git a/backend/src/main/java/se/bilhalsning/entity/Order.java b/backend/src/main/java/se/bilhalsning/entity/Order.java index 62664dd..b3fb5cc 100644 --- a/backend/src/main/java/se/bilhalsning/entity/Order.java +++ b/backend/src/main/java/se/bilhalsning/entity/Order.java @@ -2,7 +2,10 @@ package se.bilhalsning.entity; import jakarta.persistence.Column; import jakarta.persistence.Entity; +import jakarta.persistence.FetchType; import jakarta.persistence.Id; +import jakarta.persistence.JoinColumn; +import jakarta.persistence.ManyToOne; import jakarta.persistence.PrePersist; import jakarta.persistence.PreUpdate; import jakarta.persistence.Table; @@ -21,6 +24,10 @@ public class Order { @Column(name = "user_id", nullable = false, columnDefinition = "uuid") private UUID userId; + @ManyToOne(fetch = FetchType.LAZY) + @JoinColumn(name = "user_id", insertable = false, updatable = false) + private User user; + @Column(name = "plate", nullable = false, length = 10) private String plate; @@ -75,6 +82,14 @@ public class Order { this.userId = userId; } + public User getUser() { + return user; + } + + public void setUser(User user) { + this.user = user; + } + public String getPlate() { return plate; } diff --git a/backend/src/main/java/se/bilhalsning/repository/OrderRepository.java b/backend/src/main/java/se/bilhalsning/repository/OrderRepository.java index 287d32a..5faacb8 100644 --- a/backend/src/main/java/se/bilhalsning/repository/OrderRepository.java +++ b/backend/src/main/java/se/bilhalsning/repository/OrderRepository.java @@ -1,5 +1,6 @@ package se.bilhalsning.repository; +import org.springframework.data.jpa.repository.EntityGraph; import org.springframework.data.jpa.repository.JpaRepository; import org.springframework.stereotype.Repository; import se.bilhalsning.entity.Order; @@ -11,5 +12,9 @@ import java.util.UUID; @Repository public interface OrderRepository extends JpaRepository { List findByUserIdOrderByCreatedAtDesc(UUID userId); + List findByStatus(OrderStatus status); + + @EntityGraph(attributePaths = {"user"}) + List findAllByOrderByCreatedAtDesc(); }