diff --git a/src/main/java/_11/asktpk/artisanconnectbackend/entities/Orders.java b/src/main/java/_11/asktpk/artisanconnectbackend/entities/Orders.java index 0657ad8..27120df 100644 --- a/src/main/java/_11/asktpk/artisanconnectbackend/entities/Orders.java +++ b/src/main/java/_11/asktpk/artisanconnectbackend/entities/Orders.java @@ -1,18 +1,25 @@ package _11.asktpk.artisanconnectbackend.entities; +import _11.asktpk.artisanconnectbackend.utils.Enums; import _11.asktpk.artisanconnectbackend.utils.Enums.Status; import jakarta.persistence.*; +import lombok.Getter; +import lombok.Setter; + +import java.time.LocalDateTime; @Entity @Table(name = "orders") +@Getter +@Setter public class Orders { @Id @GeneratedValue(strategy = GenerationType.IDENTITY) - private Long idOrder; + private Long id; @ManyToOne - @JoinColumn(name = "id_user") + @JoinColumn(name = "id_client") private Client client; @ManyToOne @@ -20,7 +27,18 @@ public class Orders { private Notice notice; @Enumerated(EnumType.STRING) - private Status status; + @Column(nullable = false) + private Enums.OrderType orderType; - // Getters, setters, and constructors + @Enumerated(EnumType.STRING) + @Column(nullable = false) + private Enums.OrderStatus status; + + @Column(nullable = false) + private Double amount; + + @Column(nullable = false) + private LocalDateTime createdAt; + + private LocalDateTime updatedAt; } diff --git a/src/main/java/_11/asktpk/artisanconnectbackend/utils/Enums.java b/src/main/java/_11/asktpk/artisanconnectbackend/utils/Enums.java index 22108e8..36cd12d 100644 --- a/src/main/java/_11/asktpk/artisanconnectbackend/utils/Enums.java +++ b/src/main/java/_11/asktpk/artisanconnectbackend/utils/Enums.java @@ -43,4 +43,20 @@ public class Enums { public enum Status { ACTIVE, INACTIVE } + + public enum OrderType { + ACTIVATION, + BOOST + } + + + public enum OrderStatus { + PENDING, COMPLETED, CANCELLED + } + + public enum PaymentStatus{ + PENDING, CORRECT, INCORRECT + } + + } diff --git a/src/main/resources/application.properties b/src/main/resources/application.properties index 23daefd..a2c0be0 100644 --- a/src/main/resources/application.properties +++ b/src/main/resources/application.properties @@ -16,4 +16,7 @@ spring.jpa.hibernate.ddl-auto=create-drop file.upload-dir=/Users/andsol/Desktop/uploads spring.servlet.multipart.max-file-size=10MB -spring.servlet.multipart.max-request-size=10MB \ No newline at end of file +spring.servlet.multipart.max-request-size=10MB + +tpay.clientId = 01JQKC048X62ST9V59HNRSXD92-01JQKC2CQHPYXQFSFX8BKC24BX +tpay.secret = e701f2feee2b9c967bf3e67a4e71c76377701f4b1e9d92f6af2e75c97e7df210