Changeset c3278ac for Prototype Application/Paw5/src/main/java/finki/paw5/model/entities/Employee.java

Timestamp:

03/09/23 16:11:48 (16 months ago)

Author:

GitHub <noreply@…>

Branches:

main

Children:

0078d84, 4ab3aae

Parents:

8b7dd7f (diff), 264d675 (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.

git-author:

SazdovaEkaterina <74919977+SazdovaEkaterina@…> (03/09/23 16:11:48)

git-committer:

GitHub <noreply@…> (03/09/23 16:11:48)

Message:

Merge pull request #9 from SazdovaEkaterina/fix-foreign-keys

Fix Database Mapping in Models

File:

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

Prototype Application/Paw5/src/main/java/finki/paw5/model/entities/Employee.java

@@ -3 +3 @@
 import jakarta.persistence.*;
 import lombok.Data;
+import lombok.RequiredArgsConstructor;
 
 import java.time.LocalDate;
@@ -8 +9 @@
 @Data
 @Entity
+@RequiredArgsConstructor
 @Table(name = "employee")
 @PrimaryKeyJoinColumn(name = "id_user")
@@ -15 +17 @@
     private String position;
 
-    @Column(name = "id_shelter", nullable = false)
-    private Integer shelterId;
+    @ManyToOne
+    @JoinColumn(name = "id_shelter", nullable = false)
+    private Shelter shelter;
 
     @Column(name = "is_verified", nullable = false)
-    private boolean verified;
+    private Boolean verified;
 
-    @Column(name = "verified_by_admin")
-    private Integer verifiedByAdminId;
+    @ManyToOne
+    @JoinColumn(name = "verified_by_admin")
+    private Admin adminVerificator;
 
     public Employee(LocalDate dateCreated, String name, String email, String password, String telephone,
-                    String position, int shelterId, boolean verified) {
+                    String position, Shelter shelter, Boolean verified) {
         super(dateCreated, name, email, password, telephone);
         this.position = position;
-        this.shelterId = shelterId;
+        this.shelter = shelter;
         this.verified = verified;
     }
 
-    public Employee(String position, int shelterId, boolean verified, int verifiedByAdminId) {
-        this.position = position;
-        this.shelterId = shelterId;
-        this.verified = verified;
-        this.verifiedByAdminId = verifiedByAdminId;
-    }
-
-    public Employee() {
-
-    }
-
 }