[TEAMMATES#11737] Change way of getting giver set in FeedbackResponse…

…sLogic
u6656793 · Oct 28, 2022 · 6fc23b1 · 6fc23b1
1 parent 1119391
commit 6fc23b1
Show file tree

Hide file tree

Showing 3 changed files with 18 additions and 9 deletions.
diff --git a/src/main/java/teammates/logic/core/FeedbackResponsesLogic.java b/src/main/java/teammates/logic/core/FeedbackResponsesLogic.java
@@ -66,7 +66,12 @@ void initLogicDependencies() {
      * Gets a set of giver identifiers that has at least one response under a feedback session.
      */
     public Set<String> getGiverSetThatAnswerFeedbackSession(String courseId, String feedbackSessionName) {
-        return frDb.getGiverSetThatAnswerFeedbackSession(courseId, feedbackSessionName);
+        Set<String> giverSet = frDb.getGiverSetThatAnswerFeedbackSession(courseId, feedbackSessionName);
+        List<String> instructorSet = instructorsLogic.getInstructorEmailsForCourse(courseId);
+        if (!fqLogic.sessionHasQuestionsForGiverType(feedbackSessionName,courseId,FeedbackParticipantType.INSTRUCTORS)) {
+            giverSet.addAll(instructorSet);
+        }
+        return giverSet;
     }
 
     /**

diff --git a/src/main/java/teammates/logic/core/FeedbackSessionsLogic.java b/src/main/java/teammates/logic/core/FeedbackSessionsLogic.java
@@ -248,15 +248,19 @@ public boolean isFeedbackSessionAttemptedByStudent(FeedbackSessionAttributes fsa
      * <p>If there is no question for instructors, the feedback session is considered as attempted.</p>
      */
     public boolean isFeedbackSessionAttemptedByInstructor(FeedbackSessionAttributes fsa, String userEmail) {
-        if (frLogic.hasGiverRespondedForSession(userEmail, fsa.getFeedbackSessionName(), fsa.getCourseId())) {
+        String fbSN = fsa.getFeedbackSessionName();
+        String courseId = fsa.getCourseId();
+        if (frLogic.hasGiverRespondedForSession(userEmail, fbSN, courseId)) {
             return true;
         }
 
         // if there is no question for instructor, session is attempted
-//        return !fqLogic.hasFeedbackQuestionsForInstructors(fsa, fsa.isCreator(userEmail));
-        fqLogic.hasFeedbackQuestionsForInstructors(fsa,fsa.isCreator(userEmail));
-        return  !fqLogic.sessionHasQuestionsForGiverType(fsa.getFeedbackSessionName(),fsa.getCourseId(),FeedbackParticipantType.INSTRUCTORS)
-                || !fqLogic.sessionHasQuestionsForGiverType(fsa.getFeedbackSessionName(),fsa.getCourseId(),FeedbackParticipantType.SELF);
+        //        return !fqLogic.hasFeedbackQuestionsForInstructors(fsa, fsa.isCreator(userEmail));
+        if (fqLogic.sessionHasQuestionsForGiverType(fbSN, courseId, FeedbackParticipantType.GIVER)) {
+            return true;
+        }
+        fqLogic.hasFeedbackQuestionsForInstructors(fsa, fsa.isCreator(userEmail));
+        return !fqLogic.sessionHasQuestionsForGiverType(fbSN, courseId, FeedbackParticipantType.INSTRUCTORS);
     }
 
     /**

diff --git a/src/main/java/teammates/storage/api/FeedbackQuestionsDb.java b/src/main/java/teammates/storage/api/FeedbackQuestionsDb.java
@@ -216,13 +216,13 @@ private List<FeedbackQuestion> getFeedbackQuestionEntitiesForGiverType(
 
     private boolean hasFeedbackQuestionEntitiesForGiverType(
             String feedbackSessionName, String courseId, FeedbackParticipantType giverType) {
-        return load()
+        return !load()
                 .filter("feedbackSessionName =", feedbackSessionName)
                 .filter("courseId =", courseId)
                 .filter("giverType =", giverType)
                 .keys()
-                .list()
-                .size() != 0;
+                .list().isEmpty();
+                //.size() != 0
     }
 
     @Override