Redirect to homepage if run is not active.

Author: hirokiterashima

src/main/java/org/wise/portal/presentation/web/controllers/survey/SurveyAPIController.java

@@ -62,16 +62,21 @@ public void launchSurveyRun(@PathVariable String code, HttpServletResponse respo
       HttpServletRequest request) throws AuthorityNotFoundException, IOException,
       DuplicateUsernameException, ObjectNotFoundException, PeriodNotFoundException,
       StudentUserAlreadyAssociatedWithRunException, RunHasEndedException {
-
     Projectcode projectCode = new Projectcode(code);
     Run run = runService.retrieveRunByRuncode(projectCode.getRuncode());
-    if (run.isSurvey()) {
+    if (run.isSurvey() && isActive(run)) {
       handleSurveyLaunched(response, request, run, projectCode);
     } else {
       sendRedirect(response, "/");
     }
   }
 
+  private boolean isActive(Run run) {
+    Date now = new Date();
+    Date endTime = run.getEndtime();
+    return run.getStarttime().before(now) && (endTime == null || endTime.after(now));
+  }
+
   private void handleSurveyLaunched(HttpServletResponse response, HttpServletRequest request,
       Run run, Projectcode projectCode) throws AuthorityNotFoundException, IOException,
       DuplicateUsernameException, ObjectNotFoundException, PeriodNotFoundException,
@@ -103,11 +108,11 @@ private Object getSecurityContextHolderPrincipal() {
     return SecurityContextHolder.getContext().getAuthentication().getPrincipal();
   }
 
-  private Boolean isStudentAssociatedWithRun(Run run, StudentUserDetails principal) {
+  private boolean isStudentAssociatedWithRun(Run run, StudentUserDetails principal) {
     return run.isStudentAssociatedToThisRun(userService.retrieveStudentById((principal).getId()));
   }
 
-  private Boolean underWorkgroupLimit(Run run) {
+  private boolean underWorkgroupLimit(Run run) {
     return workgroupService.getWorkgroupsForRun(run).size() <= 1000;
   }
 

src/test/java/org/wise/portal/presentation/web/controllers/survey/SurveyAPIControllerTest.java

@@ -7,6 +7,7 @@
 import static org.easymock.EasyMock.verify;
 
 import java.util.ArrayList;
+import java.util.Date;
 import java.util.List;
 import java.util.Set;
 import java.util.TreeSet;
@@ -90,6 +91,7 @@ public void setUp() {
     run = new RunImpl();
     run.setId(1L);
     run.setIsSurvey(true);
+    run.setStarttime(new Date(System.currentTimeMillis() - 3600 * 1000));
     Set<Group> periods = new TreeSet<Group>();
     for (String periodname : periodnames) {
       Group period = new PersistentGroup();
@@ -126,6 +128,32 @@ public void launchSurveyRun_NotASurvey_RedirectHomePage() throws Exception {
     verify(runService);
   }
 
+  @Test
+  public void launchSurveyRun_RunInFuture_RedirectHomePage() throws Exception {
+    httpServletResponse.sendRedirect("/");
+    expectLastCall();
+    replay(httpServletResponse);
+    run.setStarttime(new Date(System.currentTimeMillis() + 3600 * 1000)); // Future start time
+    expect(runService.retrieveRunByRuncode("dog1234")).andReturn(run);
+    replay(runService);
+    surveyAPIController.launchSurveyRun("dog1234-1", httpServletResponse, httpServletRequest);
+    verify(httpServletResponse);
+    verify(runService);
+  }
+
+  @Test
+  public void launchSurveyRun_RunInPast_RedirectHomePage() throws Exception {
+    httpServletResponse.sendRedirect("/");
+    expectLastCall();
+    replay(httpServletResponse);
+    run.setEndtime(new Date(System.currentTimeMillis() - 3600 * 1000)); // Past end time
+    expect(runService.retrieveRunByRuncode("dog1234")).andReturn(run);
+    replay(runService);
+    surveyAPIController.launchSurveyRun("dog1234-1", httpServletResponse, httpServletRequest);
+    verify(httpServletResponse);
+    verify(runService);
+  }
+
   @Test
   public void launchSurveyRun_AlreadyAssociatedWithRun_RedirectUnit() throws Exception {
     httpServletResponse.sendRedirect("/student/unit/1");