Fix updating exercise status after submit

Also update core

Author: Irene

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

@@ -1,7 +1,9 @@
 package fi.helsinki.cs.tmc.cli.backend;
 
+import fi.helsinki.cs.tmc.cli.command.OrganizationCommand;
 import fi.helsinki.cs.tmc.core.domain.Course;
 import fi.helsinki.cs.tmc.core.domain.Exercise;
+import fi.helsinki.cs.tmc.core.domain.Organization;
 
 import java.util.ArrayList;
 import java.util.HashMap;
@@ -15,13 +17,15 @@ public class CourseInfo {
     private String username;
     private String serverAddress;
     private Course course;
+    private Organization organization;
     private List<String> localCompletedExercises;
     private HashMap<String, String> properties;
 
     public CourseInfo(Account account, Course course) {
         this.username = account.getUsername().orNull();
         this.serverAddress = account.getServerAddress();
         this.course = course;
+        this.organization = account.getOrganization().orNull();
         this.properties = new HashMap<>();
         this.localCompletedExercises = new ArrayList<>();
     }
@@ -128,6 +132,14 @@ public void replaceOldExercises(List<Exercise> newExercises) {
         }
     }
 
+    public Organization getOrganization() {
+        return organization;
+    }
+
+    public void setOrganization(Organization organization) {
+        this.organization = organization;
+    }
+
     public void removeProperty(String prop) {
         this.properties.remove(prop);
     }

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

@@ -1,9 +1,11 @@
 package fi.helsinki.cs.tmc.cli.backend;
 
 import com.google.common.base.Optional;
+import fi.helsinki.cs.tmc.cli.command.OrganizationCommand;
 import fi.helsinki.cs.tmc.core.domain.Course;
 
 import com.google.gson.Gson;
+import fi.helsinki.cs.tmc.core.domain.Organization;
 import fi.helsinki.cs.tmc.core.holders.TmcSettingsHolder;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;

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.holders.TmcSettingsHolder;
 import fi.helsinki.cs.tmc.langs.abstraction.ValidationResult;
 import fi.helsinki.cs.tmc.langs.domain.RunResult;
 
@@ -27,6 +28,7 @@
 import java.net.URI;
 import java.util.ArrayList;
 import java.util.List;
