Update add filter for Subject by TeacherID

src/main/java/cz/cvut/fit/tjv/seidlpet/semestralka/business/SubjectService.java

@@ -3,6 +3,9 @@ package cz.cvut.fit.tjv.seidlpet.semestralka.business;
 import cz.cvut.fit.tjv.seidlpet.semestralka.data.dto.SubjectCreateDTO;
 import cz.cvut.fit.tjv.seidlpet.semestralka.data.entity.Subject;
+import java.util.List;
+
 public interface SubjectService extends CrudService<Subject> {
     Subject create(SubjectCreateDTO subject);
+    List<Subject> findAllByTeacherId(int teacherId);
 }

src/main/java/cz/cvut/fit/tjv/seidlpet/semestralka/business/SubjectServiceImpl.java

@@ -42,6 +42,10 @@ public class SubjectServiceImpl implements SubjectService {
         return subjectRepository.findAll();
     }
+    public List<Subject> findAllByTeacherId(int teacherId) {
+        return subjectRepository.findAllByTeacherId(teacherId);
+    }
+
     @Modifying
     public Subject update(int id, Subject c) {
         Optional<Subject> subject = subjectRepository.findById(id);

src/main/java/cz/cvut/fit/tjv/seidlpet/semestralka/controller/SubjectController.java

@@ -38,10 +38,13 @@ public class SubjectController {
     }
     @GetMapping
-    public List<Subject> findAll() {
+    public List<Subject> findAll(@RequestParam(required = false) Integer teacherId) {
+        if(teacherId != null)
+            return subjectService.findAllByTeacherId(teacherId);
         return subjectService.findAll();
     }
+
     @PutMapping("/{id}")
     public void update(@PathVariable int id, @RequestBody Subject subject) {
         try {

src/main/java/cz/cvut/fit/tjv/seidlpet/semestralka/data/SubjectRepository.java

@@ -4,7 +4,9 @@ import cz.cvut.fit.tjv.seidlpet.semestralka.data.entity.Subject;
 import org.springframework.data.jpa.repository.JpaRepository;
 import org.springframework.stereotype.Repository;
+import java.util.List;
+
 @Repository
 public interface SubjectRepository extends JpaRepository<Subject,Integer> {
-
+    List<Subject> findAllByTeacherId(int teacherId);
 }

src/test/java/cz/cvut/fit/tjv/seidlpet/semestralka/controller/SubjectControllerTest.java

@@ -78,7 +78,18 @@ public class SubjectControllerTest {
                 .contentType(MediaType.APPLICATION_JSON))
                 .andExpect(MockMvcResultMatchers.status().isOk())
                 .andExpect(MockMvcResultMatchers.jsonPath("$.*.id").exists());
-        Assertions.assertEquals(subjects,subjectController.findAll());
+        Assertions.assertEquals(subjects,subjectController.findAll(null));
+
+        List<Subject> subject = Collections.singletonList(new Subject(2, "C++", "EN", teacher, Collections.singletonList(
+                new Student(1, "Teo", "Smith", 1.2)
+        )));
+        BDDMockito.given(subjectService.findAllByTeacherId(2)).willReturn(subject);
+        mvc.perform(MockMvcRequestBuilders.get("/api/v1/subject?teacherId=2")
+                .contentType(MediaType.APPLICATION_JSON))
+                .andExpect(MockMvcResultMatchers.status().isOk())
+                .andExpect(MockMvcResultMatchers.jsonPath("$.*.id",CoreMatchers.equalTo(Collections.singletonList(2))));
+        Assertions.assertEquals(subject,subjectController.findAll(2));
+
         Mockito.verify(subjectService,Mockito.atLeastOnce()).findAll();
     }
     @Test