diff --git a/src/main/java/com/booleanuk/cohorts/controllers/StudentController.java b/src/main/java/com/booleanuk/cohorts/controllers/StudentController.java index 0ea214b..7da9ea5 100644 --- a/src/main/java/com/booleanuk/cohorts/controllers/StudentController.java +++ b/src/main/java/com/booleanuk/cohorts/controllers/StudentController.java @@ -160,6 +160,11 @@ public ResponseEntity updateStudent(@PathVariable int id, @RequestBody Studen return new ResponseEntity<>("User not found", HttpStatus.NOT_FOUND); } + Cohort cohort = cohortRepository.findById(studentRequest.getCohortId()).orElse(null); + if (cohort == null) { + return new ResponseEntity<>("Cohort not found", HttpStatus.NOT_FOUND); + } + Profile profile = profileRepository.findById(user.getProfile().getId()).orElse(null); if (profile == null) { return new ResponseEntity<>("Profile not found", HttpStatus.NOT_FOUND); @@ -189,6 +194,12 @@ public ResponseEntity updateStudent(@PathVariable int id, @RequestBody Studen profile.setGithubUrl(studentRequest.getGithub_username()); } + if (cohort!=null) { + profile.setCohort(cohort); + } + + profile.setCohort(cohort); + if (studentRequest.getEmail() != null) { boolean emailExists = userRepository.existsByEmail(studentRequest.getEmail()); diff --git a/src/main/java/com/booleanuk/cohorts/payload/request/StudentRequest.java b/src/main/java/com/booleanuk/cohorts/payload/request/StudentRequest.java index 26baeae..7797ae4 100644 --- a/src/main/java/com/booleanuk/cohorts/payload/request/StudentRequest.java +++ b/src/main/java/com/booleanuk/cohorts/payload/request/StudentRequest.java @@ -7,6 +7,7 @@ @Setter public class StudentRequest { + private int cohortId; private String photo; private String first_name; private String last_name;