Changeset 0078d84 for Prototype Application/Paw5/src/main/java/finki/paw5/model/entities/Organisation.java

Timestamp:

03/10/23 21:43:30 (16 months ago)

Author:

SazdovaEkaterina <sazdovaekaterina@…>

Branches:

main

Children:

104185f

Parents:

b46d1f2 (diff), c3278ac (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:

resolve merge conflicts

File:

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

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

@@ -3 +3 @@
 import jakarta.persistence.*;
 import lombok.Data;
+import lombok.RequiredArgsConstructor;
+
+import java.util.List;
 
 @Data
 @Entity
+@RequiredArgsConstructor
 @Table(name = "organisation")
 public class Organisation {
@@ -23 +27 @@
     private String billingInformation;
 
+    @ManyToMany
+    @JoinTable(name = "donor_donates_to_organisation",
+            joinColumns = @JoinColumn(name = "id_organisation"),
+            inverseJoinColumns = @JoinColumn(name = "id_user"))
+    List<Donor> donors;
+
     public Organisation(String name, String email, String billingInformation) {
         this.name = name;
@@ -28 +38 @@
         this.billingInformation = billingInformation;
     }
-
-    public Organisation() {
-    }
 }