Merge pull request #87 from boolean-uk/feat/added-PATCH-for-teacher-profile

moueedAli-Feat/added patch for teacher profile

Author: emazau

src/main/java/com/booleanuk/cohorts/controllers/TeacherController.java

@@ -6,6 +6,7 @@
 import com.booleanuk.cohorts.models.User;
 import com.booleanuk.cohorts.payload.request.StudentRequest;
 import com.booleanuk.cohorts.payload.request.TeacherEditStudentRequest;
+import com.booleanuk.cohorts.payload.request.TeacherRequest;
 import com.booleanuk.cohorts.payload.response.ProfileListResponse;
 import com.booleanuk.cohorts.payload.response.Response;
 import com.booleanuk.cohorts.repository.CohortRepository;
@@ -38,33 +39,6 @@ public class TeacherController {
 
     @Autowired
     PasswordEncoder encoder;
-
-    @PatchMapping("{id}")
-    public ResponseEntity<?> updateStudent(@PathVariable int id, @RequestBody TeacherEditStudentRequest teacherEditStudentRequest) {
-
-        User user = userRepository.findById(id).orElse(null);
-        if (user == null) {
-            return new ResponseEntity<>("User 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);
-        }
-
-        if (profile.getRole().getName().name().equals("ROLE_TEACHER")) {
-            return new ResponseEntity<>("Teachers can only edit other Students!", HttpStatus.BAD_REQUEST);
-        }
-
-        Cohort cohort = cohortRepository.findById(teacherEditStudentRequest.getCohort_id()).orElseThrow();
-        Role role = roleRepository.findById(teacherEditStudentRequest.getRole_id()).orElseThrow();
-
-        profile.setCohort(cohort);
-        profile.setRole(role);
-
-
-        return new ResponseEntity<>(profileRepository.save(profile),HttpStatus.OK);
-    }
 
     @GetMapping
     public ResponseEntity<?> getAllTeachers(){
@@ -111,5 +85,72 @@ public ResponseEntity<?> getTeachersByCohortId(@PathVariable int id){
         return ResponseEntity.ok(teacherListResponse);
     }
 
+    @PatchMapping("{id}")
+    public ResponseEntity<?> updateTeacher(@PathVariable int id, @RequestBody TeacherRequest teacherRequest) {
+
+        User user = userRepository.findById(id).orElse(null);
+        if (user == null) {
+            return new ResponseEntity<>("User 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);
+        }
+
+        if (profile.getRole().getName().name().equals("ROLE_STUDENT")) {
+            return new ResponseEntity<>("Only users with the TEACHER role can be viewed.", HttpStatus.BAD_REQUEST);
+        }
+
+        if (teacherRequest.getPhoto() != null) {
+            profile.setPhoto(teacherRequest.getPhoto());
+        }
+
+        if (teacherRequest.getFirst_name() != null) {
+            profile.setFirstName(teacherRequest.getFirst_name());
+        }
+
+        if (teacherRequest.getLast_name() != null) {
+            profile.setLastName(teacherRequest.getLast_name());
+        }
+
+        if (teacherRequest.getUsername() != null) {
+            profile.setUsername(teacherRequest.getUsername());
+        }
+
+        if (teacherRequest.getGithub_username() != null) {
+            profile.setGithubUrl(teacherRequest.getGithub_username());
+        }
+
+        if (teacherRequest.getEmail() != null) {
+            boolean emailExists = userRepository.existsByEmail(teacherRequest.getEmail());
+            if (emailExists && !teacherRequest.getEmail().equals(user.getEmail())){
+                return new ResponseEntity<>("Email is already in use", HttpStatus.BAD_REQUEST);
+            }
+            user.setEmail(teacherRequest.getEmail());
+        }
+
+        if (teacherRequest.getMobile() != null) {
+            profile.setMobile(teacherRequest.getMobile());
+        }
+
+        if (teacherRequest.getPassword() != null && !teacherRequest.getPassword().isBlank()) {
+            user.setPassword(encoder.encode(teacherRequest.getPassword()));
+        }
+
+        if (teacherRequest.getBio() != null) {
+            profile.setBio(teacherRequest.getBio());
+        }
+
+        profileRepository.save(profile);
+
+        user.setProfile(profile);
+
+        try {
+            return new ResponseEntity<>(userRepository.save(user), HttpStatus.OK);
+        } catch (DataIntegrityViolationException e) {
+            return new ResponseEntity<>("User has an existing profile", HttpStatus.BAD_REQUEST);
+        }
+    }
 }
 

src/main/java/com/booleanuk/cohorts/payload/request/StudentRequest.java

@@ -19,6 +19,5 @@ public class StudentRequest {
 
     public StudentRequest() {
     }
-
 }
 

src/main/java/com/booleanuk/cohorts/payload/request/TeacherRequest.java

@@ -0,0 +1,22 @@
+package com.booleanuk.cohorts.payload.request;
+
+import lombok.Getter;
+import lombok.Setter;
+
+@Getter
+@Setter
+public class TeacherRequest {
+
+    private String photo;
+    private String first_name;
+    private String last_name;
+    private String username;
+    private String github_username;
+    private String email;
+    private String mobile;
+    private String password;
+    private String bio;
+
+    public TeacherRequest() {
+    }
+}