Changeset 8d83180 for springapp/src/main/java

Timestamp:

10/11/22 15:41:16 (22 months ago)

Author:

unknown <mlviktor23@…>

Branches:

main

Children:

c68150f

Parents:

cae16b5

Message:

forums/page nav

Location:

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

Files:

• StudyProgramme.java (modified) (1 diff)
• _Thread.java (modified) (3 diffs)

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

@@ -16 +16 @@
 
 import com.fasterxml.jackson.annotation.JsonIdentityInfo;
-import com.fasterxml.jackson.annotation.ObjectIdGenerators;
+import com.voodoodyne.jackson.jsog.JSOGGenerator;
 
 @Entity
 @Table(name = "study_programme")
-@JsonIdentityInfo(generator = ObjectIdGenerators.PropertyGenerator.class, property = "studyProgrammeId")
+@JsonIdentityInfo(generator = JSOGGenerator.class)
 public class StudyProgramme {
 

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

@@ -1 +1 @@
 package mk.profesori.springapp.Model;
 
+import java.time.LocalDateTime;
 import java.util.ArrayList;
 import java.util.List;
@@ -15 +16 @@
 public class _Thread extends Post {
 
-    @Column(name = "tags")
+    @Column(name = "tags") // unused
     @ElementCollection
     private List<String> tags = new ArrayList<>();
@@ -27 +28 @@
     private Subject targetSubject;
 
-    // TODO threadovi
-    /*
-     * public _Thread(String title, String content, List<String> tags, Section
-     * parentSection, Subject targetSubject) {
-     * super(title, content);
-     * this.tags = tags;
-     * this.parentSection = parentSection;
-     * this.targetSubject = targetSubject;
-     * }
-     */
+    // konstruktor so parent (koga e reply)
+    public _Thread(String title, String content, CustomUserDetails author, LocalDateTime timePosted,
+            LocalDateTime timeLastEdited,
+            Post parent, List<Post> children, Section parentSection, Subject targetSubject) {
+        super(title, content, author, timePosted, timeLastEdited, parent, children);
+        this.parentSection = parentSection;
+        this.targetSubject = targetSubject;
+    }
+
+    // konstruktor bez parent (koga NE e reply)
+    public _Thread(String title, String content, CustomUserDetails author, LocalDateTime timePosted,
+            LocalDateTime timeLastEdited, List<Post> children, Section parentSection, Subject targetSubject) {
+        super(title, content, author, timePosted, timeLastEdited, children);
+        this.parentSection = parentSection;
+        this.targetSubject = targetSubject;
+    }
 
     // getters