Pass phasetype and id down to controller

Author: Nick Litwin

app/services/submissions.service.js

@@ -18,13 +18,13 @@
     return service;
 
     function getPresignedURL(body, files) {
-      console.log('body to get presigned url: ', body)
+      console.log('Body of request for presigned url: ', body);
 
       return api.all('submissions').customPOST(JSON.stringify({param: body}))
       .then(function(response) {
-        console.log('POST Response: ', response.plain());
+        console.log('POST/Presigned URL Response: ', response.plain());
 
-        uploadSubmissionFileToS3(response.data.files, files);
+        uploadSubmissionFileToS3(response, response.data.files, files);
       })
       .catch(function(err) {
         console.log(err);
@@ -33,7 +33,8 @@
       });
     }
 
-    function uploadSubmissionFileToS3(filesWithPresignedURL, files) {
+    function uploadSubmissionFileToS3(presignedURLResponse, files) {
+      var filesWithPresignedURL = presignedURLResponse.data.files;
 
       var promises = filesWithPresignedURL.map(function(fileWithPresignedURL) {
         var deferred = $q.defer();
@@ -73,6 +74,9 @@
       return $q.all(promises)
         .then(function(response) {
           console.log('response from S3: ', response);
+          console.log('response to use .save restnagular with: ', presignedURLResponse);
+
+          // Update and start processing
 
         })
         .catch(function(err) {

app/submissions/submissions.controller.js

@@ -7,9 +7,11 @@
 
   function SubmissionsController(challengeToSubmitTo) {
     var vm = this;
-    vm.challengeTitle = challengeToSubmitTo.name;
-    vm.challengeId = challengeToSubmitTo.id;
-    vm.track = challengeToSubmitTo.track.toLowerCase();
+
+    var challenge = challengeToSubmitTo.challenge;
+    vm.challengeTitle = challenge.name;
+    vm.challengeId = challenge.id;
+    vm.track = challenge.track.toLowerCase();
 
     activate();
 

app/submissions/submissions.routes.js

@@ -40,9 +40,17 @@
                   alert('User is not associated with this challenge.');
                 }
 
-                var isPhaseSubmission = _.some(challenge.currentPhases, {
-                  phaseStatus: 'Open',
-                  phaseType: 'Submission'
+                var phaseType;
+                var phaseId;
+
+                var isPhaseSubmission = _.some(challenge.currentPhases, function(phase) {
+                  if (phase.phaseStatus === 'Open' && phase.phaseType === 'Submission') {
+                    phaseType = 'Submission';
+                    phaseId = phase.id;
+                    return true;
+                  }
+
+                  return false;
                 });
 
                 var isSubmitter = _.some(challenge.userDetails.roles, function(role) {
@@ -54,7 +62,11 @@
                   alert('You should not have access to this page');
                 }
 
-                return challenge;
+                return {
+                  challenge: challenge,
+                  phaseType: phaseType,
+                  phaseId: phaseId
+                };
               })
               .catch(function(err) {
                 console.log('ERROR GETTING CHALLENGE: ', err);

app/submissions/submit-file/submit-file.controller.js

@@ -3,11 +3,14 @@
 
   angular.module('tc.submissions').controller('SubmitFileController', SubmitFileController);
 
-  SubmitFileController.$inject = ['$stateParams', 'UserService', 'SubmissionsService'];
+  SubmitFileController.$inject = ['$stateParams', 'UserService', 'SubmissionsService', 'challengeToSubmitTo'];
 
-  function SubmitFileController($stateParams, UserService, SubmissionsService) {
+  function SubmitFileController($stateParams, UserService, SubmissionsService, challengeToSubmitTo) {
     var vm = this;
 
+    // Must provide React Select component a list with ID, since currently
+    // the onChange callback does not indicate which dropdown called the callback.
+    // There are pull requets pending for react-select which will clean this code up
     vm.fontList1 = [
       { label: 'Studio Standard Fonts List', value: 'STUDIO_STANDARDS_FONTS_LIST', id: 1 },
       { label: 'Fonts.com', value: 'FONTS_DOT_COM', id: 1  },
@@ -50,10 +53,8 @@
         // type dynamic or static?
         type: 'CHALLENGE',
         id: $stateParams.challengeId,
-
-        // Current phase check should come from challenge API?
-        phase: 'SUBMISSION'
-
+        phaseType: challengeToSubmitTo.phaseType,
+        phaseId: challengeToSubmitTo.phaseId
       },
       userId: userId,
       data: {
@@ -116,13 +117,16 @@
     }
 
     function selectFont(newFont) {
-      console.log('new value: ', newFont);
+      // See above for explanation
       var id = newFont.id - 1;
       vm.submissionForm.fonts[id].source = newFont.value;
     }
 
     function createAnotherFontFieldset() {
+      // See above for explanation on why this is done the way it is
       var id = vm.submissionForm.fonts.length;
+
+      // Create copy of list with new, incremented ID
       var newFontList = vm['fontList' + (id + 1)] = angular.copy(vm['fontList' + id]);
 
       newFontList.forEach(function(font) {