+import java.util.Optional;
 import java.util.concurrent.Callable;
 
 public class TmcUtil {
@@ -74,9 +76,7 @@ public static boolean tryToLogin(CliContext ctx, Account account, String passwor
     }
 
     public static List<Course> listCourses(CliContext ctx) {
-        Callable<List<Course>> callable;
-        callable = ctx.getTmcCore().listCourses(ProgressObserver.NULL_OBSERVER);
-
+        Callable<List<Course>> callable = ctx.getTmcCore().listCourses(ProgressObserver.NULL_OBSERVER);
         try {
             return callable.call();
         } catch (Exception e) {
@@ -199,6 +199,17 @@ public static ValidationResult runCheckStyle(CliContext ctx, Exercise exercise)
         }
     }
 
+    public static List<Exercise> getCourseExercises(CliContext ctx, Course course) {
+        try {
+            TmcCore tmcCore = ctx.getTmcCore();
+            Course updatedCourse = tmcCore.getCourseDetails(ProgressObserver.NULL_OBSERVER, course).call();
+            return updatedCourse.getExercises();
+        } catch (Exception e) {
+            logger.error("Failed to fetch exercises for course " + course.getName());
+            return null;
+        }
+    }
+
     public static boolean sendFeedback(
             CliContext ctx, List<FeedbackAnswer> answers, URI feedbackUri) {
         try {
@@ -212,6 +223,17 @@ 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();

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

@@ -87,6 +87,10 @@ public void run(CliContext context, CommandLine args) {
         CliProgressObserver progobs = new CliProgressObserver(io, color1, color2);
 
         ctx.useAccount(finder.getAccount());
+        if (!ctx.getSettings().getOrganization().isPresent()) {
+            io.errorln("Failed to download exercises. Make sure you are properly logged in.");
+            return;
+        }
         CourseInfoIo.createNewCourse(course, finder.getAccount(), workDir.getWorkingDirectory());
         List<Exercise> exercises = TmcUtil.downloadExercises(ctx, filtered, progobs);
         if (exercises == null) {

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

@@ -1,5 +1,6 @@
 package fi.helsinki.cs.tmc.cli.command;
 
+import com.google.common.base.Optional;
 import fi.helsinki.cs.tmc.cli.backend.CourseInfo;
 import fi.helsinki.cs.tmc.cli.backend.CourseInfoIo;
 import fi.helsinki.cs.tmc.cli.backend.TmcUtil;
@@ -20,6 +21,7 @@
 import fi.helsinki.cs.tmc.core.domain.submission.FeedbackQuestion;
 import fi.helsinki.cs.tmc.core.domain.submission.SubmissionResult;
 
+import fi.helsinki.cs.tmc.core.holders.TmcSettingsHolder;
 import org.apache.commons.cli.CommandLine;
 import org.apache.commons.cli.Options;
 import org.slf4j.Logger;
@@ -129,6 +131,11 @@ public void run(CliContext context, CommandLine args) {
 
             resultPrinter.printSubmissionResult(result, isOnlyExercise);
 
+            exercise.setAttempted(true);
+            if (result.getStatus() == SubmissionResult.Status.OK) {
+                exercise.setCompleted(true);
+            }
+
             List<FeedbackQuestion> feedback = result.getFeedbackQuestions();
             if (feedback != null && feedback.size() > 0) {
                 feedbackLists.add(feedback);
@@ -167,22 +174,22 @@ private void sendFeedbacks(List<List<FeedbackQuestion>> feedbackLists, List<Stri
     private void updateCourseJson(
             List<Exercise> submittedExercises, CourseInfo courseInfo, Path courseInfoFile) {
 
-        Course updatedCourse = TmcUtil.findCourse(ctx, courseInfo.getCourseName());
-        if (updatedCourse == null) {
-            io.errorln("Failed to update config file for course " + courseInfo.getCourseName());
+        List<Exercise> exercises = TmcUtil.getCourseExercises(ctx, courseInfo.getCourse());
+        if (exercises == null) {
+            io.println(
+                    "Failed to update config file for course " + courseInfo.getCourseName());
             return;
         }
-
         for (Exercise submitted : submittedExercises) {
-            Exercise updatedEx = courseInfo.getExercise(submitted.getName());
-            if (updatedEx == null) {
+            java.util.Optional<Exercise> ex = exercises.stream().filter(e -> e.getName().equals(submitted.getName())).findFirst();
+            if (!ex.isPresent()) {
                 io.println(
                         "Failed to update config file for exercise "
                                 + submitted.getName()
                                 + ". The exercise doesn't exist in server anymore.");
                 continue;
             }
-
+            Exercise updatedEx = ex.get();
             if (updatedEx.isCompleted()) {
                 if (courseInfo.getLocalCompletedExercises().contains(updatedEx.getName())) {
                     courseInfo.getLocalCompletedExercises().remove(updatedEx.getName());

src/main/java/fi/helsinki/cs/tmc/cli/shared/CourseFinder.java

@@ -59,6 +59,7 @@ public boolean search(String courseName) {
         if (matches.isEmpty()) {
             //TODO we could search here for similar courses.
             io.errorln("Course doesn't exist.");
+            io.errorln("Please make sure that you are logged in with the right organization.");
             return false;
         } else if (matches.size() == 1) {
             return handleSingleMatchingCourses(matches);

src/test/java/fi/helsinki/cs/tmc/cli/backend/CourseInfoIoTest.java

@@ -2,6 +2,7 @@
 
 import fi.helsinki.cs.tmc.core.domain.Course;
 
+import fi.helsinki.cs.tmc.core.domain.Organization;
 import junit.framework.Assert;
 import org.apache.commons.io.FileUtils;
 import org.junit.After;

src/test/java/fi/helsinki/cs/tmc/cli/backend/CourseInfoTest.java

@@ -7,6 +7,7 @@
 import fi.helsinki.cs.tmc.core.domain.Course;
 import fi.helsinki.cs.tmc.core.domain.Exercise;
 
+import fi.helsinki.cs.tmc.core.domain.Organization;
 import org.junit.Before;
 import org.junit.Test;
 

src/test/java/fi/helsinki/cs/tmc/cli/io/WorkDirTest.java

@@ -14,6 +14,7 @@
 import fi.helsinki.cs.tmc.core.domain.Course;
 import fi.helsinki.cs.tmc.core.domain.Exercise;
 
+import fi.helsinki.cs.tmc.core.domain.Organization;
 import org.apache.commons.io.FileUtils;
 import org.junit.AfterClass;
 import org.junit.BeforeClass;