Changeset 4a64cf0 for springapp/src/main/java/mk

Timestamp:

07/29/22 21:31:30 (2 years ago)

Author:

unknown <mlviktor23@…>

Branches:

main

Children:

3a44163

Parents:

7cb8c3c

Message:

implemented addOpinion and replyToOpinion functions, reorganized api

Location:

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

Files:

• Controller/PublicController.java (moved) (moved from springapp/src/main/java/mk/profesori/springapp/Controller/MainController.java ) (9 diffs)
• Controller/SecureController.java (added)
• Model/Opinion.java (modified) (1 diff)
• Model/Post.java (modified) (2 diffs)
• Model/_Thread.java (modified) (2 diffs)
• Repository/OpinionRepository.java (added)
• Security/SecurityConfiguration.java (modified) (3 diffs)
• Service/CustomUserDetailsService.java (modified) (1 diff)
• Service/MainService.java (modified) (7 diffs)

springapp/src/main/java/mk/profesori/springapp/Controller/PublicController.java

@@ -20 +20 @@
 
 @RestController
-@CrossOrigin(origins = "http://192.168.0.17:3000")
-public class MainController {
-    
+@RequestMapping("/public")
+@CrossOrigin(origins = { "http://192.168.0.17:3000", "http://192.168.0.24:3000" })
+public class PublicController {
+
     @Autowired
     private MainService mainService;
@@ -29 +30 @@
     public List<Professor> getProfessorsByFaculty(@RequestParam Optional<Long> facultyId) {
 
-        if(!facultyId.isPresent()) return mainService.getAllProfessors(); //ako nema parametar facultyId gi vrakja site profesori
+        if (!facultyId.isPresent())
+            return mainService.getAllProfessors(); // ako nema parametar facultyId gi vrakja site profesori
         return mainService.getProfessorsByFacultyId(facultyId.get());
     }
@@ -35 +37 @@
     @RequestMapping(value = "/professor/{professorId}", method = RequestMethod.GET)
     public Professor getProfessorById(@PathVariable Long professorId) {
-        return mainService.getProfessorById(professorId);   //vrakja profesor spored id
+        return mainService.getProfessorById(professorId); // vrakja profesor spored id
     }
 
@@ -41 +43 @@
     public List<StudyProgramme> getStudyProgrammesByFaculty(@RequestParam Optional<Long> facultyId) {
 
-        if(!facultyId.isPresent()) return mainService.getAllStudyProgrammes(); //ako nema parametar facultyId gi vrakja site studiski programi
+        if (!facultyId.isPresent())
+            return mainService.getAllStudyProgrammes(); // ako nema parametar facultyId gi vrakja site studiski programi
         return mainService.getStudyProgrammesByFacultyId(facultyId.get());
     }
@@ -47 +50 @@
     @RequestMapping(value = "/study_programme/{studyProgrammeId}", method = RequestMethod.GET)
     public StudyProgramme getStudyProgrammeById(@PathVariable Long studyProgrammeId) {
-        return mainService.getStudyProgrammeById(studyProgrammeId);   //vrakja studiska programa spored id
+        return mainService.getStudyProgrammeById(studyProgrammeId); // vrakja studiska programa spored id
     }
 
@@ -53 +56 @@
     public List<Faculty> getFacultiesByUniversity(@RequestParam Optional<Long> universityId) {
 
-        if(!universityId.isPresent()) return mainService.getAllFaculties(); //ako nema parametar universityId gi vrakja site fakulteti
+        if (!universityId.isPresent())
+            return mainService.getAllFaculties(); // ako nema parametar universityId gi vrakja site fakulteti
         return mainService.getFacultiesByUniversityId(universityId.get());
     }
@@ -59 +63 @@
     @RequestMapping(value = "/faculty/{facultyId}", method = RequestMethod.GET)
     public Faculty getFacultyById(@PathVariable Long facultyId) {
-        return mainService.getFacultyById(facultyId); //vrakja fakultet spored id
+        return mainService.getFacultyById(facultyId); // vrakja fakultet spored id
     }
 
@@ -65 +69 @@
     public List<University> getUniversitiesByCity(@RequestParam Optional<Long> cityId) {
 
-        if(!cityId.isPresent()) return mainService.getAllUniversities(); //ako nema parametar cityId gi vrakja site univerziteti
+        if (!cityId.isPresent())
+            return mainService.getAllUniversities(); // ako nema parametar cityId gi vrakja site univerziteti
         return mainService.getUniversitiesByCityId(cityId.get());
     }
@@ -71 +76 @@
     @RequestMapping(value = "/university/{universityId}", method = RequestMethod.GET)
     public University getUniversityById(@PathVariable Long universityId) {
-        return mainService.getUniversityById(universityId); //vrakja univerzitet spored id
+        return mainService.getUniversityById(universityId); // vrakja univerzitet spored id
     }
 
     @RequestMapping(value = "/cities", method = RequestMethod.GET)
     public List<City> getCities() {
-        return mainService.getAllCities();  //gi vrakja site gradovi
+        return mainService.getAllCities(); // gi vrakja site gradovi
     }
 
     @RequestMapping(value = "/city/{cityId}", method = RequestMethod.GET)
     public City getCityById(@PathVariable Long cityId) {
-        return mainService.getCityById(cityId); //vrakja grad spored id
+        return mainService.getCityById(cityId); // vrakja grad spored id
     }
-
 }

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

@@ -9 +9 @@
 import javax.persistence.ManyToOne;
 
+import lombok.NoArgsConstructor;
+
 @Entity
 @DiscriminatorValue("opinion")
+@NoArgsConstructor
 public class Opinion extends Post {
 
     @ManyToOne
-    @JoinColumn(name = "professor_id", nullable = false)
+    @JoinColumn(name = "professor_id")
     private Professor targetProfessor;
 
-    public Opinion(Long postId, String title, String content, CustomUserDetails author, LocalDateTime timePosted,
-            LocalDateTime timeLastEdited, Integer upvoteCount, Integer downvoteCount, Post parent,
-            List<Post> children, Professor targetProfessor) {
-        super(postId, title, content, author, timePosted, timeLastEdited, upvoteCount, downvoteCount, parent, children);
+    // konstruktor so parent (koga e reply)
+    public Opinion(String title, String content, CustomUserDetails author, LocalDateTime timePosted,
+            LocalDateTime timeLastEdited,
+            Integer upvoteCount, Integer downvoteCount, Post parent, List<Post> children, Professor targetProfessor) {
+        super(title, content, author, timePosted, timeLastEdited, upvoteCount, downvoteCount, parent, children);
+        this.targetProfessor = targetProfessor;
+    }
+
+    // konstruktor bez parent (koga NE e reply)
+    public Opinion(String title, String content, CustomUserDetails author, LocalDateTime timePosted,
+            LocalDateTime timeLastEdited,
+            Integer upvoteCount, Integer downvoteCount, List<Post> children, Professor targetProfessor) {
+        super(title, content, author, timePosted, timeLastEdited, upvoteCount, downvoteCount, children);
         this.targetProfessor = targetProfessor;
     }

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

@@ -22 +22 @@
 import com.fasterxml.jackson.annotation.ObjectIdGenerators;
 
+import lombok.NoArgsConstructor;
+
 @Entity(name = "post")
 @Inheritance(strategy = InheritanceType.SINGLE_TABLE)
 @DiscriminatorColumn(name = "post_type", discriminatorType = DiscriminatorType.STRING)
 @JsonIdentityInfo(generator = ObjectIdGenerators.PropertyGenerator.class, property = "postId")
+@NoArgsConstructor
 public class Post {
 
@@ -143 +146 @@
     }
 
-    public Post(Long postId, String title, String content, CustomUserDetails author, LocalDateTime timePosted,
-            LocalDateTime timeLastEdited, Integer upvoteCount, Integer downvoteCount, Post parent,
-            List<Post> children) {
-        this.postId = postId;
+    // konstruktor so parent (koga e reply)
+    public Post(String title, String content, CustomUserDetails author, LocalDateTime timePosted,
+            LocalDateTime timeLastEdited,
+            Integer upvoteCount, Integer downvoteCount, Post parent, List<Post> children) {
         this.title = title;
         this.content = content;
         this.author = author;
-        this.timePosted = timePosted;
-        this.timeLastEdited = timeLastEdited;
-        this.upvoteCount = upvoteCount;
-        this.downvoteCount = downvoteCount;
+        this.timePosted = LocalDateTime.now();
+        this.timeLastEdited = LocalDateTime.now();
+        this.upvoteCount = 0;
+        this.downvoteCount = 0;
         this.parent = parent;
-        this.children = children;
+        this.children = new ArrayList<>();
+    }
+
+    // konstruktor bez parent (koga NE e reply)
+    public Post(String title, String content, CustomUserDetails author, LocalDateTime timePosted,
+            LocalDateTime timeLastEdited,
+            Integer upvoteCount, Integer downvoteCount, List<Post> children) {
+        this.title = title;
+        this.content = content;
+        this.author = author;
+        this.timePosted = LocalDateTime.now();
+        this.timeLastEdited = LocalDateTime.now();
+        this.upvoteCount = 0;
+        this.downvoteCount = 0;
+        this.parent = null;
+        this.children = new ArrayList<>();
     }
 

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;
@@ -28 +27 @@
     private Subject targetSubject;
 
-    public _Thread(Long postId, String title, String content, CustomUserDetails author, LocalDateTime timePosted,
-            LocalDateTime timeLastEdited, Integer upvoteCount, Integer downvoteCount, Post parent,
-            List<Post> children, List<String> tags, Section parentSection, Subject targetSubject) {
-        super(postId, title, content, author, timePosted, timeLastEdited, upvoteCount, downvoteCount, parent, children);
-        this.tags = tags;
-        this.parentSection = parentSection;
-        this.targetSubject = targetSubject;
-    }
+    // TODO
+    /*
+     * 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;
+     * }
+     */
 
     // getters

springapp/src/main/java/mk/profesori/springapp/Security/SecurityConfiguration.java

@@ -12 +12 @@
 
 import lombok.RequiredArgsConstructor;
-import mk.profesori.springapp.Service.CustomUserDetailsService;
 
 @Configuration
@@ -18 +17 @@
 @EnableWebSecurity
 public class SecurityConfiguration {
-
-    private final CustomUserDetailsService customUserDetailsService;
 
     @Bean
@@ -35 +32 @@
     protected SecurityFilterChain filterChain(HttpSecurity http) throws Exception {
         http
+                .httpBasic() // neenkriptirani credentials osven ako ne e preky https/tls
+                .and()
                 .cors()
                 .and()
                 .csrf().disable() // PRIVREMENO
                 .authorizeRequests()
-                .antMatchers("/registration/**")
-                .permitAll()
-                .anyRequest()
-                .permitAll().and() // bese .authenticated()
+                .antMatchers("/secure/**").hasAnyAuthority("REGULAR", "MODERATOR")
+                .antMatchers("/public/**").permitAll()
+                .antMatchers("/registration/**").permitAll()
+                .and()
                 .formLogin();
 

springapp/src/main/java/mk/profesori/springapp/Service/CustomUserDetailsService.java

@@ -64 +64 @@
         return userRepository.enableUser(email);
     }
-    
 }

springapp/src/main/java/mk/profesori/springapp/Service/MainService.java

@@ -9 +9 @@
 import mk.profesori.springapp.Repository.CityRepository;
 import mk.profesori.springapp.Repository.FacultyRepository;
+import mk.profesori.springapp.Repository.OpinionRepository;
 import mk.profesori.springapp.Repository.ProfessorRepository;
 import mk.profesori.springapp.Repository.StudyProgrammeRepository;
 import mk.profesori.springapp.Repository.UniversityRepository;
 import mk.profesori.springapp.Model.City;
+import mk.profesori.springapp.Model.CustomUserDetails;
 import mk.profesori.springapp.Model.Faculty;
+import mk.profesori.springapp.Model.Opinion;
 import mk.profesori.springapp.Model.Professor;
 import mk.profesori.springapp.Model.StudyProgramme;
 import mk.profesori.springapp.Model.University;
 
-@Service        
+@Service
 public class MainService {
-    
+
     @Autowired
     private ProfessorRepository professorRepository;
@@ -31 +34 @@
     @Autowired
     private CityRepository cityRepository;
+    @Autowired
+    private OpinionRepository opinionRepository;
 
     public List<Professor> getAllProfessors() {
@@ -45 +50 @@
 
     public List<Professor> getProfessorsByFacultyId(Long facultyId) {
-        
+
         Faculty faculty = facultyRepository.findByFacultyId(facultyId);
 
@@ -66 +71 @@
 
     public List<StudyProgramme> getStudyProgrammesByFacultyId(Long facultyId) {
-        
+
         Faculty faculty = facultyRepository.findByFacultyId(facultyId);
 
@@ -85 +90 @@
 
     public List<Faculty> getFacultiesByUniversityId(Long universityId) {
-        
+
         University university = universityRepository.findByUniversityId(universityId);
 
@@ -104 +109 @@
 
     public List<University> getUniversitiesByCityId(Long cityId) {
-        
+
         City city = cityRepository.findByCityId(cityId);
 
@@ -121 +126 @@
         return cityRepository.findByCityId(id);
     }
+
+    public void addOpinion(String title, String content, Long professorId, CustomUserDetails currentUser) {
+
+        Professor targetProfessor = professorRepository.findByProfessorId(professorId);
+
+        Opinion opinionToAdd = new Opinion(title, content, currentUser, null, null,
+                null, null, null, targetProfessor);
+
+        opinionRepository.save(opinionToAdd);
+    }
+
+    public void replyToOpinion(String content, Long professorId, Long postId, CustomUserDetails currentUser) {
+
+        Professor targetProfessor = professorRepository.findByProfessorId(professorId);
+        Opinion targetOpinion = opinionRepository.findByPostId(postId);
+
+        Opinion opinionToAdd = new Opinion(null, content, currentUser, null, null,
+                null, null, targetOpinion, null, targetProfessor);
+        opinionRepository.save(opinionToAdd);
+
+        targetOpinion.getChildren().add(opinionToAdd);
+        opinionRepository.save(targetOpinion);
+    }
 }