From 0d6fce8c4850cd2bd4f711e8ee09a701ab7b002c Mon Sep 17 00:00:00 2001
From: Viktoria <vika.snezhok@gmail.com>
Date: Tue, 30 Aug 2022 10:34:29 +0200
Subject: [PATCH] ViSnezh

---
 src/main/java/site/easystartup/web/domain/User.java       | 6 ++++++
 .../easystartup/web/project/domain/model/Participant.java | 8 ++++++--
 2 files changed, 12 insertions(+), 2 deletions(-)

diff --git a/src/main/java/site/easystartup/web/domain/User.java b/src/main/java/site/easystartup/web/domain/User.java
index 91e252a..182f51c 100644
--- a/src/main/java/site/easystartup/web/domain/User.java
+++ b/src/main/java/site/easystartup/web/domain/User.java
@@ -2,8 +2,10 @@ package site.easystartup.web.domain;
 
 import lombok.*;
 import org.hibernate.Hibernate;
+import site.easystartup.web.project.domain.model.Participant;
 
 import javax.persistence.*;
+import java.util.List;
 import java.util.Objects;
 import java.util.Set;
 
@@ -16,6 +18,7 @@ import java.util.Set;
 public class User {
     @Id
     @GeneratedValue(strategy = GenerationType.AUTO)
+    @Column(name = "user_id")
     private long id;
     private String username;
     private String password;
@@ -37,6 +40,9 @@ public class User {
     @CollectionTable(name = "user_projects", joinColumns = @JoinColumn(name = "user_id"))
     private Set<Long> projects;
 
+    @ManyToMany(mappedBy = "requests")
+    private List<Participant> requests;
+
     @ElementCollection(targetClass = Role.class, fetch = FetchType.EAGER)
     @CollectionTable(name = "user_role", joinColumns = @JoinColumn(name = "user_id"))
     @Enumerated(EnumType.STRING)
diff --git a/src/main/java/site/easystartup/web/project/domain/model/Participant.java b/src/main/java/site/easystartup/web/project/domain/model/Participant.java
index 9c20657..221af93 100644
--- a/src/main/java/site/easystartup/web/project/domain/model/Participant.java
+++ b/src/main/java/site/easystartup/web/project/domain/model/Participant.java
@@ -5,6 +5,7 @@ import site.easystartup.web.domain.User;
 
 import javax.persistence.*;
 import javax.validation.constraints.NotNull;
+import java.util.List;
 import java.util.Set;
 
 @Data
@@ -30,6 +31,9 @@ public class Participant {
     @JoinColumn(name = "user_id")
     private User user;
 
-    @OneToMany
-    private Set<User> requests;
+    @ManyToMany
+    @JoinTable(name = "user_request",
+    joinColumns = @JoinColumn(name = "participant_id"),
+    inverseJoinColumns = @JoinColumn(name = "user_id"))
+    private List<User> requests;
 }