diff --git a/src/__data__/api/api.ts b/src/__data__/api/api.ts index bf9adea..6790690 100644 --- a/src/__data__/api/api.ts +++ b/src/__data__/api/api.ts @@ -41,12 +41,12 @@ export const api = createApi({ // Tasks getTasks: builder.query({ query: () => '/challenge/tasks', - transformResponse: (response: { data: ChallengeTask[] }) => response.data, + transformResponse: (response: { body: ChallengeTask[] }) => response.body, providesTags: ['Task'], }), getTask: builder.query({ query: (id) => `/challenge/task/${id}`, - transformResponse: (response: { data: ChallengeTask }) => response.data, + transformResponse: (response: { body: ChallengeTask }) => response.body, providesTags: (_result, _error, id) => [{ type: 'Task', id }], }), createTask: builder.mutation({ @@ -55,7 +55,7 @@ export const api = createApi({ method: 'POST', body, }), - transformResponse: (response: { data: ChallengeTask }) => response.data, + transformResponse: (response: { body: ChallengeTask }) => response.body, invalidatesTags: ['Task'], }), updateTask: builder.mutation({ @@ -64,7 +64,7 @@ export const api = createApi({ method: 'PUT', body: data, }), - transformResponse: (response: { data: ChallengeTask }) => response.data, + transformResponse: (response: { body: ChallengeTask }) => response.body, invalidatesTags: (_result, _error, { id }) => [{ type: 'Task', id }, 'Task'], }), deleteTask: builder.mutation({ @@ -78,12 +78,12 @@ export const api = createApi({ // Chains getChains: builder.query({ query: () => '/challenge/chains', - transformResponse: (response: { data: ChallengeChain[] }) => response.data, + transformResponse: (response: { body: ChallengeChain[] }) => response.body, providesTags: ['Chain'], }), getChain: builder.query({ query: (id) => `/challenge/chain/${id}`, - transformResponse: (response: { data: ChallengeChain }) => response.data, + transformResponse: (response: { body: ChallengeChain }) => response.body, providesTags: (_result, _error, id) => [{ type: 'Chain', id }], }), createChain: builder.mutation({ @@ -92,7 +92,7 @@ export const api = createApi({ method: 'POST', body, }), - transformResponse: (response: { data: ChallengeChain }) => response.data, + transformResponse: (response: { body: ChallengeChain }) => response.body, invalidatesTags: ['Chain'], }), updateChain: builder.mutation({ @@ -101,7 +101,7 @@ export const api = createApi({ method: 'PUT', body: data, }), - transformResponse: (response: { data: ChallengeChain }) => response.data, + transformResponse: (response: { body: ChallengeChain }) => response.body, invalidatesTags: (_result, _error, { id }) => [{ type: 'Chain', id }, 'Chain'], }), deleteChain: builder.mutation({ @@ -115,19 +115,19 @@ export const api = createApi({ // Users getUsers: builder.query({ query: () => '/challenge/users', - transformResponse: (response: { data: ChallengeUser[] }) => response.data, + transformResponse: (response: { body: ChallengeUser[] }) => response.body, providesTags: ['User'], }), // Statistics getSystemStats: builder.query({ query: () => '/challenge/stats', - transformResponse: (response: { data: SystemStats }) => response.data, + transformResponse: (response: { body: SystemStats }) => response.body, providesTags: ['Stats'], }), getUserStats: builder.query({ query: (userId) => `/challenge/user/${userId}/stats`, - transformResponse: (response: { data: UserStats }) => response.data, + transformResponse: (response: { body: UserStats }) => response.body, providesTags: (_result, _error, userId) => [{ type: 'User', id: userId }], }), @@ -137,12 +137,12 @@ export const api = createApi({ const params = taskId ? `?taskId=${taskId}` : '' return `/challenge/user/${userId}/submissions${params}` }, - transformResponse: (response: { data: ChallengeSubmission[] }) => response.data, + transformResponse: (response: { body: ChallengeSubmission[] }) => response.body, providesTags: ['Submission'], }), getAllSubmissions: builder.query({ query: () => '/challenge/submissions', - transformResponse: (response: { data: ChallengeSubmission[] }) => response.data, + transformResponse: (response: { body: ChallengeSubmission[] }) => response.body, providesTags: ['Submission'], }), }), diff --git a/stubs/api/README.md b/stubs/api/README.md index 6329a26..21ee61a 100644 --- a/stubs/api/README.md +++ b/stubs/api/README.md @@ -50,18 +50,19 @@ stubs/api/ ### Успешный ответ ```json { - "error": null, - "data": <данные> + "success": true, + "body": <данные> } ``` ### Ошибка ```json { + "success": false, + "body": null, "error": { "message": "Описание ошибки" - }, - "data": null + } } ``` diff --git a/stubs/api/index.js b/stubs/api/index.js index ef3a808..9a5ac54 100644 --- a/stubs/api/index.js +++ b/stubs/api/index.js @@ -11,14 +11,15 @@ const loadJSON = (filename) => { return JSON.parse(data); }; -const respond = (res, data) => { - res.json({ error: null, data }); +const respond = (res, body) => { + res.json({ success: true, body }); }; const respondError = (res, message, statusCode = 400) => { res.status(statusCode).json({ - error: { message }, - data: null + success: false, + body: null, + error: { message } }); };