Merge pull request #32 from picksitquick/main

Updated Models

src/main/java/com/gamedoora/model/dao/StudioUserRequest.java → src/main/java/com/gamedoora/model/dao/JoinRequest.java

@@ -22,8 +22,8 @@
 @Entity
 @AllArgsConstructor
 @NoArgsConstructor
-@Table(name = "studio_user_requests")
-public class StudioUserRequest extends Audit implements Serializable {
+@Table(name = "join_request")
+public class JoinRequest extends Audit implements Serializable {
 
     @Serial
     private static final long serialVersionUID = 1L;
@@ -47,4 +47,6 @@ public class StudioUserRequest extends Audit implements Serializable {
     @Column(name = "status")
     private String status;
 
+    // rename it as JoinRequest
+
 }

src/main/java/com/gamedoora/model/dao/Notifications.java

@@ -10,9 +10,11 @@
 import javax.persistence.Entity;
 import javax.persistence.GeneratedValue;
 import javax.persistence.Id;
+import javax.persistence.ManyToMany;
 import javax.persistence.Table;
 import java.io.Serial;
 import java.io.Serializable;
+import java.util.Set;
 
 
 @Getter
@@ -53,6 +55,9 @@ public class Notifications extends Audit implements Serializable {
     @Column(name = "is_notification" , columnDefinition = "BOOLEAN NOT NULL")
     private boolean isNotification;
 
+    @ManyToMany(mappedBy = "notifications")
+    Set<Users> usersSet;
+
     /* ColumnDefinition syntax has been updated, using nullable=false doesn't seem to work consistently.*/
 
 }

src/main/java/com/gamedoora/model/dao/ProjectUser.java

@@ -34,12 +34,12 @@ public class ProjectUser implements Serializable {
     @GeneratedValue(strategy = GenerationType.IDENTITY)
     private long id;
 
-//    @ManyToOne
-//    @JoinColumn(name = "project_id")
-//    Projects projects;
-
     @ManyToOne
     @JoinColumn(name = "user_id")
     Users users;
 
+//    @ManyToOne
+//    @JoinColumn(name = "project_id")
+//    Projects projects;
+
 }

src/main/java/com/gamedoora/model/dao/Projects.java

@@ -15,6 +15,7 @@
 import javax.persistence.JoinColumn;
 import javax.persistence.JoinTable;
 import javax.persistence.ManyToMany;
+import javax.persistence.OneToMany;
 import javax.persistence.Table;
 import java.io.Serial;
 import java.io.Serializable;
@@ -46,7 +47,8 @@ public class Projects extends Audit implements Serializable {
     @Column(name = "worked_for")
     private String workedFor;
 
-    @ManyToMany(cascade = CascadeType.ALL, fetch = FetchType.EAGER)
+//    @ManyToMany(cascade = CascadeType.ALL, fetch = FetchType.EAGER)
+    @OneToMany
     @JoinTable(name = "project_user", joinColumns = @JoinColumn(name = "user_id"), inverseJoinColumns = @JoinColumn(name = "project_id"))
     Set<Users> userSet;
 

src/main/java/com/gamedoora/model/dao/Skills.java

@@ -2,7 +2,9 @@
 
 import lombok.AllArgsConstructor;
 import lombok.Builder;
+import lombok.Getter;
 import lombok.NoArgsConstructor;
+import lombok.Setter;
 
 import javax.persistence.Basic;
 import javax.persistence.CascadeType;
@@ -19,6 +21,8 @@
 import java.util.Set;
 
 @Builder
+@Getter
+@Setter
 @Entity
 @AllArgsConstructor
 @NoArgsConstructor
@@ -47,7 +51,7 @@ public class Skills extends Audit implements Serializable {
 
 	@ManyToMany(cascade = CascadeType.ALL, fetch = FetchType.EAGER)
 	@JoinTable(name = "skills_sources", joinColumns = @JoinColumn(name = "skill_id"), inverseJoinColumns = @JoinColumn(name = "source_id"))
-	Set<Sources> skillsSources;
+	Set<Sources> sources;
 
 	@ManyToMany(cascade = CascadeType.ALL, fetch = FetchType.EAGER)
 	@JoinTable(name = "roles_skills", joinColumns = @JoinColumn(name = "role_id"), inverseJoinColumns = @JoinColumn(name = "skill_id"))

src/main/java/com/gamedoora/model/dao/Studios.java

@@ -10,9 +10,14 @@
 import javax.persistence.Entity;
 import javax.persistence.GeneratedValue;
 import javax.persistence.Id;
+import javax.persistence.JoinColumn;
+import javax.persistence.JoinTable;
+import javax.persistence.ManyToMany;
+import javax.persistence.ManyToOne;
 import javax.persistence.Table;
 import java.io.Serial;
 import java.io.Serializable;
+import java.util.Set;
 
 @Getter
 @Setter
@@ -48,4 +53,9 @@ public class Studios extends Audit implements Serializable {
 
     @Column(name = "registration" , columnDefinition = "BOOLEAN DEFAULT FALSE")
     private boolean registration;
+
+    @ManyToMany
+    @JoinTable(name = "studio_user_requests", joinColumns = @JoinColumn(name = "user_id"), inverseJoinColumns = @JoinColumn(name = "studio_id"))
+    Set<Users> usersSet;
+    // add mapping b/t user and studio Set<Users> user;
 }