Changeset 8ae6217 for Prototype Application/Paw5/src/main/java/finki/paw5/model/Adopter.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/Adopter.java (modified) (2 diffs)

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

@@ -5 +5 @@
 import finki.paw5.model.enumerations.Housing;
 import finki.paw5.model.enumerations.PhysicalActivity;
-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 = "adopter")
-public class Adopter {
-
-    @Id
-    @Column(name = "id_user", nullable = false)
-    private int id;
+@PrimaryKeyJoinColumn(name = "id_user")
+public class Adopter extends User {
 
     @Column(name = "free_time")
@@ -47 +43 @@
     private int verifiedByEmployeeId;
 
-    public Adopter(int id, FreeTime freeTime, Funds funds, boolean hasOtherPets, boolean hasKids, Housing housing, PhysicalActivity physicalActivity, boolean willFoster, boolean verified, int verifiedByEmployeeId) {
-        this.id = id;
+    public Adopter(LocalDate dateCreated, String name, String email, String password, String telephone,
+                   FreeTime freeTime, Funds funds, boolean hasOtherPets, boolean hasKids, Housing housing,
+                   PhysicalActivity physicalActivity, boolean willFoster, boolean verified, int verifiedByEmployeeId) {
+        super(dateCreated, name, email, password, telephone);
+        this.freeTime = freeTime;
+        this.funds = funds;
+        this.hasOtherPets = hasOtherPets;
+        this.hasKids = hasKids;
+        this.housing = housing;
+        this.physicalActivity = physicalActivity;
+        this.willFoster = willFoster;
+        this.verified = verified;
+        this.verifiedByEmployeeId = verifiedByEmployeeId;
+    }
+
+    public Adopter(FreeTime freeTime, Funds funds, boolean hasOtherPets, boolean hasKids, Housing housing,
+                   PhysicalActivity physicalActivity, boolean willFoster, boolean verified, int verifiedByEmployeeId) {
         this.freeTime = freeTime;
         this.funds = funds;