Changes in / [1bd0a56:d396372]

Location:

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

Files:

• .gitkeep (deleted)
• Admin.java (deleted)
• Adopter.java (deleted)
• Adoption.java (deleted)
• Category.java (deleted)
• Donor.java (deleted)
• Employee.java (deleted)
• Food.java (deleted)
• Organisation.java (deleted)
• PersonalProfile.java (deleted)
• Pet.java (deleted)
• Post.java (deleted)
• Shelter.java (deleted)
• Surendee.java (deleted)
• Therapy.java (deleted)
• User.java (deleted)
• VetClinic.java (deleted)
• entities/Admin.java (added)
• entities/Adopter.java (added)
• entities/Adoption.java (added)
• entities/Category.java (added)
• entities/Donor.java (added)
• entities/Employee.java (added)
• entities/Food.java (added)
• entities/Organisation.java (added)
• entities/PersonalProfile.java (added)
• entities/Pet.java (added)
• entities/Post.java (added)
• entities/Shelter.java (added)
• entities/Surendee.java (added)
• entities/Therapy.java (added)
• entities/User.java (added)
• entities/VetClinic.java (added)
• relations/DonorDonatesToOrganisation.java (modified) (2 diffs)
• relations/DonorDonatesToOrganisationId.java (added)
• relations/PetBelongsToCategory.java (modified) (2 diffs)
• relations/PetBelongsToCategoryId.java (added)
• relations/PetNeedsInterventionInVetClinic.java (modified) (2 diffs)
• relations/PetNeedsInterventionInVetClinicId.java (added)
• relations/PetNeedsTherapy.java (modified) (2 diffs)
• relations/PetNeedsTherapyId.java (added)
• relations/PetPreferablyEatsFood.java (modified) (2 diffs)
• relations/PetPreferablyEatsFoodId.java (added)

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

@@ -1 +1 @@
 package finki.paw5.model.relations;
 
-import jakarta.persistence.Column;
-import jakarta.persistence.Entity;
-import jakarta.persistence.Id;
-import jakarta.persistence.Table;
+import jakarta.persistence.*;
 import lombok.Data;
 
@@ -10 +7 @@
 @Entity
 @Table(name = "donor_donates_to_organisation")
+@IdClass(DonorDonatesToOrganisationId.class)
 public class DonorDonatesToOrganisation {
 
     @Id
     @Column(name="id_user", nullable = false)
-    private int userId;
+    private Integer userId;
 
     @Id
     @Column(name="id_organisation", nullable = false)
-    private int organisationId;
+    private Integer organisationId;
 
     public DonorDonatesToOrganisation(int userId, int organisationId) {

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

@@ -1 +1 @@
 package finki.paw5.model.relations;
 
-import jakarta.persistence.Column;
-import jakarta.persistence.Entity;
-import jakarta.persistence.Id;
-import jakarta.persistence.Table;
+import jakarta.persistence.*;
 import lombok.Data;
 
@@ -10 +7 @@
 @Entity
 @Table(name = "pet_belongs_to_category")
+@IdClass(PetBelongsToCategoryId.class)
 public class PetBelongsToCategory {
 
     @Id
     @Column(name="id_pet", nullable = false)
-    private int petId;
+    private Integer petId;
 
     @Id
     @Column(name="id_category", nullable = false)
-    private int categoryId;
+    private Integer categoryId;
 
     public PetBelongsToCategory(int petId, int categoryId) {

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

@@ -1 +1 @@
 package finki.paw5.model.relations;
 
-import jakarta.persistence.Column;
-import jakarta.persistence.Entity;
-import jakarta.persistence.Id;
-import jakarta.persistence.Table;
+import jakarta.persistence.*;
 import lombok.Data;
 
@@ -13 +10 @@
 @Entity
 @Table(name = "pet_needs_intervention_in_vet_clinic")
+@IdClass(PetNeedsInterventionInVetClinicId.class)
 public class PetNeedsInterventionInVetClinic {
 
     @Id
     @Column(name = "id_pet", nullable = false)
-    private int petId;
+    private Integer petId;
 
     @Id
     @Column(name = "id_vet_clinic", nullable = false)
-    private int vetClinicId;
+    private Integer vetClinicId;
 
     @Column(name = "date_of_interventing", nullable = false)

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

@@ -1 +1 @@
 package finki.paw5.model.relations;
 
-import jakarta.persistence.Column;
-import jakarta.persistence.Entity;
-import jakarta.persistence.Id;
-import jakarta.persistence.Table;
+import jakarta.persistence.*;
 import lombok.Data;
 
@@ -10 +7 @@
 @Entity
 @Table(name = "pet_needs_therapy")
+@IdClass(PetNeedsTherapyId.class)
 public class PetNeedsTherapy {
 
     @Id
     @Column(name="id_pet", nullable = false)
-    private int petId;
+    private Integer petId;
 
     @Id
     @Column(name="id_therapy", nullable = false)
-    private int therapyId;
+    private Integer therapyId;
 
     public PetNeedsTherapy(int petId, int therapyId) {

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

@@ -1 +1 @@
 package finki.paw5.model.relations;
 
-import jakarta.persistence.Column;
-import jakarta.persistence.Entity;
-import jakarta.persistence.Id;
-import jakarta.persistence.Table;
+import jakarta.persistence.*;
 import lombok.Data;
 
@@ -10 +7 @@
 @Entity
 @Table(name = "pet_preferably_eats_food")
+@IdClass(PetPreferablyEatsFoodId.class)
 public class PetPreferablyEatsFood {
 
     @Id
     @Column(name = "id_pet", nullable = false)
-    private int petId;
+    private Integer petId;
 
     @Id
     @Column(name = "id_food", nullable = false)
-    private int foodId;
+    private Integer foodId;
 
     @Column(name = "quantity_a_day", nullable = false)