Skip to content

Commit 459fd7b

Browse files
committed
Update for new assessments endpoints
Ref. source-academy/backend#729. Prettier
1 parent 8758ee9 commit 459fd7b

File tree

2 files changed

+14
-31
lines changed

2 files changed

+14
-31
lines changed

src/commons/sagas/BackendSaga.ts

Lines changed: 7 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -59,7 +59,6 @@ import { computeRedirectUri, getClientId, getDefaultProvider } from '../utils/Au
5959
import { history } from '../utils/HistoryHelper';
6060
import { showSuccessMessage, showWarningMessage } from '../utils/NotificationsHelper';
6161
import {
62-
changeDateAssessment,
6362
deleteAssessment,
6463
deleteSourcecastEntry,
6564
getAssessment,
@@ -82,7 +81,7 @@ import {
8281
postSourcecast,
8382
postSublanguage,
8483
postUnsubmit,
85-
publishAssessment,
84+
updateAssessment,
8685
uploadAssessment
8786
} from './RequestsSaga';
8887
import { safeTakeEvery as takeEvery } from './SafeEffects';
@@ -531,7 +530,7 @@ function* BackendSaga(): SagaIterator {
531530
const closeAt = action.payload.closeAt;
532531
const openAt = action.payload.openAt;
533532

534-
const resp: Response | null = yield changeDateAssessment(id, closeAt, openAt, tokens);
533+
const resp: Response | null = yield updateAssessment(id, { openAt, closeAt }, tokens);
535534
if (!resp || !resp.ok) {
536535
return yield handleResponseError(resp);
537536
}
@@ -564,7 +563,11 @@ function* BackendSaga(): SagaIterator {
564563
const id = action.payload.id;
565564
const togglePublishTo = action.payload.togglePublishTo;
566565

567-
const resp: Response | null = yield publishAssessment(id, togglePublishTo, tokens);
566+
const resp: Response | null = yield updateAssessment(
567+
id,
568+
{ isPublished: togglePublishTo },
569+
tokens
570+
);
568571
if (!resp || !resp.ok) {
569572
return yield handleResponseError(resp);
570573
}

src/commons/sagas/RequestsSaga.ts

Lines changed: 7 additions & 27 deletions
Original file line numberDiff line numberDiff line change
@@ -452,14 +452,14 @@ export const getAssessment = async (id: number, tokens: Tokens): Promise<Assessm
452452
};
453453

454454
/**
455-
* POST /assessments/question/{questionId}/submit
455+
* POST /assessments/question/{questionId}/answer
456456
*/
457457
export const postAnswer = async (
458458
id: number,
459459
answer: string | number,
460460
tokens: Tokens
461461
): Promise<Response | null> => {
462-
const resp = await request(`assessments/question/${id}/submit`, 'POST', {
462+
const resp = await request(`assessments/question/${id}/answer`, 'POST', {
463463
...tokens,
464464
body: { answer: `${answer}` },
465465
noHeaderAccept: true,
@@ -788,37 +788,17 @@ export const deleteSourcecastEntry = async (
788788
return resp;
789789
};
790790

791-
/**
792-
* POST /assessments/{assessmentId}
793-
*/
794-
export const changeDateAssessment = async (
795-
id: number,
796-
closeAt: string,
797-
openAt: string,
798-
tokens: Tokens
799-
): Promise<Response | null> => {
800-
const resp = await request(`admin/assessments/${id}`, 'POST', {
801-
...tokens,
802-
body: { closeAt, openAt },
803-
noHeaderAccept: true,
804-
shouldAutoLogout: false,
805-
shouldRefresh: true
806-
});
807-
808-
return resp;
809-
};
810-
811791
/**
812792
* POST /admin/assessments/{assessmentId}
813793
*/
814-
export const publishAssessment = async (
794+
export const updateAssessment = async (
815795
id: number,
816-
togglePublishTo: boolean,
796+
body: { openAt?: string; closeAt?: string; isPublished?: boolean },
817797
tokens: Tokens
818798
): Promise<Response | null> => {
819799
const resp = await request(`admin/assessments/${id}`, 'POST', {
820800
...tokens,
821-
body: { togglePublishTo },
801+
body: body,
822802
noHeaderAccept: true,
823803
shouldAutoLogout: false,
824804
shouldRefresh: true
@@ -842,7 +822,7 @@ export const deleteAssessment = async (id: number, tokens: Tokens): Promise<Resp
842822
};
843823

844824
/**
845-
* POST /assessments
825+
* POST /admin/assessments
846826
*/
847827
export const uploadAssessment = async (
848828
file: File,
@@ -852,7 +832,7 @@ export const uploadAssessment = async (
852832
const formData = new FormData();
853833
formData.append('assessment[file]', file);
854834
formData.append('forceUpdate', String(forceUpdate));
855-
const resp = await request(`assessments`, 'POST', {
835+
const resp = await request(`admin/assessments`, 'POST', {
856836
...tokens,
857837
body: formData,
858838
noContentType: true,

0 commit comments

Comments
 (0)