[#12048] Migrate SubmitFeedbackResponseAction's tests

src/it/java/teammates/it/ui/webapi/BaseActionIT.java

@@ -29,7 +29,7 @@
 import teammates.logic.api.MockRecaptchaVerifier;
 import teammates.logic.api.MockTaskQueuer;
 import teammates.logic.api.MockUserProvision;
-import teammates.sqllogic.api.Logic;
+import teammates.sqllogic.api.LogicExtension;
 import teammates.storage.sqlentity.Account;
 import teammates.storage.sqlentity.Course;
 import teammates.storage.sqlentity.Instructor;
@@ -63,7 +63,7 @@ public abstract class BaseActionIT<T extends Action> extends BaseTestCaseWithSql
     static final String DELETE = HttpDelete.METHOD_NAME;
 
     SqlDataBundle typicalBundle = getTypicalSqlDataBundle();
-    Logic logic = Logic.inst();
+    LogicExtension logic = new LogicExtension();
     MockTaskQueuer mockTaskQueuer = new MockTaskQueuer();
     MockEmailSender mockEmailSender = new MockEmailSender();
     MockLogsProcessor mockLogsProcessor = new MockLogsProcessor();

src/it/resources/data/typicalDataBundle.json

@@ -698,11 +698,33 @@
       "isClosedEmailSent": false,
       "isPublishedEmailSent": true
     },
