[#11015] break down question result fetch by section

src/main/java/teammates/common/datatransfer/FeedbackResultFetchType.java

@@ -0,0 +1,60 @@
+package teammates.common.datatransfer;
+
+/**
+ * The FeedbackResponse result fetching type to indicate whether the fetch is for giver only, receiver only or both.
+ */
+public enum FeedbackResultFetchType {
+    /**
+     * Fetch by giver only.
+     */
+    GIVER(true, false),
+    /**
+     * Fetch by receiver only.
+     */
+    RECEIVER(false, true),
+    /**
+     * Fetch by both giver and receiver.
+     */
+    BOTH(true, true);
+
+    private final boolean isByGiver;
+    private final boolean isByReceiver;
+
+    FeedbackResultFetchType(boolean isByGiver, boolean isByReceiver) {
+        this.isByGiver = isByGiver;
+        this.isByReceiver = isByReceiver;
+    }
+
+    /**
+     * Parse the input string into a {@link FeedbackResultFetchType} and default to {@link FeedbackResultFetchType}.BOTH.
+     */
+    public static FeedbackResultFetchType parseFetchType(String typeString) {
+        if (typeString == null) {
+            return BOTH;
+        }
+
+        switch (typeString.toLowerCase()) {
+        case "giver":
+            return GIVER;
+        case "receiver":
+            return RECEIVER;
+        default:
+        }
+
+        return BOTH;
+    }
+
+    /**
+     * This result fetch should be by giver.
+     */
+    public boolean shouldFetchByGiver() {
+        return isByGiver;
+    }
+
+    /**
+     * This result fetch should be by receiver.
+     */
+    public boolean shouldFetchByReceiver() {
+        return isByReceiver;
+    }
+}

src/main/java/teammates/common/util/Const.java

@@ -131,6 +131,8 @@ public static class ParamsNames {
 
         public static final String FEEDBACK_RESULTS_GROUPBYSECTION = "frgroupbysection";
 
+        public static final String FEEDBACK_RESULTS_SECTION_BY_GIVER_RECEIVER = "frsessionbygiverreceiver";
+
         public static final String PREVIEWAS = "previewas";
 
         public static final String STUDENT_ID = "googleid";

src/main/java/teammates/logic/api/Logic.java

@@ -9,6 +9,7 @@
 import javax.annotation.Nullable;
 
 import teammates.common.datatransfer.DataBundle;
+import teammates.common.datatransfer.FeedbackResultFetchType;
 import teammates.common.datatransfer.NotificationTargetUser;
 import teammates.common.datatransfer.SessionResultsBundle;
 import teammates.common.datatransfer.attributes.AccountAttributes;
@@ -1248,17 +1249,18 @@ public Set<String> getGiverSetThatAnswerFeedbackSession(String courseId, String
     /**
      * Gets the session result for a feedback session.
      *
-     * @see FeedbackResponsesLogic#getSessionResultsForCourse(String, String, String, String, String)
+     * @see FeedbackResponsesLogic#getSessionResultsForCourse(
+     * String, String, String, String, String, FeedbackResultFetchType)
      */
     public SessionResultsBundle getSessionResultsForCourse(
             String feedbackSessionName, String courseId, String userEmail,
-            @Nullable String questionId, @Nullable String section) {
+            @Nullable String questionId, @Nullable String section, @Nullable FeedbackResultFetchType fetchType) {
         assert feedbackSessionName != null;
         assert courseId != null;
         assert userEmail != null;
 
         return feedbackResponsesLogic.getSessionResultsForCourse(
-                feedbackSessionName, courseId, userEmail, questionId, section);
+                feedbackSessionName, courseId, userEmail, questionId, section, fetchType);
     }
 
     /**

src/main/java/teammates/logic/core/FeedbackResponsesLogic.java

@@ -15,6 +15,7 @@
 import teammates.common.datatransfer.AttributesDeletionQuery;
 import teammates.common.datatransfer.CourseRoster;
 import teammates.common.datatransfer.FeedbackParticipantType;
+import teammates.common.datatransfer.FeedbackResultFetchType;
 import teammates.common.datatransfer.SessionResultsBundle;
 import teammates.common.datatransfer.attributes.FeedbackQuestionAttributes;
 import teammates.common.datatransfer.attributes.FeedbackResponseAttributes;
@@ -110,14 +111,16 @@ List<FeedbackResponseAttributes> getFeedbackResponsesForSession(
      * @param feedbackSessionName the name if the session
      * @param courseId the course ID of the session
      * @param section if null, will retrieve all responses in the session
+     * @param fetchType if not null, will retrieve responses by giver, receiver sections, or both
      * @return a list of responses
      */
     public List<FeedbackResponseAttributes> getFeedbackResponsesForSessionInSection(
-            String feedbackSessionName, String courseId, @Nullable String section) {
+            String feedbackSessionName, String courseId, @Nullable String section,
+            @Nullable FeedbackResultFetchType fetchType) {
         if (section == null) {
             return getFeedbackResponsesForSession(feedbackSessionName, courseId);
         }
-        return frDb.getFeedbackResponsesForSessionInSection(feedbackSessionName, courseId, section);
+        return frDb.getFeedbackResponsesForSessionInSection(feedbackSessionName, courseId, section, fetchType);
     }
 
     /**
@@ -142,11 +145,11 @@ public boolean areThereResponsesForQuestion(String feedbackQuestionId) {
      * @return a list of responses
      */
     public List<FeedbackResponseAttributes> getFeedbackResponsesForQuestionInSection(
-            String feedbackQuestionId, @Nullable String section) {
+            String feedbackQuestionId, @Nullable String section, FeedbackResultFetchType fetchType) {
         if (section == null) {
             return getFeedbackResponsesForQuestion(feedbackQuestionId);
         }
-        return frDb.getFeedbackResponsesForQuestionInSection(feedbackQuestionId, section);
+        return frDb.getFeedbackResponsesForQuestionInSection(feedbackQuestionId, section, fetchType);
     }
 
     /**
@@ -445,11 +448,12 @@ private SessionResultsBundle buildResultsBundle(
      * @param instructorEmail the instructor viewing the feedback session
      * @param questionId if not null, will only return partial bundle for the question
      * @param section if not null, will only return partial bundle for the section
+     * @param fetchType if not null, will fetch responses by giver, receiver sections, or both
      * @return the session result bundle
      */
     public SessionResultsBundle getSessionResultsForCourse(
             String feedbackSessionName, String courseId, String instructorEmail,
-            @Nullable String questionId, @Nullable String section) {
+            @Nullable String questionId, @Nullable String section, @Nullable FeedbackResultFetchType fetchType) {
         CourseRoster roster = new CourseRoster(
                 studentsLogic.getStudentsForCourse(courseId),
                 instructorsLogic.getInstructorsForCourse(courseId));
@@ -462,9 +466,9 @@ public SessionResultsBundle getSessionResultsForCourse(
         List<FeedbackResponseAttributes> allResponses;
         // load all response for instructors and passively filter them later
         if (questionId == null) {
-            allResponses = getFeedbackResponsesForSessionInSection(feedbackSessionName, courseId, section);
+            allResponses = getFeedbackResponsesForSessionInSection(feedbackSessionName, courseId, section, fetchType);
         } else {
-            allResponses = getFeedbackResponsesForQuestionInSection(questionId, section);
+            allResponses = getFeedbackResponsesForQuestionInSection(questionId, section, fetchType);
         }
         RequestTracer.checkRemainingTime();
 

src/main/java/teammates/storage/api/FeedbackResponsesDb.java

@@ -3,7 +3,6 @@
 import static com.googlecode.objectify.ObjectifyService.ofy;
 
 import java.time.Instant;
-import java.util.ArrayList;
 import java.util.Collection;
 import java.util.HashMap;
 import java.util.HashSet;
@@ -16,6 +15,7 @@
 import com.googlecode.objectify.cmd.Query;
 
 import teammates.common.datatransfer.AttributesDeletionQuery;
+import teammates.common.datatransfer.FeedbackResultFetchType;
 import teammates.common.datatransfer.attributes.FeedbackResponseAttributes;
 import teammates.common.exception.EntityAlreadyExistsException;
 import teammates.common.exception.EntityDoesNotExistException;
@@ -96,11 +96,12 @@ public FeedbackResponseAttributes getFeedbackResponse(
      * Gets all feedback responses of a question in a specific section.
      */
     public List<FeedbackResponseAttributes> getFeedbackResponsesForQuestionInSection(
-            String feedbackQuestionId, String section) {
+            String feedbackQuestionId, String section, FeedbackResultFetchType fetchType) {
         assert feedbackQuestionId != null;
         assert section != null;
+        assert fetchType != null;
 
-        return makeAttributes(getFeedbackResponseEntitiesForQuestionInSection(feedbackQuestionId, section));
+        return makeAttributes(getFeedbackResponseEntitiesForQuestionInSection(feedbackQuestionId, section, fetchType));
     }
 
     /**
@@ -138,14 +139,17 @@ public List<FeedbackResponseAttributes> getFeedbackResponsesForSession(
 
     /**
      * Gets all responses given to/from a section in a feedback session in a course.
+     * Optionally, retrieves by either giver, receiver sections, or both.
      */
     public List<FeedbackResponseAttributes> getFeedbackResponsesForSessionInSection(
-            String feedbackSessionName, String courseId, String section) {
+            String feedbackSessionName, String courseId, String section, FeedbackResultFetchType fetchType) {
         assert feedbackSessionName != null;
         assert courseId != null;
         assert section != null;
+        assert fetchType != null;
 
-        return makeAttributes(getFeedbackResponseEntitiesForSessionInSection(feedbackSessionName, courseId, section));
+        return makeAttributes(getFeedbackResponseEntitiesForSessionInSection(
+                feedbackSessionName, courseId, section, fetchType));
     }
 
     /**
@@ -322,19 +326,21 @@ private FeedbackResponse getFeedbackResponseEntity(String feedbackResponseId) {
     }
 
     private Collection<FeedbackResponse> getFeedbackResponseEntitiesForQuestionInSection(
-                String feedbackQuestionId, String section) {
-        List<FeedbackResponse> allResponses = new ArrayList<>();
+            String feedbackQuestionId, String section, FeedbackResultFetchType fetchType) {
+        Map<String, FeedbackResponse> allResponses = new HashMap<>();
 
-        allResponses.addAll(load()
-                .filter("feedbackQuestionId =", feedbackQuestionId)
-                .filter("giverSection =", section)
-                .list());
-        allResponses.addAll(load()
-                .filter("feedbackQuestionId =", feedbackQuestionId)
-                .filter("receiverSection =", section)
-                .list());
+        if (fetchType.shouldFetchByGiver()) {
+            load().filter("feedbackQuestionId =", feedbackQuestionId)
+                    .filter("giverSection =", section)
+                    .forEach(resp -> allResponses.put(resp.getId(), resp));
+        }
+        if (fetchType.shouldFetchByReceiver()) {
+            load().filter("feedbackQuestionId =", feedbackQuestionId)
+                    .filter("receiverSection =", section)
+                    .forEach(resp -> allResponses.put(resp.getId(), resp));
+        }
 
-        return removeDuplicates(allResponses);
+        return allResponses.values();
     }
 
     private List<FeedbackResponse> getFeedbackResponseEntitiesForQuestion(String feedbackQuestionId) {
@@ -351,30 +357,24 @@ private List<FeedbackResponse> getFeedbackResponseEntitiesForSession(String feed
     }
 
     private Collection<FeedbackResponse> getFeedbackResponseEntitiesForSessionInSection(
-            String feedbackSessionName, String courseId, String section) {
-        List<FeedbackResponse> allResponse = new ArrayList<>();
-
-        allResponse.addAll(load()
-                .filter("feedbackSessionName =", feedbackSessionName)
-                .filter("courseId =", courseId)
-                .filter("giverSection =", section)
-                .list());
-
-        allResponse.addAll(load()
-                .filter("feedbackSessionName =", feedbackSessionName)
-                .filter("courseId =", courseId)
-                .filter("receiverSection =", section)
-                .list());
-
-        return removeDuplicates(allResponse);
-    }
+            String feedbackSessionName, String courseId, String section, FeedbackResultFetchType fetchType) {
+        Map<String, FeedbackResponse> allResponse = new HashMap<>();
+
+        if (fetchType.shouldFetchByGiver()) {
+            load().filter("feedbackSessionName =", feedbackSessionName)
+                    .filter("courseId =", courseId)
+                    .filter("giverSection =", section)
+                    .forEach(resp -> allResponse.put(resp.getId(), resp));
+        }
 
-    private Collection<FeedbackResponse> removeDuplicates(Collection<FeedbackResponse> responses) {
-        Map<String, FeedbackResponse> uniqueResponses = new HashMap<>();
-        for (FeedbackResponse response : responses) {
-            uniqueResponses.put(response.getId(), response);
+        if (fetchType.shouldFetchByReceiver()) {
+            load().filter("feedbackSessionName =", feedbackSessionName)
+                    .filter("courseId =", courseId)
+                    .filter("receiverSection =", section)
+                    .forEach(resp -> allResponse.put(resp.getId(), resp));
         }
-        return uniqueResponses.values();
+
+        return allResponse.values();
     }
 
     private List<FeedbackResponse> getFeedbackResponseEntitiesFromGiverForQuestion(

src/main/java/teammates/ui/webapi/GetSessionResultsAction.java

@@ -1,5 +1,6 @@
 package teammates.ui.webapi;
 
+import teammates.common.datatransfer.FeedbackResultFetchType;
 import teammates.common.datatransfer.SessionResultsBundle;
 import teammates.common.datatransfer.attributes.FeedbackSessionAttributes;
 import teammates.common.datatransfer.attributes.InstructorAttributes;
@@ -61,6 +62,8 @@ public JsonResult execute() {
         // Allow additional filter by question ID (equivalent to question number) and section name
         String questionId = getRequestParamValue(Const.ParamsNames.FEEDBACK_QUESTION_ID);
         String selectedSection = getRequestParamValue(Const.ParamsNames.FEEDBACK_RESULTS_GROUPBYSECTION);
+        FeedbackResultFetchType fetchType = FeedbackResultFetchType.parseFetchType(
+                getRequestParamValue(Const.ParamsNames.FEEDBACK_RESULTS_SECTION_BY_GIVER_RECEIVER));
 
         SessionResultsBundle bundle;
         InstructorAttributes instructor;
@@ -71,7 +74,7 @@ public JsonResult execute() {
             instructor = logic.getInstructorForGoogleId(courseId, userInfo.id);
 
             bundle = logic.getSessionResultsForCourse(feedbackSessionName, courseId, instructor.getEmail(),
-                    questionId, selectedSection);
+                    questionId, selectedSection, fetchType);
 
             return new JsonResult(SessionResultsData.initForInstructor(bundle));
         case INSTRUCTOR_RESULT: