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

Timestamp:

02/05/23 17:43:38 (17 months ago)

Author:

Filip Chorbeski <86695898+FilipChorbeski@…>

Branches:

main

Children:

4d78603

Parents:

8ae6217 (diff), d546868 (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 'main' into adopting-a-pet

File:

• Prototype Application/Paw5/src/main/java/finki/paw5/model/relations/DonorDonatesToOrganisation.java (modified) (2 diffs)

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) {