-    "session2InTypicalCourse": {
+    "closedSessionInCourse1": {
       "id": "00000000-0000-4000-8000-000000000702",
       "course": {
         "id": "course-1"
       },
+      "name": "Closed Session",
+      "creatorEmail": "[email protected]",
+      "instructions": "Please please fill in the following questions.",
+      "startTime": "2013-06-01T22:00:00Z",
+      "endTime": "2013-06-01T22:00:00Z",
+      "sessionVisibleFromTime": "2013-03-20T22:00:00Z",
+      "resultsVisibleFromTime": "2013-04-29T22:00:00Z",
+      "gracePeriod": 5,
+      "isOpeningEmailEnabled": true,
+      "isClosingEmailEnabled": true,
+      "isPublishedEmailEnabled": true,
+      "isOpeningSoonEmailSent": true,
+      "isOpenEmailSent": true,
+      "isClosingSoonEmailSent": false,
+      "isClosedEmailSent": false,
+      "isPublishedEmailSent": false
+    },
+    "session2InTypicalCourse": {
+      "id": "00000000-0000-4000-8000-000000000703",
+      "course": {
+        "id": "course-1"
+      },
       "name": "Second feedback session",
       "creatorEmail": "[email protected]",
       "instructions": "Please please fill in the following questions.",
@@ -721,7 +743,7 @@
       "isPublishedEmailSent": false
     },
     "unpublishedSession1InTypicalCourse": {
-      "id": "00000000-0000-4000-8000-000000000703",
+      "id": "00000000-0000-4000-8000-000000000704",
       "course": {
         "id": "course-1"
       },
@@ -743,7 +765,7 @@
       "isPublishedEmailSent": false
     },
     "ongoingSession1InCourse1": {
-      "id": "00000000-0000-4000-8000-000000000704",
+      "id": "00000000-0000-4000-8000-000000000705",
       "course": {
         "id": "course-1"
       },
@@ -765,7 +787,7 @@
       "isPublishedEmailSent": true
     },
     "ongoingSession2InCourse1": {
-      "id": "00000000-0000-4000-8000-000000000705",
+      "id": "00000000-0000-4000-8000-000000000706",
       "course": {
         "id": "course-1"
       },
@@ -787,7 +809,7 @@
       "isPublishedEmailSent": true
     },
     "ongoingSession3InCourse1": {
-      "id": "00000000-0000-4000-8000-000000000706",
+      "id": "00000000-0000-4000-8000-000000000707",
       "course": {
         "id": "course-1"
       },
@@ -809,7 +831,7 @@
       "isPublishedEmailSent": true
     },
     "ongoingSession1InCourse3": {
-      "id": "00000000-0000-4000-8000-000000000707",
+      "id": "00000000-0000-4000-8000-000000000708",
       "course": {
         "id": "course-3"
       },
@@ -831,7 +853,7 @@
       "isPublishedEmailSent": true
     },
     "ongoingSession2InCourse3": {
-      "id": "00000000-0000-4000-8000-000000000707",
+      "id": "00000000-0000-4000-8000-000000000709",
       "course": {
         "id": "course-3"
       },
@@ -1019,6 +1041,31 @@
       "showResponsesTo": ["INSTRUCTORS"],
       "showGiverNameTo": ["INSTRUCTORS"],
       "showRecipientNameTo": ["INSTRUCTORS"]
+    },
+    "qn1InClosedSessionInCourse1": {
+      "id": "00000000-0000-4000-8001-000000000807",
+      "feedbackSession": {
+        "id": "00000000-0000-4000-8000-000000000702"
+      },
+      "questionDetails": {
+        "recommendedLength": 100,
+        "questionType": "TEXT",
+        "questionText": "Give feedback to yourself."
+      },
+      "description": "This is a mcq question.",
+      "questionNumber": 1,
+      "giverType": "INSTRUCTORS",
+      "recipientType": "SELF",
+      "numOfEntitiesToGiveFeedbackTo": 1,
+      "showResponsesTo": [
+        "RECEIVER"
+      ],
+      "showGiverNameTo": [
+        "RECEIVER"
+      ],
+      "showRecipientNameTo": [
+        "RECEIVER"
+      ]
     }
   },
   "feedbackResponses": {

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

@@ -8,6 +8,7 @@
 
 import javax.annotation.Nullable;
 
+import teammates.common.datatransfer.DataBundle;
 import teammates.common.datatransfer.FeedbackQuestionRecipient;
 import teammates.common.datatransfer.NotificationStyle;
 import teammates.common.datatransfer.NotificationTargetUser;
@@ -19,6 +20,7 @@
 import teammates.common.exception.InvalidParametersException;
 import teammates.common.exception.SearchServiceException;
 import teammates.common.exception.StudentUpdateException;
+import teammates.logic.core.StudentsLogic;
 import teammates.sqllogic.core.AccountRequestsLogic;
 import teammates.sqllogic.core.AccountsLogic;
 import teammates.sqllogic.core.CoursesLogic;

src/main/java/teammates/sqllogic/api/LogicExtension.java

@@ -0,0 +1,29 @@
+package teammates.sqllogic.api;
+
+import java.util.UUID;
+
+import teammates.storage.sqlentity.FeedbackQuestion;
+import teammates.storage.sqlentity.FeedbackResponse;
+
+/**
+ * Holds additional methods for {@link Logic} used only in tests.
+ */
+public class LogicExtension extends Logic {
+
+    /**
+     * Gets the unique feedback question based on sessionId and questionNumber.
+     */
+    public FeedbackQuestion getFeedbackQuestionForSessionQuestionNumber(UUID sessionId, int questionNumber) {
+        return feedbackQuestionsLogic.getFeedbackQuestionForSessionQuestionNumber(sessionId, questionNumber);
+    }
+
+    /**
+     * Gets a single question corresponding to question-giver-receiver.
+     */
+    public FeedbackResponse getFeedbackResponseForQuestionGiverRecipient(
+        UUID feedbackQuestionId,
+        String giver,
+        String recipient) {
+        return feedbackResponsesLogic.getFeedbackResponseForQuestionGiverRecipient(feedbackQuestionId, giver, recipient);
+    }    
+}

src/main/java/teammates/sqllogic/core/FeedbackQuestionsLogic.java

@@ -98,6 +98,13 @@ public FeedbackQuestion getFeedbackQuestion(UUID id) {
         return fqDb.getFeedbackQuestion(id);
     }
 
+    /**
+     * Gets the unique feedback question based on sessionId and questionNumber.
+     */
+    public FeedbackQuestion getFeedbackQuestionForSessionQuestionNumber(UUID sessionId, int questionNumber) {
+        return fqDb.getFeedbackQuestionForSessionQuestionNumber(sessionId, questionNumber);
+    }
+
     /**
      * Gets a {@link List} of every FeedbackQuestion in the given session.
      */

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

@@ -66,6 +66,16 @@ public FeedbackResponse getFeedbackResponse(UUID frId) {
         return frDb.getFeedbackResponse(frId);
     }
 
+    /**
+     * Gets a single question corresponding to question-giver-receiver.
+     */
+    public FeedbackResponse getFeedbackResponseForQuestionGiverRecipient(
+            UUID feedbackQuestionId,
+            String giver,
+            String recipient) {
+        return frDb.getFeedbackResponseForQuestionGiverRecipient(feedbackQuestionId, giver, recipient);
+    }
+
     /**
      * Returns true if the responses of the question are visible to students.
      */

src/main/java/teammates/storage/sqlapi/EntitiesDb.java

@@ -1,6 +1,8 @@
 
 package teammates.storage.sqlapi;
 
+import com.google.common.base.Objects;
+
 import teammates.common.util.HibernateUtil;
 import teammates.common.util.Logger;
 import teammates.storage.sqlentity.BaseEntity;
@@ -43,4 +45,11 @@ protected void delete(BaseEntity entity) {
         HibernateUtil.remove(entity);
         log.info("Entity deleted: " + entity.toString());
     }
+
+    /**
+     * Checks whether two values are the same.
+     */
+    <T> boolean hasSameValue(T oldValue, T newValue) {
+        return Objects.equal(oldValue, newValue);
+    }
 }

