Changeset a3aea2a for Prototype Application/Paw5

Timestamp:

02/02/23 18:32:19 (21 months ago)

Author:

SazdovaEkaterina <sazdovaekaterina@…>

Branches:

main

Children:

1bd0a56

Parents:

6a17c29 (diff), fdfc6fa (diff)
Note: this is a merge changeset, the changes displayed below correspond to the merge itself.
Use the (diff) links above to see all the changes relative to each parent.

Message:

Merge branch 'create-models' into create-post

Location:

Prototype Application/Paw5/src/main

Files:

• java/finki/paw5/model/Adoption.java (modified) (3 diffs)
• java/finki/paw5/model/Donor.java (modified) (1 diff)
• java/finki/paw5/model/Post.java (modified) (3 diffs)
• java/finki/paw5/model/Therapy.java (modified) (2 diffs)
• java/finki/paw5/model/User.java (modified) (3 diffs)
• java/finki/paw5/model/relations/PetNeedsInterventionInVetClinic.java (modified) (2 diffs)
• resources/application.properties (modified) (1 diff)

Prototype Application/Paw5/src/main/java/finki/paw5/model/Adoption.java

@@ -7 +7 @@
 import lombok.Data;
 
+import java.time.LocalDate;
 import java.util.Date;
 
@@ -19 +20 @@
 
     @Column(name = "start_date", nullable = false)
-    private Date startDate;
+    private LocalDate startDate;
 
     @Column(name = "end_date_foster")
-    private Date endDateFoster;
+    private LocalDate endDateFoster;
 
     @Column(name = "approved", nullable = false)
@@ -30 +31 @@
     private int adopterId;
 
-    public Adoption(Date startDate, Date endDateFoster, boolean approved, int adopterId) {
+    public Adoption(LocalDate startDate, LocalDate endDateFoster, boolean approved, int adopterId) {
         this.startDate = startDate;
         this.endDateFoster = endDateFoster;

Prototype Application/Paw5/src/main/java/finki/paw5/model/Donor.java

@@ -19 +19 @@
     private boolean fromOrganisation;
 
-    @Column(name = "name_organisation", nullable = true, length = 100)
+    @Column(name = "name_organisation_donor", nullable = true, length = 100)
     private String organisationName;
 

Prototype Application/Paw5/src/main/java/finki/paw5/model/Post.java

@@ -7 +7 @@
 import lombok.Data;
 
+import java.time.LocalDate;
 import java.util.Date;
 
@@ -19 +20 @@
 
     @Column(name="date_post", nullable = false)
-    private Date dateCreated;
+    private LocalDate dateCreated;
 
     @Column(name="url_thumbanail", length = 200)
@@ -33 +34 @@
     private int employeeId;
 
-    public Post(Date dateCreated, String thumbnailUrl, int petId, int surendeeId, int employeeId) {
+    public Post(LocalDate dateCreated, String thumbnailUrl, int petId, int surendeeId, int employeeId) {
         this.dateCreated = dateCreated;
         this.thumbnailUrl = thumbnailUrl;

Prototype Application/Paw5/src/main/java/finki/paw5/model/Therapy.java

@@ -7 +7 @@
 import lombok.Data;
 
+import java.time.LocalDate;
 import java.util.Date;
 
@@ -22 +23 @@
 
     @Column(name = "start_date")
-    private Date startDate;
+    private LocalDate startDate;
 
     @Column(name = "end_date")
-    private Date endDate;
+    private LocalDate endDate;
 
-    public Therapy(String healthProblem, Date startDate, Date endDate) {
+    public Therapy(String healthProblem, LocalDate startDate, LocalDate endDate) {
         this.healthProblem = healthProblem;
         this.startDate = startDate;

Prototype Application/Paw5/src/main/java/finki/paw5/model/User.java

@@ -7 +7 @@
 import lombok.Data;
 
+import java.time.LocalDate;
 import java.util.Date;
 
@@ -19 +20 @@
 
     @Column(name = "date_created_user", nullable = false)
-    private Date dateCreated;
+    private LocalDate dateCreated;
 
     @Column(name = "name_user", nullable = false, length = 100)
@@ -30 +31 @@
     private String password;
 
-    @Column(name = "telephone", length = 20)
+    @Column(name = "telephone_user", length = 20)
     private String telephone;
 
-    public User(Date dateCreated, String name, String email, String password, String telephone) {
+    public User(LocalDate dateCreated, String name, String email, String password, String telephone) {
         this.dateCreated = dateCreated;
         this.name = name;

Prototype Application/Paw5/src/main/java/finki/paw5/model/relations/PetNeedsInterventionInVetClinic.java

@@ -7 +7 @@
 import lombok.Data;
 
+import java.time.LocalDate;
 import java.util.Date;
 
@@ -23 +24 @@
 
     @Column(name = "date_of_interventing", nullable = false)
-    private Date interventionDate;
+    private LocalDate interventionDate;
 
     @Column(name = "description", length = 100)
     private String description;
 
-    public PetNeedsInterventionInVetClinic(int petId, int vetClinicId, Date interventionDate, String description) {
+    public PetNeedsInterventionInVetClinic(int petId, int vetClinicId, LocalDate interventionDate, String description) {
         this.petId = petId;
         this.vetClinicId = vetClinicId;

Prototype Application/Paw5/src/main/resources/application.properties

@@ -9 +9 @@
 spring.jpa.properties.hibernate.jdbc.lob.non_contextual_creation=true
 
-spring.jpa.hibernate.ddl-auto=update
+spring.jpa.hibernate.ddl-auto=validate
 spring.jpa.show-sql=true