change order entities and ad tpay api keys

This commit is contained in:
Patryk
2025-05-20 21:17:31 +02:00
parent 1d55f40753
commit 71fdf1640a
3 changed files with 42 additions and 5 deletions

View File

@@ -1,18 +1,25 @@
package _11.asktpk.artisanconnectbackend.entities; package _11.asktpk.artisanconnectbackend.entities;
import _11.asktpk.artisanconnectbackend.utils.Enums;
import _11.asktpk.artisanconnectbackend.utils.Enums.Status; import _11.asktpk.artisanconnectbackend.utils.Enums.Status;
import jakarta.persistence.*; import jakarta.persistence.*;
import lombok.Getter;
import lombok.Setter;
import java.time.LocalDateTime;
@Entity @Entity
@Table(name = "orders") @Table(name = "orders")
@Getter
@Setter
public class Orders { public class Orders {
@Id @Id
@GeneratedValue(strategy = GenerationType.IDENTITY) @GeneratedValue(strategy = GenerationType.IDENTITY)
private Long idOrder; private Long id;
@ManyToOne @ManyToOne
@JoinColumn(name = "id_user") @JoinColumn(name = "id_client")
private Client client; private Client client;
@ManyToOne @ManyToOne
@@ -20,7 +27,18 @@ public class Orders {
private Notice notice; private Notice notice;
@Enumerated(EnumType.STRING) @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;
} }

View File

@@ -43,4 +43,20 @@ public class Enums {
public enum Status { public enum Status {
ACTIVE, INACTIVE ACTIVE, INACTIVE
} }
public enum OrderType {
ACTIVATION,
BOOST
}
public enum OrderStatus {
PENDING, COMPLETED, CANCELLED
}
public enum PaymentStatus{
PENDING, CORRECT, INCORRECT
}
} }

View File

@@ -16,4 +16,7 @@ spring.jpa.hibernate.ddl-auto=create-drop
file.upload-dir=/Users/andsol/Desktop/uploads file.upload-dir=/Users/andsol/Desktop/uploads
spring.servlet.multipart.max-file-size=10MB spring.servlet.multipart.max-file-size=10MB
spring.servlet.multipart.max-request-size=10MB spring.servlet.multipart.max-request-size=10MB
tpay.clientId = 01JQKC048X62ST9V59HNRSXD92-01JQKC2CQHPYXQFSFX8BKC24BX
tpay.secret = e701f2feee2b9c967bf3e67a4e71c76377701f4b1e9d92f6af2e75c97e7df210