fix broken cleanup (.each returns the map it iterated over) and upload belonging to submission, not grade

Author: Ben Lerner

app/controllers/api/grades_controller.rb

@@ -27,6 +27,7 @@ def cleanup(node, replace)
         replace.each do |s, r|
           node = node.gsub(s, r)
         end
+        node
       when Array
         node.map { |item| cleanup(item, replace) }
       when Hash
@@ -38,9 +39,10 @@ def cleanup(node, replace)
 
     def handle_response(response)
       config_details = "(grade #{@grade.id}, grader #{@grader.id})"
-      response = cleanup(response, {
-                           "$EXTRACTED/submission" => Upload.upload_path_for(@grade.upload.extracted_path.to_s)
-                         })
+      replacements = {
+        "$EXTRACTED/submission" => Upload.upload_path_for(@grade.submission.upload.extracted_path.to_s)
+      } 
+      response = cleanup(response, replacements)
 
       File.open(@grade.orca_result_path, 'w') do |f|
         f.write(JSON.generate(response.except(:key)))