Changeset 950fa0d for src/main/java/edu/gjoko/schedlr/entity

Timestamp:

05/24/23 23:18:47 (13 months ago)

Author:

Gjoko Kostadinov <gjoko.kostadinov@…>

Branches:

master

Children:

77205be

Parents:

8bcd64c

Message:

Periodic update

Location:

src/main/java/edu/gjoko/schedlr/entity

Files:

• Appointment.java (modified) (2 diffs)
• Business.java (modified) (1 diff)
• Service.java (modified) (1 diff)
• ServiceType.java (modified) (1 diff)
• Stakeholder.java (modified) (1 diff)

src/main/java/edu/gjoko/schedlr/entity/Appointment.java

@@ -24 +24 @@
     private Long id;
 
-    @Column(name = "start_type")
+    @Column(name = "start_time")
     private LocalDateTime startTime;
 
@@ -30 +30 @@
     private LocalDateTime endTime;
 
-    @Column(name = "price")
-    private Float price;
+    @OneToOne
+    @JoinColumn(name = "customer_id", referencedColumnName = "id")
+    private Stakeholder customer;
+
+    @ManyToOne
+    @JoinColumn(name = "business_id")
+    private Business business;
+
+    @ManyToOne
+    @JoinColumn(name = "service_id")
+    private Service service;
 
     @Column(name = "created")

src/main/java/edu/gjoko/schedlr/entity/Business.java

@@ -37 +37 @@
     private BusinessType businessType;
 
-    @ManyToOne(cascade = CascadeType.PERSIST)
+    @ManyToOne()
     @JoinColumn(name = "owner_id", referencedColumnName = "id", nullable = false)
     @JsonProperty("owner")

src/main/java/edu/gjoko/schedlr/entity/Service.java

@@ -33 +33 @@
     private Integer price;
 
-    @OneToOne(cascade = CascadeType.MERGE)
+    @OneToOne(cascade = CascadeType.PERSIST)
     @JoinColumn(name = "service_type_id", referencedColumnName = "id")
     private ServiceType serviceType;
 
     @ManyToOne
-    @JoinColumn(name = "business_fk")
+    @JoinColumn(name = "business_id")
     @JsonBackReference
     private Business business;

src/main/java/edu/gjoko/schedlr/entity/ServiceType.java

@@ -30 +30 @@
     private String name;
 
-
     @ManyToOne
     @JoinColumn(name = "business_type_id")

src/main/java/edu/gjoko/schedlr/entity/Stakeholder.java

@@ -43 +43 @@
 
     @Column(name = "password")
-    @JsonIgnore
     private String password;