@coorpacademy/app-review 0.1.19 → 0.1.21-alpha.12

package/es/actions/api/post-answer.js

@@ -5,21 +5,22 @@ export const POST_ANSWER_REQUEST = '@@answer/POST_REQUEST';
 export const POST_ANSWER_SUCCESS = '@@answer/POST_SUCCESS';
 export const POST_ANSWER_FAILURE = '@@answer/POST_FAILURE';
 export const postAnswer = async (dispatch, getState, { services }) => {
+    const state = getState();
+    const token = get('data.token', state);
+    const answer = get('ui.answers', state);
+    const progression = state.data.progression;
+    if (!progression)
+        throw new Error('cannot answer question of inexisting progression');
     const action = buildTask({
         types: [POST_ANSWER_REQUEST, POST_ANSWER_SUCCESS, POST_ANSWER_FAILURE],
         task: () => {
-            const state = getState();
-            const token = get('data.token', state);
-            const answer = get('ui.answers', state);
-            const progressionId = get('data.progression._id', state);
-            const skillRef = get('data.progression.content.ref', state);
-            return services.postAnswer(skillRef, token, progressionId, answer);
+            return services.postAnswer(progression, token, answer);
         }
     });
     const response = await dispatch(action);
     if (response.type === POST_ANSWER_SUCCESS) {
-        const progression = response.payload;
-        const slideRef = progression.state.nextContent.ref;
+        const updatedProgression = response.payload;
+        const slideRef = updatedProgression.state.nextContent.ref;
         await dispatch(fetchSlide(slideRef));
     }
 };

package/es/actions/api/test/post-answer.test.js

@@ -1,6 +1,6 @@
 import test from 'ava';
 import { createTestStore } from '../../test/create-test-store';
-import { postAnswerResponse, services } from '../../../test/util/services.mock';
+import { postAnswerResponses, services } from '../../../test/util/services.mock';
 import { postAnswer, POST_ANSWER_FAILURE, POST_ANSWER_REQUEST, POST_ANSWER_SUCCESS } from '../post-answer';
 import { SLIDE_FETCH_REQUEST, SLIDE_FETCH_SUCCESS } from '../fetch-slide';
 import { qcmGraphicSlide } from '../../../views/slides/test/fixtures/qcm-graphic';
@@ -21,7 +21,7 @@ const initialState = {
                 allAnswers: [],
                 isCorrect: true,
                 nextContent: {
-                    ref: 'sli_VJYjJnJhg',
+                    ref: freeTextSlide.id,
                     type: 'slide'
                 },
                 pendingSlides: [],
@@ -39,7 +39,7 @@ const initialState = {
         token: '1234'
     },
     ui: {
-        currentSlideRef: 'sli_VJYjJnJhg',
+        currentSlideRef: freeTextSlide.id,
         navigation: ['skills', 'slides'],
         answers: answer,
         slide: {
@@ -52,12 +52,12 @@ test('should dispatch POST_ANSWER_REQUEST, then POST_ANSWER_SUCCESS when the upd
         { type: POST_ANSWER_REQUEST },
         {
             type: POST_ANSWER_SUCCESS,
-            payload: postAnswerResponse
+            payload: postAnswerResponses[freeTextSlide.id]
         },
-        { type: SLIDE_FETCH_REQUEST, meta: { slideRef: 'sli_VkSQroQnx' } },
+        { type: SLIDE_FETCH_REQUEST, meta: { slideRef: qcmGraphicSlide.id } },
         {
             type: SLIDE_FETCH_SUCCESS,
-            meta: { slideRef: 'sli_VkSQroQnx' },
+            meta: { slideRef: qcmGraphicSlide.id },
             payload: qcmGraphicSlide
         },
         { type: SET_CURRENT_SLIDE, payload: qcmGraphicSlide }

package/es/index.js

@@ -1,7 +1,6 @@
 import React, { useEffect, useState } from 'react';
 import { useSelector, useDispatch, Provider } from 'react-redux';
 import AppReviewTemplate from '@coorpacademy/components/es/template/app-review';
-import { TemplateContext } from '@coorpacademy/components/es/template/app-review/template-context';
 import isEmpty from 'lodash/fp/isEmpty';
 import get from 'lodash/fp/get';
 import configureStore from './configure-store';
@@ -66,9 +65,7 @@ const AppReview = ({ options }) => {
     }, [isProgressionCreated, options, store]);
     if (!store)
         return null;
-    const { templateContext: values } = options;
     return (React.createElement(Provider, { store: store },
-        React.createElement(TemplateContext, { values: values },
-            React.createElement(ConnectedApp, null))));
+        React.createElement(ConnectedApp, null)));
 };
 export default AppReview;