src/main/java/teammates/storage/sqlapi/FeedbackQuestionsDb.java

@@ -64,6 +64,22 @@ public List<FeedbackQuestion> getFeedbackQuestionsForSession(UUID fdId) {
         return HibernateUtil.createQuery(cq).getResultList();
     }
 
+    /**
+     * Gets the unique feedback question based on sessionId and questionNumber.
+     */
+    public FeedbackQuestion getFeedbackQuestionForSessionQuestionNumber(UUID sessionId, int questionNumber) {
+        CriteriaBuilder cb = HibernateUtil.getCriteriaBuilder();
+        CriteriaQuery<FeedbackQuestion> cq = cb.createQuery(FeedbackQuestion.class);
+        Root<FeedbackQuestion> fqRoot = cq.from(FeedbackQuestion.class);
+        Join<FeedbackQuestion, FeedbackSession> fqJoin = fqRoot.join("feedbackSession");
+        cq.select(fqRoot).where(
+                cb.and(
+                    cb.equal(fqJoin.get("id"), sessionId),
+                    cb.equal(fqRoot.get("questionNumber"), questionNumber)
+                ));
+        return HibernateUtil.createQuery(cq).getResultStream().findFirst().orElse(null);
+    }
+
     /**
      * Gets a list of feedback questions by {@code feedbackSession} and {@code giverType}.
      *

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

@@ -48,6 +48,29 @@ public FeedbackResponse getFeedbackResponse(UUID frId) {
         return HibernateUtil.get(FeedbackResponse.class, frId);
     }
 
+    /**
+     * Gets the unique feedback response by question-giver-receiver.
+     */
+    public FeedbackResponse getFeedbackResponseForQuestionGiverRecipient(
+            UUID feedbackSessionId,
+            String giver,
+            String recipient) {
+        assert feedbackSessionId != null;
+
+        CriteriaBuilder cb = HibernateUtil.getCriteriaBuilder();
+        CriteriaQuery<FeedbackResponse> cq = cb.createQuery(FeedbackResponse.class);
+        Root<FeedbackResponse> root = cq.from(FeedbackResponse.class);
+        Join<FeedbackResponse, FeedbackSession> frJoin = root.join("feedbackSession");
+        cq.select(root)
+                .where(cb.and(
+                        cb.equal(frJoin.get("id"), feedbackSessionId),
+                        cb.equal(root.get("giver"), giver),
+                        cb.equal(root.get("recipient"), recipient)
+                        ));
+
+        return HibernateUtil.createQuery(cq).getSingleResult();
+    }
+
     /**
      * Gets all responses given by a user in a course.
      */

