Changeset 0e62f4d

Timestamp:

07/27/22 22:28:59 (2 years ago)

Author:

unknown <mlviktor23@…>

Branches:

main

Children:

7cb8c3c

Parents:

b7ec74e

Message:

updated model (added Post, Opinion, Thread and Section entities)

Location:

springapp/src/main/java/mk/profesori/springapp/Model

Files:

• CustomUserDetails.java (modified) (4 diffs)
• Opinion.java (added)
• Post.java (added)
• Professor.java (modified) (4 diffs)
• Section.java (added)
• StudyProgramme.java (modified) (3 diffs)
• Subject.java (modified) (4 diffs)
• _Thread.java (added)

springapp/src/main/java/mk/profesori/springapp/Model/CustomUserDetails.java

@@ -1 +1 @@
 package mk.profesori.springapp.Model;
 
+import java.util.ArrayList;
 import java.util.Collection;
 import java.util.Collections;
 import java.util.HashSet;
+import java.util.List;
 import java.util.Set;
 
@@ -19 +21 @@
 import org.springframework.security.core.authority.SimpleGrantedAuthority;
 import org.springframework.security.core.userdetails.UserDetails;
+
+import com.fasterxml.jackson.annotation.JsonManagedReference;
 
 import lombok.EqualsAndHashCode;
@@ -46 +50 @@
     @OneToMany(mappedBy = "customUserDetails", cascade = CascadeType.ALL)
     private Set<ConfirmationToken> confirmationTokens = new HashSet<>();
+    @OneToMany(mappedBy = "author", cascade = CascadeType.ALL)
+    private List<Post> authoredPosts = new ArrayList<>();
 
     public CustomUserDetails(String fullName, String username, String email, String password, UserRole userRole) {
@@ -90 +96 @@
         return enabled;
     }
+
+    @JsonManagedReference
+    List<Post> getAuthoredPosts() {
+        return this.authoredPosts;
+    }
     
 }

springapp/src/main/java/mk/profesori/springapp/Model/Professor.java

@@ -1 +1 @@
 package mk.profesori.springapp.Model;
 
+import java.util.ArrayList;
 import java.util.HashSet;
+import java.util.List;
 import java.util.Set;
 
+import javax.persistence.CascadeType;
 import javax.persistence.Column;
 import javax.persistence.Entity;
@@ -15 +18 @@
 
 import com.fasterxml.jackson.annotation.JsonBackReference;
+import com.fasterxml.jackson.annotation.JsonManagedReference;
 
 @Entity
@@ -32 +36 @@
     private Faculty faculty;
 
+    @OneToMany(mappedBy = "targetProfessor", cascade = CascadeType.ALL)
+    private List<Opinion> relatedOpinions = new ArrayList<Opinion>();
+
     //getters
     public Long getProfessorId() {
@@ -45 +52 @@
         return faculty;
     }
+
+    @JsonManagedReference
+    public List<Opinion> getRelatedOpinions() {
+        return relatedOpinions;
+    }
 }

springapp/src/main/java/mk/profesori/springapp/Model/StudyProgramme.java

@@ -12 +12 @@
 import javax.persistence.ManyToOne;
 import javax.persistence.OneToMany;
+import javax.persistence.OneToOne;
 import javax.persistence.Table;
 
@@ -39 +40 @@
     private Set<Subject> subjects = new HashSet<>();
 
+    @OneToOne(mappedBy = "relatedStudyProgramme")
+    private Section relatedSection;
+
     //getters
     public Long getStudyProgrammeId() {
@@ -61 +65 @@
         return subjects;
     }
+
+    @JsonManagedReference
+    public Section getRelatedSection() {
+        return relatedSection;
+    }
 }

springapp/src/main/java/mk/profesori/springapp/Model/Subject.java

@@ -1 +1 @@
 package mk.profesori.springapp.Model;
 
+import java.util.ArrayList;
 import java.util.HashSet;
+import java.util.List;
 import java.util.Set;
 
+import javax.persistence.CascadeType;
 import javax.persistence.Column;
 import javax.persistence.Entity;
@@ -15 +18 @@
 
 import com.fasterxml.jackson.annotation.JsonBackReference;
+import com.fasterxml.jackson.annotation.JsonManagedReference;
 
 @Entity
@@ -32 +36 @@
     private StudyProgramme studyProgramme;
 
+    @OneToMany(mappedBy = "targetSubject", cascade = CascadeType.ALL)
+    private List<_Thread> threads = new ArrayList<>();
+
     //getters
     public Long getSubjectId() {
@@ -45 +52 @@
         return studyProgramme;
     }
+
+    @JsonManagedReference
+    public List<_Thread> getThreads() {
+        return threads;
+    }
     
 }