M2 course tests

application/module-language-school/src/main/java/org/fuseri/modulelanguageschool/lecture/LectureController.java

@@ -7,6 +7,8 @@ import org.fuseri.model.dto.lecture.LectureCreateDto;
 import org.fuseri.model.dto.lecture.LectureDto;
 import org.fuseri.model.dto.user.UserDto;
 import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.http.HttpStatus;
+import org.springframework.http.ResponseEntity;
 import org.springframework.web.bind.annotation.*;
 
 import java.util.List;
@@ -36,8 +38,9 @@ public class LectureController {
      */
     @ApiOperation(value = "Create a new lecture")
     @PostMapping
-    public LectureDto create(@Valid @RequestBody LectureCreateDto lecture) {
-        return lectureFacade.create(lecture);
+    public ResponseEntity<LectureDto> create(@Valid @RequestBody LectureCreateDto lecture) {
+        LectureDto lectureDto = lectureFacade.create(lecture);
+        return ResponseEntity.status(HttpStatus.CREATED).body(lectureDto);
     }
 
     /**
@@ -48,8 +51,9 @@ public class LectureController {
      */
     @ApiOperation(value = "Retrieve a lecture by its ID")
     @GetMapping("find/{courseId}")
-    public LectureDto find(@PathVariable Long courseId) {
-        return lectureFacade.findById(courseId);
+    public ResponseEntity<LectureDto> find(@PathVariable Long courseId) {
+        LectureDto lectureDto = lectureFacade.findById(courseId);
+        return ResponseEntity.ok(lectureDto);
     }
 
     /**
@@ -60,8 +64,8 @@ public class LectureController {
      */
     @ApiOperation(value = "Retrieve a list of lectures for the corresponding course")
     @GetMapping("/findByCourse")
-    public List<LectureDto> findByCourse(@Valid @RequestParam Long courseId) {
-        return lectureFacade.findAll(courseId);
+    public ResponseEntity<List<LectureDto>> findByCourse(@Valid @RequestParam Long courseId) {
+        return ResponseEntity.ok(lectureFacade.findAll(courseId));
     }
 
     /**
@@ -72,8 +76,8 @@ public class LectureController {
      */
     @ApiOperation(value = "Update an existing lecture")
     @PutMapping("/update/{id}")
-    public LectureDto update(@PathVariable Long id, @Valid @RequestBody LectureCreateDto lecture) {
-        return lectureFacade.update(id, lecture);
+    public ResponseEntity<LectureDto> update(@PathVariable Long id, @Valid @RequestBody LectureCreateDto lecture) {
+        return ResponseEntity.ok(lectureFacade.update(id, lecture));
     }
 
     /**
@@ -83,8 +87,9 @@ public class LectureController {
      */
     @ApiOperation(value = "Delete a lecture by its ID")
     @DeleteMapping("/delete/{id}")
-    public void delete(@PathVariable Long id) {
+    public ResponseEntity<Void> delete(@PathVariable Long id) {
         lectureFacade.delete(id);
+        return ResponseEntity.noContent().build();
     }
 
 
@@ -97,8 +102,8 @@ public class LectureController {
      */
     @ApiOperation(value = "Add lecturer to the existing lecture")
     @PatchMapping("/setLecturer/{id}")
-    public LectureDto setLecturer(@PathVariable Long id, @RequestBody UserDto lecturerDto) {
-        return lectureFacade.setLecturer(id, lecturerDto);
+    public ResponseEntity<LectureDto> setLecturer(@PathVariable Long id, @RequestBody UserDto lecturerDto) {
+        return ResponseEntity.ok(lectureFacade.setLecturer(id, lecturerDto));
     }
 
     /**
@@ -110,8 +115,8 @@ public class LectureController {
      */
     @ApiOperation(value = "Add student to the existing lecture")
     @PatchMapping("/enrol/{id}")
-    public LectureDto enrol(@PathVariable Long id, @RequestBody UserDto student) {
-        return lectureFacade.enrol(id, student);
+    public ResponseEntity<LectureDto> enrol(@PathVariable Long id, @RequestBody UserDto student) {
+        return ResponseEntity.ok(lectureFacade.enrol(id, student));
     }
 
     /**
@@ -123,7 +128,7 @@ public class LectureController {
      */
     @ApiOperation(value = "Remove student from the existing lecture")
     @PatchMapping("/expel/{id}")
-    public LectureDto expel(@PathVariable Long id, @RequestBody UserDto student) {
-        return lectureFacade.expel(id, student);
+    public ResponseEntity<LectureDto> expel(@PathVariable Long id, @RequestBody UserDto student) {
+        return ResponseEntity.ok(lectureFacade.expel(id, student));
     }
 }
\ No newline at end of file