Handle submitting old exercises

Update end point URLs for exercises which were downloaded with the old client and thus had old submission URLs. Also handle showToUserException which may be tthrown by core

Author: Irene

src/main/java/fi/helsinki/cs/tmc/cli/backend/TmcUtil.java

@@ -13,6 +13,7 @@
 import fi.helsinki.cs.tmc.core.domain.submission.SubmissionResult;
 import fi.helsinki.cs.tmc.core.exceptions.FailedHttpResponseException;
 import fi.helsinki.cs.tmc.core.exceptions.ObsoleteClientException;
+import fi.helsinki.cs.tmc.core.exceptions.ShowToUserException;
 import fi.helsinki.cs.tmc.core.holders.TmcSettingsHolder;
 import fi.helsinki.cs.tmc.langs.abstraction.ValidationResult;
 import fi.helsinki.cs.tmc.langs.domain.RunResult;
@@ -199,7 +200,8 @@ public static ValidationResult runCheckStyle(CliContext ctx, Exercise exercise)
         }
     }
 
-    public static List<Exercise> getCourseExercises(CliContext ctx, Course course) {
+    public static List<Exercise> getCourseExercises(CliContext ctx) {
+        Course course = ctx.getCourseInfo().getCourse();
         try {
             TmcCore tmcCore = ctx.getTmcCore();
             Course updatedCourse = tmcCore.getCourseDetails(ProgressObserver.NULL_OBSERVER, course).call();
@@ -223,17 +225,6 @@ public static boolean sendFeedback(
         }
     }
 
-    public static Organization getOrganizationForCourse(CliContext ctx, Course course) {
-        TmcCore tmcCore = ctx.getTmcCore();
-        Callable<Organization> callable = tmcCore.getCourseOrganization(ProgressObserver.NULL_OBSERVER, course);
-        try {
-            return callable.call();
-        } catch (Exception e) {
-            logger.error("Could not get organization for course " + course.getName());
-            return null;
-        }
-    }
-
     private static void handleTmcExceptions(CliContext ctx, Exception exception) {
         Io io = ctx.getIo();
         Throwable cause = exception.getCause();
@@ -279,6 +270,12 @@ private static void handleTmcExceptions(CliContext ctx, Exception exception) {
             return;
         }
 
+        if (cause instanceof ShowToUserException) {
+            logger.error(exception.getMessage());
+            io.errorln(cause.getMessage());
+            return;
+        }
+
         logger.error("Command failed in tmc-core", exception);
         io.errorln("Command failed, check tmc-cli.log file for more info");
     }

src/main/java/fi/helsinki/cs/tmc/cli/command/SubmitCommand.java

@@ -28,6 +28,7 @@
 import org.slf4j.LoggerFactory;
 
 import java.net.URI;
+import java.net.URISyntaxException;
 import java.nio.file.Path;
 import java.util.ArrayList;
 import java.util.List;
@@ -42,6 +43,8 @@ public class SubmitCommand extends AbstractCommand {
     private boolean showAll;
     private boolean showDetails;
     private boolean filterUncompleted;
+    private static int API_VERSION = 8;
+    private Path courseInfoFile;
 
     @Override
     public void getOptions(Options options) {
@@ -55,6 +58,7 @@ public void getOptions(Options options) {
     public void run(CliContext context, CommandLine args) {
         this.ctx = context;
         this.io = ctx.getIo();
+        WorkDir workDir = ctx.getWorkDir();
 
         String[] exercisesFromArgs = parseArgs(args);
         if (exercisesFromArgs == null) {
@@ -65,7 +69,6 @@ public void run(CliContext context, CommandLine args) {
             return;
         }
 
-        WorkDir workDir = ctx.getWorkDir();
         if (exercisesFromArgs.length == 0 && workDir.getExercises().size() != 1) {
             io.println("Please give exercise to submit as argument");
             return;
@@ -78,6 +81,18 @@ public void run(CliContext context, CommandLine args) {
             }
         }
 
+        CourseInfo info = ctx.getCourseInfo();
+        Course currentCourse = info.getCourse();
+        if (currentCourse == null) {
+            return;
+        }
+
+        courseInfoFile = workDir.getConfigFile();
+
+        if (apiUrlIsOutdated(currentCourse)) {
+            updateCourseAndExercises();
+        }
+
         List<Exercise> exercises;
         if (filterUncompleted) {
             workDir.addPath(workDir.getCourseDirectory());
@@ -95,11 +110,6 @@ public void run(CliContext context, CommandLine args) {
             return;
         }
 
-        CourseInfo info = ctx.getCourseInfo();
-        Course currentCourse = info.getCourse();
-        if (currentCourse == null) {
-            return;
-        }
 
         Color color1 = ctx.getColorProperty("testresults-left", ctx.getApp());
         Color color2 = ctx.getColorProperty("testresults-right", ctx.getApp());
@@ -148,7 +158,7 @@ public void run(CliContext context, CommandLine args) {
             resultPrinter.printTotalExerciseResults();
         }
 
-        updateCourseJson(submitExercises, info, workDir.getConfigFile());
+        updateCourseJson(submitExercises, info);
         checkForExerciseUpdates(currentCourse);
         sendFeedbacks(feedbackLists, exercisesWithFeedback, feedbackUris);
     }
@@ -172,9 +182,9 @@ private void sendFeedbacks(List<List<FeedbackQuestion>> feedbackLists, List<Stri
      * Fetch updated exercise statuses from server and update course JSON file accordingly.
      */
     private void updateCourseJson(
-            List<Exercise> submittedExercises, CourseInfo courseInfo, Path courseInfoFile) {
+            List<Exercise> submittedExercises, CourseInfo courseInfo) {
 
-        List<Exercise> exercises = TmcUtil.getCourseExercises(ctx, courseInfo.getCourse());
+        List<Exercise> exercises = TmcUtil.getCourseExercises(ctx);
         if (exercises == null) {
             io.println(
                     "Failed to update config file for course " + courseInfo.getCourseName());
@@ -227,6 +237,43 @@ private void checkForExerciseUpdates(Course course) {
         io.println(ColorUtil.colorString(msg, Color.YELLOW));
     }
 
+    private boolean apiUrlIsOutdated(Course course) {
+        return !course.getDetailsUrl().toString().contains("v" + API_VERSION);
+    }
+
+    private void updateCourseAndExercises() {
+        // This is a patch to migrate away from api 7 urls
+        // as some exercises have been downloaded before the new api
+        String oldDetailsUrl = ctx.getCourseInfo().getCourse().getDetailsUrl().toString();
+        String updatedUrl = getUpdatedDetailsUrl(oldDetailsUrl);
+        try {
+            ctx.getCourseInfo().getCourse().setDetailsUrl(new URI(updatedUrl));
+        } catch (URISyntaxException e) {
+            logger.error("Could not update details url for course " + ctx.getCourseInfo().getCourseName());
+            return;
+        }
+        List<Exercise> exercises = TmcUtil.getCourseExercises(ctx);
+        if (exercises == null) {
+            io.println(
+                    "Failed to update urls for exercises of course " + ctx.getCourseInfo().getCourseName());
+            return;
+        }
+        ctx.getCourseInfo().getCourse().setExercises(exercises);
+        CourseInfoIo.save(ctx.getCourseInfo(), courseInfoFile);
+    }
+
+    private static String getUpdatedDetailsUrl(String oldDetailsUrl) {
+        if (!oldDetailsUrl.contains("/org")) {
+            return oldDetailsUrl;
+        }
+        int iOrg = oldDetailsUrl.indexOf("/org");
+        int iCourses = oldDetailsUrl.indexOf("/courses");
+        String beginningPart = oldDetailsUrl.substring(0, iOrg);
+        String endPart = oldDetailsUrl.substring(iCourses, oldDetailsUrl.length());
+        return beginningPart + "/api/v" + API_VERSION + "/core" + endPart;
+    }
+
+
     private String[] parseArgs(CommandLine args) {
         this.showAll = args.hasOption("a");
         this.showDetails = args.hasOption("d");

src/main/java/fi/helsinki/cs/tmc/cli/updater/AutoUpdater.java

@@ -105,12 +105,13 @@ private byte[] fetchHttpEntity(String urlAddress) {
         InputStream inputStream;
         try {
             URLConnection connection = url.openConnection();
+            connection.setConnectTimeout(10000);
             connection.setRequestProperty(
                     "User-Agent", "tmc-cli (https://github.com/tmc-cli/tmc-cli)");
             inputStream = connection.getInputStream();
         } catch (IOException ex) {
             logger.warn("Failed to fetch page", ex);
-            io.errorln("Failed to create https connection to github.");
+            io.errorln("Failed to create a https connection.");
             return null;
         }
 

src/test/java/fi/helsinki/cs/tmc/cli/command/DownloadExercisesCommandTest.java

@@ -77,7 +77,7 @@ public void setUp() {
         AnalyticsFacade analyticsFacade = new AnalyticsFacade(new Settings(), eventSendBuffer);
         ctx = new CliContext(io, mockCore, workDir, new Settings(), analyticsFacade);
         app = new Application(ctx);
-        Account account = new Account("user", "password", testOrganization);
+        Account account = new Account("user", testOrganization);
         ctx.useAccount(account);
         accountList = new AccountList();
         accountList.addAccount(account);

src/test/java/fi/helsinki/cs/tmc/cli/command/SubmitCommandTest.java

@@ -32,8 +32,11 @@
 import org.powermock.core.classloader.annotations.PrepareForTest;
 import org.powermock.modules.junit4.PowerMockRunner;
 
+import java.net.URI;
+import java.net.URISyntaxException;
 import java.nio.file.Path;
 import java.nio.file.Paths;
+import java.util.ArrayList;
 import java.util.Collections;
 import java.util.List;
 
@@ -250,6 +253,21 @@ public void sendAnalyticsIsCalledOnSubmit() {
         verify(analyticsFacade).sendAnalytics();
     }
 
+    @Test
+    public void updateAllExercisesIfCourseApiUrlIsOutDated() {
+        workDir.setWorkdir(pathToDummyExercise);
+        ArrayList<Exercise> exercises = new ArrayList<>();
+        Exercise test = new Exercise("test");
+        try {
+            test.setReturnUrl(new URI("test"));
+        } catch (URISyntaxException e) {
+        }
+        exercises.add(test);
+        when(TmcUtil.getCourseExercises(ctx)).thenReturn(exercises);
+        app.run(new String[] {"submit"});
+        assertEquals(ctx.getCourseInfo().getCourse().getExercises(), exercises);
+    }
+
     private static int countSubstring(String subStr, String str) {
         return (str.length() - str.replace(subStr, "").length()) / subStr.length();
     }