Changeset 6c1d611 for springapp/src/main/java/mk

Timestamp:

07/26/22 23:09:04 (2 years ago)

Author:

unknown <mlviktor23@…>

Branches:

main

Children:

b7ec74e

Parents:

9506ca8

Message:

added basic a&a + acc confirmation email sender service

Location:

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

Files:

• Controller/MainController.java (modified) (5 diffs)
• Controller/RegistrationController.java (added)
• Model/ConfirmationToken.java (added)
• Model/CustomUserDetails.java (added)
• Model/RegistrationRequest.java (added)
• Model/StudyProgramme.java (modified) (2 diffs)
• Model/UserRole.java (added)
• Repository/CityRepository.java (modified) (1 diff)
• Repository/ConfirmationTokenRepository.java (added)
• Repository/FacultyRepository.java (modified) (1 diff)
• Repository/ProfessorRepository.java (modified) (1 diff)
• Repository/StudyProgrammeRepository.java (added)
• Repository/UniversityRepository.java (modified) (2 diffs)
• Repository/UserRepository.java (added)
• Security/SecurityConfiguration.java (added)
• Service/ConfirmationTokenService.java (added)
• Service/CustomUserDetailsService.java (added)
• Service/EmailSender.java (added)
• Service/EmailService.java (added)
• Service/EmailValidator.java (added)
• Service/MainService.java (modified) (3 diffs)
• Service/PasswordValidator.java (added)
• Service/RegistrationService.java (added)
• Service/UsernameValidator.java (added)

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

@@ -14 +14 @@
 import mk.profesori.springapp.Model.Faculty;
 import mk.profesori.springapp.Model.Professor;
+import mk.profesori.springapp.Model.StudyProgramme;
 import mk.profesori.springapp.Model.University;
 import mk.profesori.springapp.Service.MainService;
@@ -32 +33 @@
     @RequestMapping(value = "/professor/{professorId}", method = RequestMethod.GET)
     public Professor getProfessorById(@PathVariable Long professorId) {
-        return mainService.getProfessorById(professorId);
+        return mainService.getProfessorById(professorId);   //vrakja profesor spored id
+    }
+
+    @RequestMapping(value = "/study_programmes", method = RequestMethod.GET)
+    public List<StudyProgramme> getStudyProgrammesByFaculty(@RequestParam Optional<Long> facultyId) {
+
+        if(!facultyId.isPresent()) return mainService.getAllStudyProgrammes(); //ako nema parametar facultyId gi vrakja site studiski programi
+        return mainService.getStudyProgrammesByFacultyId(facultyId.get());
+    }
+
+    @RequestMapping(value = "/study_programme/{studyProgrammeId}", method = RequestMethod.GET)
+    public StudyProgramme getStudyProgrammeById(@PathVariable Long studyProgrammeId) {
+        return mainService.getStudyProgrammeById(studyProgrammeId);   //vrakja studiska programa spored id
     }
 
@@ -44 +57 @@
     @RequestMapping(value = "/faculty/{facultyId}", method = RequestMethod.GET)
     public Faculty getFacultyById(@PathVariable Long facultyId) {
-        return mainService.getFacultyById(facultyId);
+        return mainService.getFacultyById(facultyId); //vrakja fakultet spored id
     }
 
@@ -56 +69 @@
     @RequestMapping(value = "/university/{universityId}", method = RequestMethod.GET)
     public University getUniversityById(@PathVariable Long universityId) {
-        return mainService.getUniversityById(universityId);
+        return mainService.getUniversityById(universityId); //vrakja univerzitet spored id
     }
 
@@ -66 +79 @@
     @RequestMapping(value = "/city/{cityId}", method = RequestMethod.GET)
     public City getCityById(@PathVariable Long cityId) {
-        return mainService.getCityById(cityId);
+        return mainService.getCityById(cityId); //vrakja grad spored id
     }
 
-    
 }

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

@@ -29 +29 @@
     private String studyProgrammeName;
 
+    @Column(name = "cycle")
+    private int cycle;
+
     @ManyToOne
     @JoinColumn(name = "faculty_id")
@@ -45 +48 @@
     }
 
+    public int getCycle() {
+        return cycle;
+    }
+
     @JsonBackReference
     public Faculty getFaculty() {

springapp/src/main/java/mk/profesori/springapp/Repository/CityRepository.java

@@ -4 +4 @@
 
 import org.springframework.data.repository.CrudRepository;
+import org.springframework.stereotype.Repository;
 
 import mk.profesori.springapp.Model.City;
 
+@Repository
 public interface CityRepository extends CrudRepository<City, Long>{
 

springapp/src/main/java/mk/profesori/springapp/Repository/FacultyRepository.java

@@ -4 +4 @@
 
 import org.springframework.data.repository.CrudRepository;
+import org.springframework.stereotype.Repository;
 
 import mk.profesori.springapp.Model.Faculty;
 import mk.profesori.springapp.Model.University;
 
+@Repository
 public interface FacultyRepository extends CrudRepository<Faculty, Long>{
 

springapp/src/main/java/mk/profesori/springapp/Repository/ProfessorRepository.java

@@ -4 +4 @@
 
 import org.springframework.data.repository.CrudRepository;
+import org.springframework.stereotype.Repository;
 
 import mk.profesori.springapp.Model.Faculty;
 import mk.profesori.springapp.Model.Professor;
 
+@Repository
 public interface ProfessorRepository extends CrudRepository<Professor, Long>{
     

springapp/src/main/java/mk/profesori/springapp/Repository/UniversityRepository.java

@@ -4 +4 @@
 
 import org.springframework.data.repository.CrudRepository;
+import org.springframework.stereotype.Repository;
 
 import mk.profesori.springapp.Model.City;
@@ -9 +10 @@
 import mk.profesori.springapp.Model.University;
 
+@Repository
 public interface UniversityRepository extends CrudRepository<University, Long>{
 

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

@@ -10 +10 @@
 import mk.profesori.springapp.Repository.FacultyRepository;
 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.Faculty;
 import mk.profesori.springapp.Model.Professor;
+import mk.profesori.springapp.Model.StudyProgramme;
 import mk.profesori.springapp.Model.University;
 
@@ -21 +23 @@
     @Autowired
     private ProfessorRepository professorRepository;
+    @Autowired
+    private StudyProgrammeRepository studyProgrammeRepository;
     @Autowired
     private FacultyRepository facultyRepository;
@@ -46 +50 @@
         List<Professor> list = new ArrayList<>();
         professorRepository.findByFaculty(faculty).forEach(list::add);
+        return list;
+    }
+
+    public List<StudyProgramme> getAllStudyProgrammes() {
+
+        List<StudyProgramme> list = new ArrayList<>();
+        studyProgrammeRepository.findAll().forEach(list::add);
+        return list;
+    }
+
+    public StudyProgramme getStudyProgrammeById(Long id) {
+
+        return studyProgrammeRepository.findByStudyProgrammeId(id);
+    }
+
+    public List<StudyProgramme> getStudyProgrammesByFacultyId(Long facultyId) {
+        
+        Faculty faculty = facultyRepository.findByFacultyId(facultyId);
+
+        List<StudyProgramme> list = new ArrayList<>();
+        studyProgrammeRepository.findByFaculty(faculty).forEach(list::add);
         return list;
     }