Changeset 46fd0c7 for src/main/java/edu/gjoko/schedlr/entity

Timestamp:

03/13/23 00:58:07 (20 months ago)

Author:

Gjoko Kostadinov <gjoko.kostadinov@…>

Branches:

master

Children:

9050790

Parents:

2b0a4db

Message:

Add admin page initial work.

Location:

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

Files:

• Appointment.java (modified) (3 diffs)
• Business.java (modified) (3 diffs)
• BusinessStatus.java (added)
• Service.java (modified) (2 diffs)

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

@@ -5 +5 @@
 import lombok.NoArgsConstructor;
 import lombok.Setter;
+import org.springframework.data.annotation.LastModifiedDate;
+import org.springframework.data.jpa.domain.support.AuditingEntityListener;
 
 import javax.persistence.*;
@@ -10 +12 @@
 
 @Entity
+@EntityListeners(AuditingEntityListener.class)
 @Table(name = "appointment")
 @Getter
@@ -31 +34 @@
 
     @Column(name = "created")
+    @LastModifiedDate
     private LocalDateTime created;
 
     @Column(name = "modified")
+    @LastModifiedDate
     private LocalDateTime modified;
 }

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

@@ -2 +2 @@
 
 import com.fasterxml.jackson.annotation.JsonManagedReference;
+import com.fasterxml.jackson.annotation.JsonProperty;
 import lombok.AllArgsConstructor;
 import lombok.Getter;
 import lombok.NoArgsConstructor;
 import lombok.Setter;
+import org.springframework.data.annotation.CreatedDate;
+import org.springframework.data.annotation.LastModifiedDate;
+import org.springframework.data.jpa.domain.support.AuditingEntityListener;
 
 import javax.persistence.*;
@@ -12 +16 @@
 
 @Entity
+@EntityListeners(AuditingEntityListener.class)
 @Table(name = "business")
 @Getter
@@ -23 +28 @@
     private Long id;
 
-    @Column(name = "name")
-    private String name;
+    @Column(name = "company_name")
+    private String companyName;
 
     @OneToOne
     @JoinColumn(name = "business_type_id", referencedColumnName = "id")
+    @JsonProperty("businessType")
     private BusinessType businessType;
 
-    @Column(name = "opening_time")
-    private LocalDateTime openingTime;
-
-    @Column(name = "closing_time")
-    private LocalDateTime closingTime;
-
-    @ManyToOne
+    @ManyToOne(cascade = CascadeType.PERSIST)
     @JoinColumn(name = "owner_id", referencedColumnName = "id", nullable = false)
+    @JsonProperty("owner")
     private Stakeholder owner;
 
-    @OneToMany(mappedBy = "business")
+    @OneToMany(mappedBy = "business", cascade = CascadeType.PERSIST)
     @JsonManagedReference
     private List<Service> services;
 
+    @Column(name = "business_status")
+    @Enumerated(EnumType.STRING)
+    private BusinessStatus businessStatus;
+
     @Column(name = "created")
+    @CreatedDate
     private LocalDateTime created;
 
     @Column(name = "modified")
+    @LastModifiedDate
     private LocalDateTime modified;
 

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

@@ -11 +11 @@
 
 import javax.persistence.*;
-import java.sql.Timestamp;
 import java.time.LocalDateTime;
 
@@ -27 +26 @@
     private Long id;
 
-    @Column(name = "name")
-    private String name;
-
     @Column(name = "duration")
     private Integer duration;
 
-    @Column(name = "price")
-    private Float price;
-
-    @OneToOne
+    @OneToOne(cascade = CascadeType.MERGE)
     @JoinColumn(name = "service_type_id", referencedColumnName = "id")
     private ServiceType serviceType;
 
     @ManyToOne
-    @JoinColumn(name="business_fk")
+    @JoinColumn(name = "business_fk")
     @JsonBackReference
     private Business business;