src/main/java/teammates/storage/sqlentity/FeedbackQuestion.java

@@ -243,6 +243,10 @@ public void setFeedbackSession(FeedbackSession feedbackSession) {
         this.feedbackSession = feedbackSession;
     }
 
+    public String getFeedbackSessionName() {
+        return feedbackSession.getName();
+    }
+
     public List<FeedbackResponse> getFeedbackResponses() {
         return feedbackResponses;
     }

src/main/java/teammates/storage/sqlentity/FeedbackResponse.java

@@ -184,6 +184,10 @@ public void setFeedbackQuestion(FeedbackQuestion feedbackQuestion) {
         this.feedbackQuestion = feedbackQuestion;
     }
 
+    public UUID getFeedbackQuestionId() {
+        return feedbackQuestion.getId();
+    }
+
     public List<FeedbackResponseComment> getFeedbackResponseComments() {
         return feedbackResponseComments;
     }

src/main/java/teammates/storage/sqlentity/FeedbackSession.java

@@ -234,6 +234,10 @@ public void setCourse(Course course) {
         this.course = course;
     }
 
+    public String getCourseId() {
+        return course.getId();
+    }
+
     public String getName() {
         return name;
     }

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

@@ -1,11 +1,14 @@
 package teammates.ui.webapi;
 
+import org.hibernate.sql.results.LoadingLogger_.logger;
+
 import teammates.common.datatransfer.FeedbackParticipantType;
 import teammates.common.datatransfer.attributes.FeedbackQuestionAttributes;
 import teammates.common.datatransfer.attributes.FeedbackSessionAttributes;
 import teammates.common.datatransfer.attributes.InstructorAttributes;
 import teammates.common.datatransfer.attributes.StudentAttributes;
 import teammates.common.util.Const;
+import teammates.common.util.Logger;
 import teammates.common.util.StringHelper;
 import teammates.storage.sqlentity.FeedbackQuestion;
 import teammates.storage.sqlentity.FeedbackSession;
@@ -299,6 +302,8 @@ void verifyNotPreview() throws UnauthorizedAccessException {
      */
     void verifySessionOpenExceptForModeration(FeedbackSessionAttributes feedbackSession) throws UnauthorizedAccessException {
         String moderatedPerson = getRequestParamValue(Const.ParamsNames.FEEDBACK_SESSION_MODERATED_PERSON);
+        boolean isOpened = feedbackSession.isOpened();
+        boolean isInGrace = feedbackSession.isInGracePeriod();
 
         if (StringHelper.isEmpty(moderatedPerson) && !(feedbackSession.isOpened() || feedbackSession.isInGracePeriod())) {
             throw new UnauthorizedAccessException("The feedback session is not available for submission", true);
@@ -312,7 +317,8 @@ void verifySessionOpenExceptForModeration(FeedbackSessionAttributes feedbackSess
      */
     void verifySessionOpenExceptForModeration(FeedbackSession feedbackSession) throws UnauthorizedAccessException {
         String moderatedPerson = getRequestParamValue(Const.ParamsNames.FEEDBACK_SESSION_MODERATED_PERSON);
-
+        boolean isOpened = feedbackSession.isOpened();
+        boolean isInGrace = feedbackSession.isInGracePeriod();
         if (StringHelper.isEmpty(moderatedPerson) && !(feedbackSession.isOpened() || feedbackSession.isInGracePeriod())) {
             throw new UnauthorizedAccessException("The feedback session is not available for submission", true);
         }