Old behaviour, new data format inside

ReCodEx · Nov 14, 2017 · e234019 · e234019
1 parent 11647ef
commit e234019
Show file tree

Hide file tree

Showing 6 changed files with 53 additions and 58 deletions.
diff --git a/src/components/Groups/ResultsTable/ResultsTableRow.js b/src/components/Groups/ResultsTable/ResultsTableRow.js
@@ -14,19 +14,11 @@ const ResultsTableRow = ({ userId, assignmentsIds, submissions }) => {
           .filter(s => s !== null)
           .filter(s => s.exerciseAssignmentId === assignmentId)[0];
         const points =
-          submission &&
-          submission !== null &&
-          submission.evaluation &&
-          submission.evaluation !== null
-            ? submission.evaluation.points
+          submission !== null
+            ? submission.lastSubmission.evaluation.points
             : '-';
         const bonusPoints =
-          submission &&
-          submission !== null &&
-          submission.evaluation &&
-          submission.evaluation !== null
-            ? submission.evaluation.bonusPoints
-            : 0;
+          submission && submission !== null ? submission.bonusPoints : 0;
         totalPoints += points !== '-' ? points : 0;
         totalPoints += bonusPoints;
         return (

diff --git a/src/components/Submissions/EvaluationDetail/EvaluationDetail.js b/src/components/Submissions/EvaluationDetail/EvaluationDetail.js
@@ -19,7 +19,8 @@ const EvaluationDetail = ({
   evaluation,
   isCorrect,
   submittedAt,
-  maxPoints
+  maxPoints,
+  bonusPoints
 }) =>
   <Box
     title={
@@ -117,15 +118,15 @@ const EvaluationDetail = ({
           <td
             className={classnames({
               'text-center': true,
-              'text-danger': !isCorrect && evaluation.bonusPoints === 0,
-              'text-success': isCorrect && evaluation.bonusPoints === 0,
+              'text-danger': !isCorrect && bonusPoints === 0,
+              'text-success': isCorrect && bonusPoints === 0,
               'text-bold': evaluation.bonusPoints === 0
             })}
           >
             {evaluation.points}/{maxPoints}
           </td>
         </tr>
-        {evaluation.bonusPoints !== 0 &&
+        {bonusPoints !== 0 &&
           <tr>
             <th>
               <FormattedMessage
@@ -134,10 +135,10 @@ const EvaluationDetail = ({
               />
             </th>
             <td className="text-center">
-              <BonusPoints bonus={evaluation.bonusPoints} />
+              <BonusPoints bonus={bonusPoints} />
             </td>
           </tr>}
-        {evaluation.bonusPoints !== 0 &&
+        {bonusPoints !== 0 &&
           <tr>
             <th>
               <FormattedMessage
@@ -149,13 +150,12 @@ const EvaluationDetail = ({
               className={classnames({
                 'text-center': true,
                 'text-danger':
-                  !isCorrect || evaluation.points + evaluation.bonusPoints <= 0,
-                'text-success':
-                  isCorrect && evaluation.points + evaluation.bonusPoints > 0
+                  !isCorrect || evaluation.points + bonusPoints <= 0,
+                'text-success': isCorrect && evaluation.points + bonusPoints > 0
               })}
             >
               <b>
-                {evaluation.points + evaluation.bonusPoints}/{maxPoints}
+                {evaluation.points + bonusPoints}/{maxPoints}
               </b>
             </td>
           </tr>}
@@ -172,7 +172,8 @@ EvaluationDetail.propTypes = {
   isCorrect: PropTypes.bool.isRequired,
   submittedAt: PropTypes.number.isRequired,
   evaluation: PropTypes.object,
-  maxPoints: PropTypes.number.isRequired
+  maxPoints: PropTypes.number.isRequired,
+  bonusPoints: PropTypes.number.isRequired
 };
 
 export default EvaluationDetail;
diff --git a/src/components/Submissions/SubmissionDetail/SubmissionDetail.js b/src/components/Submissions/SubmissionDetail/SubmissionDetail.js
@@ -23,17 +23,17 @@ class SubmissionDetail extends Component {
       submission: {
         id,
         note = '',
-        evaluationStatus,
-        submittedAt,
-        userId,
-        submittedBy,
+        solution: { createdAt, userId, files, ...restSolution },
+        lastSubmission: {
+          submittedBy,
+          evaluation,
+          isCorrect,
+          evaluationStatus
+        },
         maxPoints,
-        files,
-        evaluation,
+        bonusPoints,
         accepted,
-        originalSubmissionId,
-        runtimeEnvironmentId,
-        isCorrect
+        runtimeEnvironmentId
       },
       assignment,
       isSupervisor
@@ -46,12 +46,12 @@ class SubmissionDetail extends Component {
           <Col md={6} sm={12}>
             <SubmissionStatus
               evaluationStatus={evaluationStatus}
-              submittedAt={submittedAt}
+              submittedAt={createdAt}
               userId={userId}
               submittedBy={submittedBy}
               note={note}
               accepted={accepted}
-              originalSubmissionId={originalSubmissionId}
+              originalSubmissionId={restSolution.id}
               assignmentId={assignment.id}
             />
             <Row>
@@ -81,15 +81,16 @@ class SubmissionDetail extends Component {
               <EvaluationDetail
                 assignment={assignment}
                 evaluation={evaluation}
-                submittedAt={submittedAt}
+                submittedAt={createdAt}
                 maxPoints={maxPoints}
                 isCorrect={isCorrect}
+                bonusPoints={bonusPoints}
               />
 
               {isSupervisor &&
                 <BonusPointsContainer
                   submissionId={id}
-                  evaluation={evaluation}
+                  bonusPoints={bonusPoints}
                 />}
 
               <TestResults
@@ -119,17 +120,20 @@ class SubmissionDetail extends Component {
 SubmissionDetail.propTypes = {
   submission: PropTypes.shape({
     id: PropTypes.string.isRequired,
-    evaluationStatus: PropTypes.string.isRequired,
     note: PropTypes.string,
-    submittedAt: PropTypes.number.isRequired,
-    userId: PropTypes.string.isRequired,
-    submittedBy: PropTypes.string,
-    evaluation: PropTypes.object,
+    lastSubmission: PropTypes.shape({
+      evaluationStatus: PropTypes.string.isRequired,
+      submittedBy: PropTypes.string,
+      evaluation: PropTypes.object,
+      isCorrect: PropTypes.bool
+    }).isRequired,
+    solution: PropTypes.shape({
+      createdAt: PropTypes.number.isRequired,
+      userId: PropTypes.string.isRequired,
+      files: PropTypes.array
+    }).isRequired,
     maxPoints: PropTypes.number.isRequired,
-    files: PropTypes.array,
-    originalSubmissionId: PropTypes.string,
-    runtimeEnvironmentId: PropTypes.string,
-    isCorrect: PropTypes.bool
+    runtimeEnvironmentId: PropTypes.string
   }).isRequired,
   assignment: PropTypes.object.isRequired,
   isSupervisor: PropTypes.bool

diff --git a/src/containers/BonusPointsContainer/BonusPointsContainer.js b/src/containers/BonusPointsContainer/BonusPointsContainer.js
@@ -5,18 +5,15 @@ import BonusPointsForm from '../../components/forms/BonusPointsForm';
 
 import { setPoints } from '../../redux/modules/submissions';
 
-const BonusPointsContainer = ({ evaluation, setPoints }) => (
+const BonusPointsContainer = ({ bonusPoints, setPoints }) =>
   <BonusPointsForm
     onSubmit={setPoints}
-    initialvalues={{ points: evaluation.bonusPoints }}
-  />
-);
+    initialvalues={{ points: bonusPoints }}
+  />;
 
 BonusPointsContainer.propTypes = {
   submissionId: PropTypes.string.isRequired,
-  evaluation: PropTypes.shape({
-    bonusPoints: PropTypes.number.isRequired
-  }).isRequired,
+  bonusPoints: PropTypes.number.isRequired,
   setPoints: PropTypes.func.isRequired
 };
 

diff --git a/src/redux/modules/submissions.js b/src/redux/modules/submissions.js
@@ -15,6 +15,7 @@ const needsRefetching = item =>
 
 const { actions, actionTypes, reduceActions } = factory({
   resourceName,
+  apiEndpointFactory: id => `/assignment-solutions/${id}`,
   needsRefetching
 });
 
@@ -53,7 +54,7 @@ export const fetchSubmissionIfNeeded = actions.fetchOneIfNeeded;
 export const setPoints = (submissionId, bonusPoints) =>
   createApiAction({
     type: additionalActionTypes.SET_BONUS_POINTS,
-    endpoint: `/submissions/${submissionId}`,
+    endpoint: `/assignment-solutions/${submissionId}/bonus-points`,
     method: 'POST',
     body: { bonusPoints },
     meta: { submissionId, bonusPoints }
@@ -63,23 +64,23 @@ export const acceptSubmission = id =>
   createApiAction({
     type: additionalActionTypes.ACCEPT,
     method: 'POST',
-    endpoint: `/submissions/${id}/set-accepted`,
+    endpoint: `/assignment-solutions/${id}/set-accepted`,
     meta: { id }
   });
 
 export const unacceptSubmission = id =>
   createApiAction({
     type: additionalActionTypes.UNACCEPT,
     method: 'DELETE',
-    endpoint: `/submissions/${id}/unset-accepted`,
+    endpoint: `/assignment-solutions/${id}/unset-accepted`,
     meta: { id }
   });
 
 export const resubmitSubmission = (id, isPrivate, isDebug = true) =>
   createApiAction({
     type: submissionActionTypes.SUBMIT,
     method: 'POST',
-    endpoint: `/submissions/${id}/resubmit`,
+    endpoint: `/assignment-solutions/${id}/resubmit`,
     body: { private: isPrivate, debug: isDebug },
     meta: { id }
   });
@@ -103,7 +104,7 @@ export const fetchUsersSubmissions = (userId, assignmentId) =>
   });
 
 export const downloadResultArchive = downloadHelper({
-  endpoint: id => `/submissions/evaluation/${id}/download-result`,
+  endpoint: id => `/assignment-solutions/evaluation/${id}/download-result`,
   fetch: fetchSubmissionIfNeeded,
   actionType: additionalActionTypes.DOWNLOAD_RESULT_ARCHIVE,
   fileNameSelector: (id, state) => `${id}.zip`,
@@ -124,7 +125,7 @@ const reducer = handleActions(
       { meta: { submissionId, bonusPoints } }
     ) =>
       state.setIn(
-        ['resources', submissionId, 'data', 'evaluation', 'bonusPoints'],
+        ['resources', submissionId, 'data', 'bonusPoints'],
         Number(bonusPoints)
       ),
 

diff --git a/test/redux/modules/submissions-test.js b/test/redux/modules/submissions-test.js
@@ -16,7 +16,7 @@ describe('Submissions', () => {
       expect(action.request).to.eql({
         type: additionalActionTypes.ACCEPT,
         method: 'POST',
-        endpoint: `/submissions/${id}/set-accepted`,
+        endpoint: `/assignment-solutions/${id}/set-accepted`,
         meta: { id }
       });
     });