Changeset 8ae6217 for Prototype Application/Paw5/src/main/java/finki/paw5/model/Donor.java

Timestamp:

02/03/23 10:49:45 (17 months ago)

Author:

SazdovaEkaterina <sazdovaekaterina@…>

Branches:

main

Children:

e294983

Parents:

4885da3 (diff), 579bf6d (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 adopting-a-pet

File:

• Prototype Application/Paw5/src/main/java/finki/paw5/model/Donor.java (modified) (3 diffs)

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

@@ -1 +1 @@
 package finki.paw5.model;
 
-import jakarta.persistence.Column;
-import jakarta.persistence.Entity;
-import jakarta.persistence.Id;
-import jakarta.persistence.Table;
+import jakarta.persistence.*;
 import lombok.Data;
+
+import java.time.LocalDate;
 
 @Data
 @Entity
 @Table(name = "donor")
-public class Donor {
-
-    @Id
-    @Column(name = "id_user", nullable = false)
-    private int id;
+@PrimaryKeyJoinColumn(name = "id_user")
+public class Donor extends User {
 
     @Column(name = "is_from_organisation", nullable = false)
@@ -22 +18 @@
     private String organisationName;
 
-    public Donor(int id, boolean fromOrganisation, String organisationName) {
-        this.id = id;
+    public Donor(LocalDate dateCreated, String name, String email, String password, String telephone, boolean fromOrganisation, String organisationName) {
+        super(dateCreated, name, email, password, telephone);
+        this.fromOrganisation = fromOrganisation;
+        this.organisationName = organisationName;
+    }
+
+    public Donor(boolean fromOrganisation, String organisationName) {
         this.fromOrganisation = fromOrganisation;
         this.organisationName = organisationName;
@@ -30 +31 @@
     public Donor() {
     }
+
 }