diff --git a/src/main/java/com/blessedbits/SchoolHub/controllers/AssignmentController.java b/src/main/java/com/blessedbits/SchoolHub/controllers/AssignmentController.java index 581892d..bb18f07 100644 --- a/src/main/java/com/blessedbits/SchoolHub/controllers/AssignmentController.java +++ b/src/main/java/com/blessedbits/SchoolHub/controllers/AssignmentController.java @@ -41,7 +41,7 @@ public AssignmentController(ModuleService moduleService, AssignmentRepository as } @PostMapping("") - public ResponseEntity createAssignment( + public ResponseEntity createAssignment( @RequestBody CreateAssignmentDto assignmentDto, @AuthenticationPrincipal UserEntity user ) { @@ -56,11 +56,10 @@ public ResponseEntity createAssignment( assignment.setDueDate(assignmentDto.getDueDate()); assignment.setModule(moduleEntity); try { - assignmentRepository.save(assignment); - return new ResponseEntity<>("Assignment created", HttpStatus.CREATED); + return new ResponseEntity<>(assignmentRepository.save(assignment), HttpStatus.CREATED); } catch (Exception e) { System.out.println(e.getMessage()); - return new ResponseEntity<>("Unable to create assignment", HttpStatus.INTERNAL_SERVER_ERROR); + return new ResponseEntity<>("Error: Unable to create assignment!", HttpStatus.INTERNAL_SERVER_ERROR); } } diff --git a/src/main/java/com/blessedbits/SchoolHub/controllers/ClassesController.java b/src/main/java/com/blessedbits/SchoolHub/controllers/ClassesController.java index 50f24f7..65d6beb 100644 --- a/src/main/java/com/blessedbits/SchoolHub/controllers/ClassesController.java +++ b/src/main/java/com/blessedbits/SchoolHub/controllers/ClassesController.java @@ -63,7 +63,7 @@ public ResponseEntity> getClasses( } @PostMapping("") - public ResponseEntity createClass( + public ResponseEntity createClass( @RequestBody CreateClassDto classDto, @AuthenticationPrincipal UserEntity user ) { @@ -80,8 +80,7 @@ public ResponseEntity createClass( classEntity.setHomeroomTeacher(teacher); classEntity.setSchool(school); try { - classRepository.save(classEntity); - return new ResponseEntity<>("Class created", HttpStatus.CREATED); + return new ResponseEntity<>(classRepository.save(classEntity), HttpStatus.CREATED); } catch (Exception e) { System.out.println(e.getMessage()); return new ResponseEntity<>( diff --git a/src/main/java/com/blessedbits/SchoolHub/controllers/CourseController.java b/src/main/java/com/blessedbits/SchoolHub/controllers/CourseController.java index 1c80577..20a1bb0 100644 --- a/src/main/java/com/blessedbits/SchoolHub/controllers/CourseController.java +++ b/src/main/java/com/blessedbits/SchoolHub/controllers/CourseController.java @@ -44,7 +44,7 @@ public ResponseEntity> getCourses( } @PostMapping("") - public ResponseEntity createCourse( + public ResponseEntity createCourse( @RequestBody CreateCourseDto courseDto, @AuthenticationPrincipal UserEntity user ) { diff --git a/src/main/java/com/blessedbits/SchoolHub/controllers/MaterialController.java b/src/main/java/com/blessedbits/SchoolHub/controllers/MaterialController.java index d84ad3b..ff85a0e 100644 --- a/src/main/java/com/blessedbits/SchoolHub/controllers/MaterialController.java +++ b/src/main/java/com/blessedbits/SchoolHub/controllers/MaterialController.java @@ -35,7 +35,7 @@ public MaterialController(ModuleService moduleService, MaterialRepository materi } @PostMapping("") - public ResponseEntity createMaterial( + public ResponseEntity createMaterial( @RequestBody CreateMaterialDto createMaterialDto, @AuthenticationPrincipal UserEntity user ) { @@ -49,8 +49,7 @@ public ResponseEntity createMaterial( material.setUrl(createMaterialDto.getUrl()); material.setModule(moduleEntity); try { - materialRepository.save(material); - return new ResponseEntity<>("Material created", HttpStatus.CREATED); + return new ResponseEntity<>(materialRepository.save(material), HttpStatus.CREATED); } catch (Exception e) { System.out.println(e.getMessage()); return new ResponseEntity<>("Unable to create material", HttpStatus.INTERNAL_SERVER_ERROR); diff --git a/src/main/java/com/blessedbits/SchoolHub/controllers/ModuleController.java b/src/main/java/com/blessedbits/SchoolHub/controllers/ModuleController.java index 8333d8d..e076aa8 100644 --- a/src/main/java/com/blessedbits/SchoolHub/controllers/ModuleController.java +++ b/src/main/java/com/blessedbits/SchoolHub/controllers/ModuleController.java @@ -37,7 +37,7 @@ public ModuleController(final ModuleRepository moduleRepository, final ModuleSer } @PostMapping("") - public ResponseEntity createModule( + public ResponseEntity createModule( @RequestBody CreateModuleDto createModuleDto, @AuthenticationPrincipal UserEntity user ) { @@ -49,8 +49,8 @@ public ResponseEntity createModule( moduleEntity.setName(createModuleDto.getName()); moduleEntity.setCourse(course); try { - moduleRepository.save(moduleEntity); - return new ResponseEntity<>("Module created", HttpStatus.CREATED); + + return new ResponseEntity<>(moduleRepository.save(moduleEntity), HttpStatus.CREATED); } catch (Exception e) { System.out.println(e.getMessage()); return new ResponseEntity<>("Unable to create module", HttpStatus.INTERNAL_SERVER_ERROR); diff --git a/src/main/java/com/blessedbits/SchoolHub/controllers/ScheduleController.java b/src/main/java/com/blessedbits/SchoolHub/controllers/ScheduleController.java index c7c7117..a83305b 100644 --- a/src/main/java/com/blessedbits/SchoolHub/controllers/ScheduleController.java +++ b/src/main/java/com/blessedbits/SchoolHub/controllers/ScheduleController.java @@ -19,14 +19,13 @@ public class ScheduleController { private ScheduleService scheduleService; @PostMapping("") - public ResponseEntity createSchedule(@RequestBody CreateScheduleDto createScheduleDto) { + public ResponseEntity createSchedule(@RequestBody CreateScheduleDto createScheduleDto) { try { - scheduleService.createSchedule(createScheduleDto); - return new ResponseEntity("Schedule was successfully created!", HttpStatus.CREATED); + return new ResponseEntity<>(scheduleService.createSchedule(createScheduleDto), HttpStatus.CREATED); } catch (Exception e) { - return new ResponseEntity("Error " + e.getMessage(), HttpStatus.INTERNAL_SERVER_ERROR); + return new ResponseEntity<>("Error " + e.getMessage(), HttpStatus.INTERNAL_SERVER_ERROR); } } diff --git a/src/main/java/com/blessedbits/SchoolHub/controllers/SchoolController.java b/src/main/java/com/blessedbits/SchoolHub/controllers/SchoolController.java index 6b33e3e..c2d884a 100644 --- a/src/main/java/com/blessedbits/SchoolHub/controllers/SchoolController.java +++ b/src/main/java/com/blessedbits/SchoolHub/controllers/SchoolController.java @@ -62,13 +62,12 @@ public ResponseEntity> getSchools( } @PostMapping("") - public ResponseEntity createSchool(@RequestBody CreateSchoolDto schoolDto) { + public ResponseEntity createSchool(@RequestBody CreateSchoolDto schoolDto) { School school = new School(); school.setName(schoolDto.getName()); school.setAddress(schoolDto.getAddress()); try { - schoolRepository.save(school); - return new ResponseEntity<>("School created", HttpStatus.CREATED); + return new ResponseEntity<>(schoolRepository.save(school), HttpStatus.CREATED); } catch (Exception e) { System.out.println(e.getMessage()); return new ResponseEntity<>("Unable to create school", HttpStatus.BAD_REQUEST); diff --git a/src/main/java/com/blessedbits/SchoolHub/controllers/SubmissionController.java b/src/main/java/com/blessedbits/SchoolHub/controllers/SubmissionController.java index fb71644..e22cac6 100644 --- a/src/main/java/com/blessedbits/SchoolHub/controllers/SubmissionController.java +++ b/src/main/java/com/blessedbits/SchoolHub/controllers/SubmissionController.java @@ -34,7 +34,7 @@ public SubmissionController(AssignmentService assignmentService, SubmissionRepos } @PostMapping("") - public ResponseEntity createSubmission( + public ResponseEntity createSubmission( @RequestBody CreateSubmissionDto submissionDto, @AuthenticationPrincipal UserEntity user ) { @@ -48,8 +48,7 @@ public ResponseEntity createSubmission( submission.setStudent(user); submission.setAssignment(assignment); try { - submissionRepository.save(submission); - return new ResponseEntity<>("Submission created", HttpStatus.CREATED); + return new ResponseEntity<>(submissionRepository.save(submission), HttpStatus.CREATED); } catch (Exception e) { System.out.println(e.getMessage()); return new ResponseEntity<>("Unable to create submission", HttpStatus.INTERNAL_SERVER_ERROR); diff --git a/src/main/java/com/blessedbits/SchoolHub/services/CourseService.java b/src/main/java/com/blessedbits/SchoolHub/services/CourseService.java index dfe29a5..db5d487 100644 --- a/src/main/java/com/blessedbits/SchoolHub/services/CourseService.java +++ b/src/main/java/com/blessedbits/SchoolHub/services/CourseService.java @@ -153,7 +153,7 @@ public void deleteRelations(Course course) { schoolRepository.save(school); } - public ResponseEntity createCourse(CreateCourseDto courseDto, UserEntity user) { + public ResponseEntity createCourse(CreateCourseDto courseDto, UserEntity user) { School school = schoolRepository.findById(courseDto.getSchoolId()) .orElseGet(() -> user.getSchool()); @@ -171,8 +171,7 @@ public ResponseEntity createCourse(CreateCourseDto courseDto, UserEntity course.setTeachers(teachers); } try { - courseRepository.save(course); - return new ResponseEntity<>("Course created", HttpStatus.CREATED); + return new ResponseEntity<>(courseRepository.save(course), HttpStatus.CREATED); } catch (Exception e) { return new ResponseEntity<>("Unable to create course", HttpStatus.INTERNAL_SERVER_ERROR); } diff --git a/src/main/java/com/blessedbits/SchoolHub/services/ScheduleService.java b/src/main/java/com/blessedbits/SchoolHub/services/ScheduleService.java index 475b1f4..c1b621f 100644 --- a/src/main/java/com/blessedbits/SchoolHub/services/ScheduleService.java +++ b/src/main/java/com/blessedbits/SchoolHub/services/ScheduleService.java @@ -35,7 +35,7 @@ public class ScheduleService { @Autowired private CourseRepository courseRepository; - public void createSchedule(CreateScheduleDto createScheduleDTO) { + public Schedule createSchedule(CreateScheduleDto createScheduleDTO) { Optional classEntityOpt = classRepository.findById(createScheduleDTO.getClassId()); Optional courseOpt = courseRepository.findById(createScheduleDTO.getCourseId()); @@ -55,7 +55,7 @@ public void createSchedule(CreateScheduleDto createScheduleDTO) { schedule.setEndTime(createScheduleDTO.getEndTime()); schedule.setRoomNumber(createScheduleDTO.getRoomNumber()); - scheduleRepository.save(schedule); + return scheduleRepository.save(schedule); } public List getAllSchedules() {