Merge pull request #497 from bounswe/refactor/492-mentorship-parameter-update

CotSezer · web-flow · commit 1f0e9327660f · 2025-12-10T21:33:50.000+03:00
feat(mentorship): add motivation field to mentorship requests and res…
diff --git a/apps/jobboard-backend/src/main/java/org/bounswe/jobboardbackend/mentorship/controller/MentorshipController.java b/apps/jobboard-backend/src/main/java/org/bounswe/jobboardbackend/mentorship/controller/MentorshipController.java
@@ -139,26 +139,26 @@ public ResponseEntity<List<MentorshipDetailsDTO>> getMyMentorshipDetails(
 
 
     @GetMapping("/requests/{requestId}")
-    public ResponseEntity<MentorshipRequestDTO> getMentorshipRequest(
+    public ResponseEntity<MentorshipRequestResponseDTO> getMentorshipRequest(
             @PathVariable Long requestId,
             Authentication auth
     ) {
         UserDetailsImpl userDetails = (UserDetailsImpl) auth.getPrincipal();
-        MentorshipRequestDTO request = mentorshipService.getMentorshipRequest(requestId, userDetails.getId());
+        MentorshipRequestResponseDTO request = mentorshipService.getMentorshipRequest(requestId, userDetails.getId());
         return new ResponseEntity<>(request, HttpStatus.OK);
     }
 
 
     @PatchMapping("/requests/{requestId}/respond")
-    public ResponseEntity<MentorshipRequestDTO> respondToMentorshipRequest(
+    public ResponseEntity<MentorshipRequestResponseDTO> respondToMentorshipRequest(
             @PathVariable Long requestId,
             @Valid @RequestBody RespondToRequestDTO responseDTO,
             Authentication auth
     ) {
         UserDetailsImpl userDetails = (UserDetailsImpl) auth.getPrincipal();
-        MentorshipRequestDTO updatedRequest = mentorshipService.respondToMentorshipRequest(
+        MentorshipRequestResponseDTO updatedRequest = mentorshipService.respondToMentorshipRequest(
                 requestId,
-                responseDTO.accept(),
+                responseDTO,
                 userDetails.getId()
         );
         return new ResponseEntity<>(updatedRequest, HttpStatus.OK);
diff --git a/apps/jobboard-backend/src/main/java/org/bounswe/jobboardbackend/mentorship/dto/CreateMentorshipRequestDTO.java b/apps/jobboard-backend/src/main/java/org/bounswe/jobboardbackend/mentorship/dto/CreateMentorshipRequestDTO.java
@@ -2,8 +2,10 @@
 
 
 
+import jakarta.validation.constraints.NotBlank;
 import jakarta.validation.constraints.NotNull;
 
 public record CreateMentorshipRequestDTO(
-        @NotNull Long mentorId
+        @NotNull Long mentorId,
+        @NotBlank String motivation
 ) {}
diff --git a/apps/jobboard-backend/src/main/java/org/bounswe/jobboardbackend/mentorship/dto/MentorshipRequestDTO.java b/apps/jobboard-backend/src/main/java/org/bounswe/jobboardbackend/mentorship/dto/MentorshipRequestDTO.java
@@ -7,5 +7,6 @@ public record MentorshipRequestDTO(
         String requesterId,
         String mentorId,
         String status,
-        LocalDateTime createdAt
+        LocalDateTime createdAt,
+        String motivation
 ) {}
diff --git a/apps/jobboard-backend/src/main/java/org/bounswe/jobboardbackend/mentorship/dto/MentorshipRequestResponseDTO.java b/apps/jobboard-backend/src/main/java/org/bounswe/jobboardbackend/mentorship/dto/MentorshipRequestResponseDTO.java
@@ -0,0 +1,13 @@
+package org.bounswe.jobboardbackend.mentorship.dto;
+
+import java.time.LocalDateTime;
+
+public record MentorshipRequestResponseDTO(
+        String id,
+        String requesterId,
+        String mentorId,
+        String status,
+        LocalDateTime createdAt,
+        String motivation,
+        String responseMessage
+) {}
diff --git a/apps/jobboard-backend/src/main/java/org/bounswe/jobboardbackend/mentorship/dto/RespondToRequestDTO.java b/apps/jobboard-backend/src/main/java/org/bounswe/jobboardbackend/mentorship/dto/RespondToRequestDTO.java
@@ -1,7 +1,9 @@
 package org.bounswe.jobboardbackend.mentorship.dto;
 
+import jakarta.validation.constraints.NotBlank;
 import jakarta.validation.constraints.NotNull;
 
 public record RespondToRequestDTO(
-        @NotNull Boolean accept
-) {}
+        @NotNull Boolean accept,
+        @NotBlank String responseMessage
+) {}
diff --git a/apps/jobboard-backend/src/main/java/org/bounswe/jobboardbackend/mentorship/model/MentorshipRequest.java b/apps/jobboard-backend/src/main/java/org/bounswe/jobboardbackend/mentorship/model/MentorshipRequest.java
@@ -9,6 +9,7 @@
 
 @Entity
 @Data
+@Table(name = "mentorship_request")
 public class MentorshipRequest {
     @Id
     @GeneratedValue(strategy = GenerationType.IDENTITY)
@@ -27,12 +28,20 @@ public class MentorshipRequest {
 
     private LocalDateTime createdAt;
 
-    public void accept() {
+    @Column(nullable = false, columnDefinition = "TEXT DEFAULT 'Not provided'")
+    private String motivation;
+
+    @Column
+    private String responseMessage;
+
+    public void accept(String message) {
         this.status = RequestStatus.ACCEPTED;
+        this.responseMessage = message;
     }
 
-    public void decline() {
+    public void decline(String message) {
         this.status = RequestStatus.DECLINED;
+        this.responseMessage = message;
     }
 
 
diff --git a/apps/jobboard-backend/src/main/java/org/bounswe/jobboardbackend/mentorship/service/MentorshipService.java b/apps/jobboard-backend/src/main/java/org/bounswe/jobboardbackend/mentorship/service/MentorshipService.java
@@ -22,9 +22,9 @@ public interface MentorshipService {
     MentorProfileDTO updateMentorProfile(Long userId, UpdateMentorProfileDTO updateDTO);
     void deleteMentorProfile(Long userId);
     MentorshipRequestDTO createMentorshipRequest(CreateMentorshipRequestDTO requestDTO, Long jobSeekerId);
-    MentorshipRequestDTO respondToMentorshipRequest(Long requestId, boolean accept, Long mentorId);
+    MentorshipRequestResponseDTO respondToMentorshipRequest(Long requestId, RespondToRequestDTO respondToRequestDTO, Long mentorId);
     void rateMentor(CreateRatingDTO ratingDTO, Long jobSeekerId);
-    MentorshipRequestDTO getMentorshipRequest(Long requestId, Long userId);
+    MentorshipRequestResponseDTO getMentorshipRequest(Long requestId, Long userId);
     void completeMentorship(Long resumeReviewId, Authentication auth);
     void closeMentorship(Long resumeReviewId, Authentication auth);
     List<MentorshipRequestDTO> getMentorshipRequestsOfMentor(Long mentorId, Long userId);
diff --git a/apps/jobboard-backend/src/main/java/org/bounswe/jobboardbackend/mentorship/service/MentorshipServiceImpl.java b/apps/jobboard-backend/src/main/java/org/bounswe/jobboardbackend/mentorship/service/MentorshipServiceImpl.java
@@ -251,6 +251,7 @@ public MentorshipRequestDTO createMentorshipRequest(CreateMentorshipRequestDTO r
         newRequest.setRequester(jobSeeker);
         newRequest.setStatus(RequestStatus.PENDING);
         newRequest.setCreatedAt(LocalDateTime.now());
+        newRequest.setMotivation(requestDTO.motivation());
         MentorshipRequest savedRequest = mentorshipRequestRepository.save(newRequest);
 
         // Trigger notification
@@ -261,7 +262,7 @@ public MentorshipRequestDTO createMentorshipRequest(CreateMentorshipRequestDTO r
 
     @Override
     @Transactional
-    public MentorshipRequestDTO respondToMentorshipRequest(Long requestId, boolean accept, Long mentorId) {
+    public MentorshipRequestResponseDTO respondToMentorshipRequest(Long requestId, RespondToRequestDTO respondToRequestDTO, Long mentorId) {
         MentorshipRequest request = mentorshipRequestRepository.findById(requestId)
                 .orElseThrow(() -> new HandleException(ErrorCode.REQUEST_NOT_FOUND, "Request not found"));
 
@@ -273,9 +274,11 @@ public MentorshipRequestDTO respondToMentorshipRequest(Long requestId, boolean a
             throw new HandleException(ErrorCode.REQUEST_ALREADY_PROCESSED, "This request has already been responded to.");
         }
 
-        if (accept) {
 
-            request.accept();
+
+        if (respondToRequestDTO.accept()) {
+
+            request.accept(respondToRequestDTO.responseMessage());
 
             ResumeReview review = new ResumeReview();
             review.setJobSeeker(request.getRequester());
@@ -295,14 +298,14 @@ public MentorshipRequestDTO respondToMentorshipRequest(Long requestId, boolean a
             // notificationService.notifyUser(request.getRequester(), "Your request was accepted!"); // (Future implementation)
 
         } else {
-            request.decline();
+            request.decline(respondToRequestDTO.responseMessage());
 
             // Trigger notification
             // notificationService.notifyUser(request.getRequester(), "Your request was declined."); // (Future implementation)
         }
 
         MentorshipRequest updatedRequest = mentorshipRequestRepository.save(request);
-        return toMentorshipRequestDTO(updatedRequest);
+        return toMentorshipRequestResponseDTO(updatedRequest);
     }
 
     @Override
@@ -339,7 +342,7 @@ public void rateMentor(CreateRatingDTO ratingDTO, Long jobSeekerId) {
 
     @Override
     @Transactional(readOnly = true)
-    public MentorshipRequestDTO getMentorshipRequest(Long requestId, Long userId) {
+    public MentorshipRequestResponseDTO getMentorshipRequest(Long requestId, Long userId) {
 
 
 
@@ -352,7 +355,7 @@ public MentorshipRequestDTO getMentorshipRequest(Long requestId, Long userId) {
         if (!userId.equals(mentorId) && !userId.equals(requesterId)) {
             throw new HandleException(ErrorCode.UNAUTHORIZED_REVIEW_ACCESS, "User is not authorized to see this request");
         }
-        return toMentorshipRequestDTO(request);
+        return toMentorshipRequestResponseDTO(request);
     }
 
     @Override
@@ -500,7 +503,20 @@ private MentorshipRequestDTO toMentorshipRequestDTO(MentorshipRequest request) {
                 request.getRequester().getId().toString(),
                 request.getMentor().getId().toString(),
                 request.getStatus().name(),
-                request.getCreatedAt()
+                request.getCreatedAt(),
+                request.getMotivation()
+        );
+    }
+
+    private MentorshipRequestResponseDTO toMentorshipRequestResponseDTO(MentorshipRequest request) {
+        return new MentorshipRequestResponseDTO(
+                request.getId().toString(),
+                request.getRequester().getId().toString(),
+                request.getMentor().getId().toString(),
+                request.getStatus().name(),
+                request.getCreatedAt(),
+                request.getMotivation(),
+                request.getResponseMessage()
         );
     }
 
diff --git a/apps/jobboard-backend/src/test/java/org/bounswe/jobboardbackend/mentorship/controller/MentorshipControllerTest.java b/apps/jobboard-backend/src/test/java/org/bounswe/jobboardbackend/mentorship/controller/MentorshipControllerTest.java
@@ -11,6 +11,7 @@
 import org.springframework.security.core.Authentication;
 import org.springframework.web.multipart.MultipartFile;
 
+import java.time.LocalDateTime;
 import java.util.List;
 
 import static org.junit.jupiter.api.Assertions.*;
@@ -263,43 +264,57 @@ void getMentorshipRequest_usesAuthenticatedUserId() {
         when(auth.getPrincipal()).thenReturn(principal);
         when(principal.getId()).thenReturn(99L);
 
-        MentorshipRequestDTO dto = mock(MentorshipRequestDTO.class);
+        MentorshipRequestResponseDTO dto = new MentorshipRequestResponseDTO(
+                "50",
+                "10",
+                "99",
+                "PENDING",
+                LocalDateTime.now(),
+                "Because I want to learn",
+                ""
+        );
 
         when(mentorshipService.getMentorshipRequest(requestId, 99L))
                 .thenReturn(dto);
 
-        ResponseEntity<MentorshipRequestDTO> response =
+        ResponseEntity<MentorshipRequestResponseDTO> response =
                 mentorshipController.getMentorshipRequest(requestId, auth);
 
         assertEquals(HttpStatus.OK, response.getStatusCode());
         assertSame(dto, response.getBody());
+
         verify(mentorshipService).getMentorshipRequest(requestId, 99L);
+        verifyNoMoreInteractions(mentorshipService);
     }
 
+
     @Test
-    void respondToMentorshipRequest_usesAcceptFlagAndUserId() {
+    void respondToMentorshipRequest_usesAuthenticatedUserIdAndDelegatesToService() {
         Long requestId = 60L;
+
         Authentication auth = mock(Authentication.class);
         UserDetailsImpl principal = mock(UserDetailsImpl.class);
         when(auth.getPrincipal()).thenReturn(principal);
         when(principal.getId()).thenReturn(11L);
 
-        RespondToRequestDTO responseDTO = mock(RespondToRequestDTO.class);
-        when(responseDTO.accept()).thenReturn(true);
-
-        MentorshipRequestDTO returned = mock(MentorshipRequestDTO.class);
+        RespondToRequestDTO dto =
+                new RespondToRequestDTO(true, "Happy to mentor you.");
 
-        when(mentorshipService.respondToMentorshipRequest(requestId, true, 11L))
-                .thenReturn(returned);
+        MentorshipRequestResponseDTO serviceResult = mock(MentorshipRequestResponseDTO.class);
+        when(mentorshipService.respondToMentorshipRequest(requestId, dto, 11L))
+                .thenReturn(serviceResult);
 
-        ResponseEntity<MentorshipRequestDTO> response =
-                mentorshipController.respondToMentorshipRequest(requestId, responseDTO, auth);
+        ResponseEntity<MentorshipRequestResponseDTO> response =
+                mentorshipController.respondToMentorshipRequest(requestId, dto, auth);
 
         assertEquals(HttpStatus.OK, response.getStatusCode());
-        assertSame(returned, response.getBody());
-        verify(mentorshipService).respondToMentorshipRequest(requestId, true, 11L);
+        assertSame(serviceResult, response.getBody());
+
+        verify(mentorshipService).respondToMentorshipRequest(requestId, dto, 11L);
+        verifyNoMoreInteractions(mentorshipService);
     }
 
+
     // ----------------------------------------------------------------------
     // Rating endpoint
     // ----------------------------------------------------------------------
diff --git a/apps/jobboard-backend/src/test/java/org/bounswe/jobboardbackend/mentorship/repository/MentorshipRepositoriesTest.java b/apps/jobboard-backend/src/test/java/org/bounswe/jobboardbackend/mentorship/repository/MentorshipRepositoriesTest.java
@@ -69,12 +69,14 @@ private MentorshipRequest buildAndPersistMentorshipRequest(MentorProfile mentor,
         request.setRequester(mentee);
         request.setStatus(RequestStatus.PENDING);
         request.setCreatedAt(LocalDateTime.now());
+        request.setMotivation("Test motivation");
 
         entityManager.persist(mentee);
         entityManager.persist(request);
         return request;
     }
 
+
     private ResumeReview buildAndPersistResumeReview(MentorshipRequest request,
                                                      MentorProfile mentor,
                                                      User mentee) {
diff --git a/apps/jobboard-backend/src/test/java/org/bounswe/jobboardbackend/mentorship/service/MentorshipServiceImplTest.java b/apps/jobboard-backend/src/test/java/org/bounswe/jobboardbackend/mentorship/service/MentorshipServiceImplTest.java
