2024-11-20 - Feedback submission for ext-recip

Author: Luch76

server/src/main/java/com/objectcomputing/checkins/services/feedback_request/FeedbackRequestExternalRecipientController.java

@@ -2,6 +2,7 @@
 
 import com.objectcomputing.checkins.exceptions.BadArgException;
 import com.objectcomputing.checkins.security.ImpersonationController;
+import com.objectcomputing.checkins.services.feedback_answer.*;
 import com.objectcomputing.checkins.services.feedback_answer.question_and_answer.QuestionAndAnswerServices;
 import com.objectcomputing.checkins.services.feedback_external_recipient.FeedbackExternalRecipientServices;
 import com.objectcomputing.checkins.services.memberprofile.*;
@@ -43,12 +44,18 @@ public class FeedbackRequestExternalRecipientController {
     private static final Base64.Encoder base64Encoder = Base64.getUrlEncoder();
     private final MemberProfileServices memberProfileServices;
     private final QuestionAndAnswerServices questionAndAnswerServices;
+    private final FeedbackAnswerServices feedbackAnswerServices;
 
-    public FeedbackRequestExternalRecipientController(FeedbackRequestServices feedbackRequestServices, FeedbackExternalRecipientServices feedbackExternalRecipientServices, MemberProfileServices memberProfileServices, QuestionAndAnswerServices questionAndAnswerServices) {
+    public FeedbackRequestExternalRecipientController(
+            FeedbackRequestServices feedbackRequestServices, FeedbackExternalRecipientServices feedbackExternalRecipientServices,
+            MemberProfileServices memberProfileServices, QuestionAndAnswerServices questionAndAnswerServices,
+            FeedbackAnswerServices feedbackAnswerServices
+    ) {
         this.feedbackReqServices = feedbackRequestServices;
         this.feedbackExternalRecipientServices = feedbackExternalRecipientServices;
         this.memberProfileServices = memberProfileServices;
         this.questionAndAnswerServices = questionAndAnswerServices;
+        this.feedbackAnswerServices = feedbackAnswerServices;
     }
 
     /**
@@ -231,4 +238,60 @@ public List<QuestionAndAnswerServices.Tuple> getAllQuestionsAndAnswers(@Nullable
         return questionAndAnswerServices.getAllQuestionsAndAnswers(requestId);
     }
 
+    /**
+     * Create a feedback answer
+     *
+     * @param requestBody {@link FeedbackAnswerCreateDTO} New feedback answer to create
+     * @return {@link FeedbackAnswerResponseDTO}
+     */
+    @Post("/feedback/answers")
+    public HttpResponse<FeedbackAnswerResponseDTO> save(@Body @Valid @NotNull FeedbackAnswerCreateDTO requestBody) {
+        FeedbackAnswer feedbackAnswer = fromDTO(requestBody);
+        FeedbackRequest feedbackRequest = feedbackReqServices.getById(feedbackAnswer.getRequestId());
+        if (feedbackRequest.getExternalRecipientId() == null) {
+            throw new BadArgException("This feedback request is not for an external recipient");
+        }
+        FeedbackAnswer savedAnswer = feedbackAnswerServices.save(feedbackAnswer);
+        return HttpResponse.created(fromEntity(savedAnswer))
+                .headers(headers -> headers.location(URI.create("/feedback_answer/" + savedAnswer.getId())))
+                ;
+    }
+
+    /**
+     * Update a feedback answer
+     *
+     * @param requestBody {@link FeedbackAnswerUpdateDTO} The updated feedback answer
+     * @return {@link FeedbackAnswerResponseDTO}
+     */
+    @Put("/feedback/answers")
+    public HttpResponse<FeedbackAnswerResponseDTO> update(@Body @Valid @NotNull FeedbackAnswerUpdateDTO requestBody) {
+        FeedbackAnswer feedbackAnswer = feedbackAnswerServices.getById(fromDTO(requestBody).getId());
+        FeedbackRequest feedbackRequest = feedbackReqServices.getById(feedbackAnswer.getRequestId());
+        if (feedbackRequest.getExternalRecipientId() == null) {
+            throw new BadArgException("This feedback request is not for an external recipient");
+        }
+        FeedbackAnswer savedAnswer = feedbackAnswerServices.update(feedbackAnswer);
+        return HttpResponse.ok(fromEntity(savedAnswer))
+                .headers(headers -> headers.location(URI.create("/feedback_answer/" + savedAnswer.getId())))
+                ;
+    }
+
+    private FeedbackAnswer fromDTO(FeedbackAnswerCreateDTO dto) {
+        return new FeedbackAnswer(dto.getAnswer(), dto.getQuestionId(), dto.getRequestId(), dto.getSentiment());
+    }
+
+    private FeedbackAnswer fromDTO(FeedbackAnswerUpdateDTO dto) {
+        return new FeedbackAnswer(dto.getId(), dto.getAnswer(), dto.getSentiment());
+    }
+
+    private FeedbackAnswerResponseDTO fromEntity(FeedbackAnswer feedbackAnswer) {
+        FeedbackAnswerResponseDTO dto = new FeedbackAnswerResponseDTO();
+        dto.setId(feedbackAnswer.getId());
+        dto.setAnswer(feedbackAnswer.getAnswer());
+        dto.setQuestionId(feedbackAnswer.getQuestionId());
+        dto.setRequestId(feedbackAnswer.getRequestId());
+        dto.setSentiment(feedbackAnswer.getSentiment());
+        return dto;
+    }
+
 }

server/src/main/java/com/objectcomputing/checkins/services/feedback_request/FeedbackRequestServicesImpl.java

@@ -496,13 +496,22 @@ private boolean isCurrentUserAdminOrOwner(FeedbackRequest feedbackRequest) {
     }
 
     private boolean updateSubmitDateIsPermitted(FeedbackRequest feedbackRequest) {
-        boolean isAdmin = currentUserServices.isAdmin();
-        UUID currentUserId = currentUserServices.getCurrentUser().getId();
-        if (isAdmin || (currentUserId.equals(feedbackRequest.getCreatorId()) && feedbackRequest.getSubmitDate() != null)) {
-            return true;
+        MemberProfile currentUser;
+        boolean isAdmin = false;
+        try {
+            currentUser = currentUserServices.getCurrentUser();
+            isAdmin = currentUserServices.isAdmin();
+        } catch (NotFoundException notFoundException) {
+            currentUser = null;
+
         }
+        if (isAdmin) return true;
+        UUID currentUserId = currentUser != null ? currentUser.getId() : null;
+        if (((currentUserId != null && currentUserId.equals(feedbackRequest.getCreatorId())) && feedbackRequest.getSubmitDate() != null)) return true;
+        if (currentUserId != null && currentUserId.equals(feedbackRequest.getRecipientId()))  return true;
+        if (feedbackRequest.getExternalRecipientId() != null) return true;
 
-        return currentUserId.equals(feedbackRequest.getRecipientId());
+        return false;
     }
 
     private FeedbackRequest getFromDTO(FeedbackRequestUpdateDTO dto) {

web-ui-external-feedback/src/api/feedback.js

@@ -2,8 +2,8 @@ import { resolve } from './api.js';
 import { getFeedbackTemplateWithQuestions } from './feedbacktemplate.js';
 
 const feedbackSuggestionURL = '/services/feedback/suggestions';
-const feedbackRequestURL = '/services/feedback/requests';
-const answerURL = '/services/feedback/answers';
+const feedbackRequestURL = '/';
+const answerURL = '/feedback/answers';
 const questionAndAnswerURL = '/services/feedback/questions-and-answers';
 const feedbackExternalRecipientsURL = '/services/feedback/external/recipients';
 
@@ -90,6 +90,10 @@ export const createFeedbackRequest = async (feedbackRequest, cookie) => {
 };
 
 export const updateFeedbackRequest = async (feedbackRequest, cookie) => {
+
+  console.log("feedback.js, updateFeedbackRequest, feedbackRequestURL: ", feedbackRequestURL);
+  console.log("feedback.js, updateFeedbackRequest, feedbackRequest: ", feedbackRequest);
+
   return resolve({
     method: 'PUT',
     url: feedbackRequestURL,