-
Notifications
You must be signed in to change notification settings - Fork 0
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
- Loading branch information
Showing
11 changed files
with
105 additions
and
17 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,5 +1,5 @@ | ||
| export enum Currency { | ||
| "RUB" = "RUB", | ||
| "EUR" = "EUR", | ||
| "USD" = "USD", | ||
| } | ||
| RUB = 'RUB', | ||
| EUR = 'EUR', | ||
| USD = 'USD', | ||
| } |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
3 changes: 3 additions & 0 deletions
3
src/entities/Profile/model/selectors/getProfileValidateErrors/getProfileValidateErrors.ts
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,3 @@ | ||
| import { StateSchema } from 'app/providers/StoreProvider'; | ||
|
|
||
| export const getProfileValidateErrors = (state: StateSchema) => state.profile?.validateErrors; |
16 changes: 11 additions & 5 deletions
16
src/entities/Profile/model/services/updateProfileData/updateProfileData.ts
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,22 +1,28 @@ | ||
| import { createAsyncThunk } from '@reduxjs/toolkit'; | ||
| import { ThunkConfig } from 'app/providers/StoreProvider'; | ||
| import { getProfileForm } from '../../selectors/getProfileForm/getProfileForm'; | ||
| import { Profile } from '../../types/profile'; | ||
| import { Profile, ValidateProfileError } from '../../types/profile'; | ||
| import { validateProfileData } from '../validateProfileData/validateProfileData'; | ||
|
|
||
| export const updateProfileData = createAsyncThunk< | ||
| Profile, | ||
| void, | ||
| ThunkConfig<string> | ||
| Profile, | ||
| void, | ||
| ThunkConfig<ValidateProfileError[]> | ||
| >('profile/updateProfileData', async (_, thunkAPI) => { | ||
| const { extra, rejectWithValue, getState } = thunkAPI; | ||
|
|
||
| const formData = getProfileForm(getState()); | ||
|
|
||
| const errors = validateProfileData(formData); | ||
| if (errors.length) { | ||
| return rejectWithValue(errors); | ||
| } | ||
|
|
||
| try { | ||
| const response = await extra.api.put<Profile>('/profile', formData); | ||
|
|
||
| return response.data; | ||
| } catch (error) { | ||
| return rejectWithValue('error'); | ||
| return rejectWithValue([ValidateProfileError.SERVER_ERROR]); | ||
| } | ||
| }); |
25 changes: 25 additions & 0 deletions
25
src/entities/Profile/model/services/validateProfileData/validateProfileData.ts
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,25 @@ | ||
| import { Profile, ValidateProfileError } from '../../types/profile'; | ||
|
|
||
| export const validateProfileData = (profile: Profile | undefined) => { | ||
| if (!profile) { | ||
| return [ValidateProfileError.NO_DATA]; | ||
| } | ||
| const { | ||
| first, lastname, age, country, | ||
| } = profile; | ||
|
|
||
| const errors: ValidateProfileError[] = []; | ||
|
|
||
| if (!first || !lastname) { | ||
| errors.push(ValidateProfileError.INCORRECT_USER_DATA); | ||
| } | ||
|
|
||
| if (!age || !Number.isInteger(age)) { | ||
| errors.push(ValidateProfileError.INCORRECT_AGE); | ||
| } | ||
|
|
||
| if (!country) { | ||
| errors.push(ValidateProfileError.INCORRECT_COUNTRY); | ||
| } | ||
| return errors; | ||
| }; |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters