Changeset 0ae838b for springapp/src/main

Timestamp:

07/31/22 17:13:57 (2 years ago)

Author:

unknown <mlviktor23@…>

Branches:

main

Children:

a4b5062

Parents:

a6dcc46

Message:

created Search service in springapp

Location:

springapp/src/main

Files:

• java/mk/profesori/springapp/Controller/PublicController.java (modified) (4 diffs)
• java/mk/profesori/springapp/Repository/ProfessorRepository.java (modified) (2 diffs)
• java/mk/profesori/springapp/Service/Search/ProfessorSpecification.java (added)
• java/mk/profesori/springapp/Service/Search/ProfessorSpecificationsBuilder.java (added)
• java/mk/profesori/springapp/Service/Search/SearchCriteria.java (added)
• resources/application.properties (modified) (1 diff)

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;
@@ -10 +13 @@
 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;
 
@@ -17 +21 @@
 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
@@ -27 +33 @@
     private MainService mainService;
 
+    @Autowired
+    private ProfessorRepository professorRepository;
+
+    /*
+     * @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());
+     * }
+     */
+
     @RequestMapping(value = "/professors", method = RequestMethod.GET)
-    public List<Professor> getProfessorsByFaculty(@RequestParam Optional<Long> facultyId) {
+    @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));
+        }
 
-        if (!facultyId.isPresent())
-            return mainService.getAllProfessors(); // ako nema parametar facultyId gi vrakja site profesori
-        return mainService.getProfessorsByFacultyId(facultyId.get());
+        Specification<Professor> spec = builder.build();
+        return professorRepository.findAll(spec);
     }
 

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

@@ -3 +3 @@
 import java.util.List;
 
+import org.springframework.data.jpa.repository.JpaSpecificationExecutor;
 import org.springframework.data.repository.CrudRepository;
 import org.springframework.stereotype.Repository;
@@ -10 +11 @@
 
 @Repository
-public interface ProfessorRepository extends CrudRepository<Professor, Long>{
-    
+public interface ProfessorRepository extends CrudRepository<Professor, Long>, JpaSpecificationExecutor<Professor> {
+
     public List<Professor> findAll();
+
     public Professor findByProfessorId(Long id);
+
     public List<Professor> findByFaculty(Faculty faculty);
 }

springapp/src/main/resources/application.properties

@@ -1 +1 @@
 spring.datasource.url=jdbc:postgresql://localhost:5432/profesori.mk
+spring.datasource.connectionProperties=useUnicode=true;characterEncoding=utf-8;
 spring.datasource.username=postgres
 spring.datasource.password=1win7337