Changeset 3f5e485 for Prototype Application/Paw5/src/main/java/finki/paw5/model/entities/Pet.java

Timestamp:

02/13/23 14:34:36 (17 months ago)

Author:

SazdovaEkaterina <sazdovaekaterina@…>

Branches:

main

Children:

a762b3a

Parents:

a2060cb (diff), 04e4f54 (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 create-post and login branches

resolved merge conflicts

File:

• Prototype Application/Paw5/src/main/java/finki/paw5/model/entities/Pet.java (modified) (1 diff)

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

@@ -43 +43 @@
 
     @Column(name = "id_adoption")
-    private int adoptionId;
+    private Integer adoptionId;
 
     @Column(name = "id_shelter")
-    private int shelterId;
+    private Integer shelterId;
 
-    public Pet(String imageUrl, AgeGroup ageGroup, Size size, String breed, String name, Species species, Gender gender, boolean canBeFostered, int adoptionId, int shelterId) {
+    public Pet(String imageUrl, AgeGroup ageGroup, Size size, String breed, String name, Species species, Gender gender, boolean canBeFostered, Integer adoptionId, Integer shelterId) {
         this.imageUrl = imageUrl;
         this.ageGroup = ageGroup;