package/es/reducers/data/test/progression.test.js

@@ -2,7 +2,8 @@ import test from 'ava';
 import reducer from '../progression';
 import { POST_PROGRESSION_SUCCESS } from '../../../actions/api/post-progression';
 import { POST_ANSWER_SUCCESS } from '../../../actions/api/post-answer';
-import { postAnswerResponse, postProgressionResponse } from '../../../test/util/services.mock';
+import { postAnswerResponses, postProgressionResponse } from '../../../test/util/services.mock';
+import { freeTextSlide } from '../../../views/slides/test/fixtures/free-text';
 test('should have initial value', t => {
     const state = reducer(undefined, {});
     t.is(state, null);
@@ -17,7 +18,7 @@ test('should set the value of POST_PROGRESSION_SUCCESS action', t => {
 test('should set the value of POST_ANSWER_SUCCESS action', t => {
     const state = reducer(null, {
         type: POST_ANSWER_SUCCESS,
-        payload: postAnswerResponse
+        payload: postAnswerResponses[freeTextSlide.universalRef]
     });
-    t.deepEqual(state, postAnswerResponse);
+    t.deepEqual(state, postAnswerResponses[freeTextSlide.universalRef]);
 });

package/es/services/fetch-correction.d.ts

@@ -0,0 +1,2 @@
+import { CorrectionFromAPI } from '../types/common';
+export declare const fetchCorrection: (slideRef: string, token: string, progressionId: string, answer: string[]) => Promise<CorrectionFromAPI | void>;

package/es/services/fetch-correction.js

@@ -0,0 +1,14 @@
+import crossFetch from 'cross-fetch';
+import decode from 'jwt-decode';
+import { toJSON } from './tools/fetch-responses';
+export const fetchCorrection = async (slideRef, token, progressionId, answer) => {
+    const { host } = decode(token);
+    const response = await crossFetch(`${host}/api/v2/progressions/${progressionId}/answers/${slideRef}`, {
+        method: 'post',
+        headers: { authorization: token },
+        body: JSON.stringify({
+            answer
+        })
+    });
+    return toJSON(response);
+};

package/es/services/fetch-slide.js

@@ -6,6 +6,5 @@ export const fetchSlide = async (slideRef, token) => {
     const response = await crossFetch(`${host}/api/v2/slide/${slideRef}/parentContentTitle`, {
         headers: { authorization: token }
     });
-    const slide = (await toJSON(response));
-    return slide;
+    return toJSON(response);
 };

package/es/services/index.js

@@ -1,10 +1,12 @@
+import { fetchCorrection } from './fetch-correction';
 import { fetchSkills } from './fetch-skills';
-import { postProgression } from './post-progression';
 import { fetchSlide } from './fetch-slide';
 import { postAnswer } from './post-answer';
+import { postProgression } from './post-progression';
 export const getServices = () => ({
+    fetchCorrection,
     fetchSkills,
     fetchSlide,
-    postProgression,
-    postAnswer
+    postAnswer,
+    postProgression
 });

package/es/services/post-answer.d.ts

@@ -1,2 +1,2 @@
 import { ProgressionFromAPI } from '../types/common';
-export declare const postAnswer: (skillRef: string, token: string, progressionId: string, answer: string[]) => Promise<ProgressionFromAPI>;
+export declare const postAnswer: (progression: ProgressionFromAPI, token: string, answer: string[]) => Promise<ProgressionFromAPI>;

package/es/services/post-answer.js

@@ -1,7 +1,9 @@
 import crossFetch from 'cross-fetch';
 import decode from 'jwt-decode';
 import { toJSON } from './tools/fetch-responses';
-export const postAnswer = async (skillRef, token, progressionId, answer) => {
+export const postAnswer = async (progression, token, answer) => {
+    const progressionId = progression._id;
+    const skillRef = progression.content.ref;
     const { host } = decode(token);
     const response = await crossFetch(`${host}/api/v2/progressions/${progressionId}/answers`, {
         method: 'post',

package/es/services/test/fetch-correction.test.d.ts

@@ -0,0 +1 @@
+export {};

package/es/services/test/fetch-correction.test.js

@@ -0,0 +1,39 @@
+import test from 'ava';
+import nock from 'nock';
+import { fetchCorrection } from '../fetch-correction';
+const progressionId = '123456789123';
+const slideRef = 'sli_123546';
+const answer = ['Lister vos tâches pour vous libérer l’esprit', '15 jours à Bora Bora'];
+const correction = {
+    correctAnswer: ['15 jours à Bora Bora'],
+    corrections: [
+        {
+            answer: answer[0],
+            isCorrect: false
+        },
+        {
+            answer: answer[1],
+            isCorrect: true
+        }
+    ]
+};
+test.before(() => {
+    nock('http://localhost:3000')
+        .post(`/api/v2/progressions/${progressionId}/answers/${slideRef}`, JSON.stringify({
+        answer
+    }))
+        .reply(200, correction);
+});
+test.after(() => {
+    nock.cleanAll();
+});
+test('should fetch the correction of the slide for the specified progression successfully', async (t) => {
+    const token = process.env.API_TEST_TOKEN || '';
+    const response = await fetchCorrection(slideRef, token, progressionId, answer);
+    t.deepEqual(correction, response);
+});
+test('should reject if a bad token is passed', async (t) => {
+    const badToken = 'token is not a jwt';
+    const error = await t.throwsAsync(() => fetchCorrection(slideRef, badToken, progressionId, answer));
+    t.is(error?.message, "Invalid token specified: Cannot read properties of undefined (reading 'replace')");
+});

package/es/services/test/post-answer.test.js

@@ -1,9 +1,32 @@
 import test from 'ava';
 import nock from 'nock';
 import { postAnswer } from '../post-answer';
-const progressionId = '123456789123';
 const skillRef = '_skill-ref';
 const answer = ['Lister vos tâches pour vous libérer l’esprit', 'Vous isoler dans un lieu calme'];
+const initProgression = {
+    content: {
+        type: 'skill',
+        ref: skillRef
+    },
+    engine: {
+        ref: 'review'
+    },
+    _id: '123456123456',
+    state: {
+        allAnswers: [],
+        isCorrect: true,
+        nextContent: {
+            type: 'slide',
+            ref: 'sli_NkvrWPFF2'
+        },
+        pendingSlides: [],
+        slides: [],
+        step: {
+            current: 1
+        },
+        stars: 0
+    }
+};
 const result = {
     content: {
         type: 'skill',
@@ -40,18 +63,18 @@ const result = {
 };
 test.before(() => {
     const moocApi = nock('http://localhost:3000');
-    moocApi.post(`/api/v2/progressions/${progressionId}/answers`).reply(200, result);
+    moocApi.post('/api/v2/progressions/123456123456/answers').reply(200, result);
 });
 test.after(() => {
     nock.cleanAll();
 });
 test('should post the answers successfully', async (t) => {
     const token = process.env.API_TEST_TOKEN || '';
-    const progression = await postAnswer(skillRef, token, progressionId, answer);
+    const progression = await postAnswer(initProgression, token, answer);
     t.deepEqual(result, progression);
 });
 test('should reject bad token', async (t) => {
     const badToken = 'token is not a jwt';
-    const error = await t.throwsAsync(() => postAnswer(skillRef, badToken, progressionId, answer));
+    const error = await t.throwsAsync(() => postAnswer(initProgression, badToken, answer));
     t.is(error?.message, "Invalid token specified: Cannot read properties of undefined (reading 'replace')");
 });

package/es/test/util/services.mock.d.ts

@@ -1,4 +1,5 @@
 import { ProgressionFromAPI, Services } from '../../types/common';
 export declare const postProgressionResponse: ProgressionFromAPI;
-export declare const postAnswerResponse: ProgressionFromAPI;
+export declare const postAnswerResponses: Record<string, ProgressionFromAPI>;
+export declare const progressionSlideWithPendingSlide: ProgressionFromAPI;
 export declare const services: Services;