Changeset a436340 for src/main/java/edu/gjoko/schedlr/entity

Timestamp:

02/05/23 19:55:10 (22 months ago)

Author:

Gjoko Kostadinov <gjoko.kostadinov@…>

Branches:

master

Children:

2b0a4db

Parents:

cc52b09

Message:

Adding customer registration

Location:

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

Files:

• Business.java (modified) (4 diffs)
• BusinessType.java (modified) (1 diff)
• Search.java (deleted)
• Service.java (modified) (2 diffs)
• ServiceType.java (added)

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

@@ -1 +1 @@
 package edu.gjoko.schedlr.entity;
 
+import com.fasterxml.jackson.annotation.JsonManagedReference;
 import lombok.AllArgsConstructor;
 import lombok.Getter;
@@ -25 +26 @@
     private String name;
 
-    @Column(name = "business_type")
-    @Enumerated(EnumType.STRING)
+    @OneToOne
+    @JoinColumn(name = "business_type_id", referencedColumnName = "id")
     private BusinessType businessType;
 
@@ -39 +40 @@
     private Stakeholder owner;
 
+    @OneToMany(mappedBy = "business")
+    @JsonManagedReference
+    private List<Service> services;
+
     @Column(name = "created")
     private LocalDateTime created;
@@ -45 +50 @@
     private LocalDateTime modified;
 
-    @OneToMany(mappedBy = "business")
-    private List<Service> services;
+
 }

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

@@ -1 +1 @@
 package edu.gjoko.schedlr.entity;
 
-public enum BusinessType {
-    TAILOR,
-    NAIL_SALON,
-    MASSAGE_PARLOR,
-    MAKEUP_STUDIO,
-    HAIRDRESSER,
-    BARBER
+import com.fasterxml.jackson.annotation.JsonIgnore;
+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.*;
+import java.time.LocalDateTime;
+import java.util.List;
+
+@Entity
+@EntityListeners(AuditingEntityListener.class)
+@Table(name = "business_type")
+@Getter
+@Setter
+@NoArgsConstructor
+@AllArgsConstructor
+public class BusinessType {
+
+    @Id
+    @GeneratedValue(strategy = GenerationType.SEQUENCE)
+    @JsonProperty("value")
+    private Long id;
+
+    @Column(name = "name")
+    @JsonProperty("text")
+    private String name;
+
+    @OneToMany(mappedBy="businessType")
+    @JsonManagedReference
+    private List<ServiceType> serviceTypes;
+
+    @Column(name = "created")
+    @CreatedDate
+    @JsonIgnore
+    private LocalDateTime created;
+
+    @Column(name = "modified")
+    @LastModifiedDate
+    @JsonIgnore
+    private LocalDateTime modified;
 }

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

@@ -1 +1 @@
 package edu.gjoko.schedlr.entity;
 
+import com.fasterxml.jackson.annotation.JsonBackReference;
 import lombok.AllArgsConstructor;
 import lombok.Getter;
@@ -35 +36 @@
     private Float price;
 
+    @OneToOne
+    @JoinColumn(name = "service_type_id", referencedColumnName = "id")
+    private ServiceType serviceType;
+
     @ManyToOne
-    @JoinColumn(name = "business_id")
+    @JoinColumn(name="business_fk")
+    @JsonBackReference
     private Business business;