Changeset a4b5062

Timestamp:

07/31/22 20:09:54 (2 years ago)

Author:

unknown <mlviktor23@…>

Branches:

main

Children:

080a3f3, 74b8c52

Parents:

0ae838b

Message:

changed search implementation in springapp

Location:

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

Files:

• Controller/PublicController.java (modified) (4 diffs)
• Repository/ProfessorRepository.java (modified) (1 diff)
• Service/MainService.java (modified) (1 diff)
• Service/Search/ProfessorSpecification.java (deleted)
• Service/Search/ProfessorSpecificationsBuilder.java (deleted)
• Service/Search/SearchCriteria.java (deleted)

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

@@ -3 +3 @@
 import java.util.List;
 import java.util.Optional;
-import java.util.regex.Matcher;
-import java.util.regex.Pattern;
 
 import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.data.jpa.domain.Specification;
 import org.springframework.web.bind.annotation.CrossOrigin;
 import org.springframework.web.bind.annotation.PathVariable;
@@ -13 +10 @@
 import org.springframework.web.bind.annotation.RequestMethod;
 import org.springframework.web.bind.annotation.RequestParam;
-import org.springframework.web.bind.annotation.ResponseBody;
 import org.springframework.web.bind.annotation.RestController;
 
@@ -21 +17 @@
 import mk.profesori.springapp.Model.StudyProgramme;
 import mk.profesori.springapp.Model.University;
-import mk.profesori.springapp.Repository.ProfessorRepository;
 import mk.profesori.springapp.Service.MainService;
-import mk.profesori.springapp.Service.Search.ProfessorSpecificationsBuilder;
 
 @RestController
@@ -33 +27 @@
     private MainService mainService;
 
-    @Autowired
-    private ProfessorRepository professorRepository;
+    @RequestMapping(value = "/professors", method = RequestMethod.GET)
+    public List<Professor> getProfessorsByFaculty(@RequestParam Optional<Long> facultyId) {
 
-    /*
-     * @RequestMapping(value = "/professors", method = RequestMethod.GET)
-     * public List<Professor> getProfessorsByFaculty(@RequestParam Optional<Long>
-     * facultyId) {
-     * 
-     * if (!facultyId.isPresent())
-     * return mainService.getAllProfessors(); // ako nema parametar facultyId gi
-     * vrakja site profesori
-     * return mainService.getProfessorsByFacultyId(facultyId.get());
-     * }
-     */
+        if (!facultyId.isPresent())
+            return mainService.getAllProfessors(); // ako nema parametar facultyId gi vrakja site profesori
 
-    @RequestMapping(value = "/professors", method = RequestMethod.GET)
-    @ResponseBody
-    public List<Professor> search(@RequestParam(value = "search") String search) {
-        ProfessorSpecificationsBuilder builder = new ProfessorSpecificationsBuilder();
-        Pattern pattern = Pattern.compile("(\\w+?)(:|<|>)(\\w+?),", Pattern.UNICODE_CHARACTER_CLASS);
-        Matcher matcher = pattern.matcher(search + ",");
-        while (matcher.find()) {
-            builder.with(matcher.group(1), matcher.group(2), matcher.group(3));
-        }
+        return mainService.getProfessorsByFacultyId(facultyId.get());
+    }
 
-        Specification<Professor> spec = builder.build();
-        return professorRepository.findAll(spec);
+    @RequestMapping(value = "/professors/nameContains/{contained}", method = RequestMethod.GET)
+    public List<Professor> getProfessorsByNameContains(@PathVariable String contained) {
+        return mainService.getProfessorsByNameContains(contained); // vrakja profesori sto sodrzat "contained" vo
+                                                                   // professorName
     }
 

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

@@ -18 +18 @@
 
     public List<Professor> findByFaculty(Faculty faculty);
+
+    public List<Professor> findByProfessorNameContainingIgnoreCase(String name);
 }

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

@@ -55 +55 @@
         List<Professor> list = new ArrayList<>();
         professorRepository.findByFaculty(faculty).forEach(list::add);
+        return list;
+    }
+
+    public List<Professor> getProfessorsByNameContains(String contained) {
+        List<Professor> list = new ArrayList<>();
+        professorRepository.findByProfessorNameContainingIgnoreCase(contained).forEach(list::add);
         return list;
     }