Skip to content

Get rid unnecessary requests to ami because it exists on backend #105

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
Shutya wants to merge 1 commit into
base: master
Choose a base branch
from
Open

Get rid unnecessary requests to ami because it exists on backend #105

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
7 changes: 2 additions & 5 deletions src/client/containers/TaskTrainContainer/TaskTrainContainer.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -50,11 +50,9 @@ class TaskTrainContainer extends React.Component {
}

submitTask = () => {
const {id, taskId} = this.props.match.params;
const {taskId} = this.props.match.params;
if (!this.state.solution) return;
this.props.submitSolutionRequest({
userInfo: this.props.userInfo,
tournamentId: id,
taskId: taskId,
solutionCode: this.state.solution
});
Expand Down Expand Up @@ -199,8 +197,7 @@ const mapStateToProps = (state) => {
solutionResult: state.solution.result,
solutionError: state.solution.error,
solutionLoading: state.solution.isLoading,
solutionSubmitLoading: state.solution.isSubmitLoading,
userInfo: state.user.userInfo
solutionSubmitLoading: state.solution.isSubmitLoading
};
};

Expand Down
7 changes: 0 additions & 7 deletions src/common/api/ami.js
View file
Open in desktop

This file was deleted.

1 change: 0 additions & 1 deletion src/common/endpoints/index.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,5 +4,4 @@ export const TASK_ENDPOINT = 'task';
export const ME = 'me';
export const USERS = 'user';
export const PROFILE_ENDPOINT = 'profile';
export const AMI_ENDPOINT = 'http://battle.frontspot.co/api-redirect/redirect/ami';
export const SEC_ENDPOINT = 'sec';
13 changes: 1 addition & 12 deletions src/common/sagas/solutionSaga.js
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,4 @@
import {call, put, takeEvery} from 'redux-saga/effects';
import {getTournamentById} from '../api/tournaments';
import {postToAmi} from '../api/ami';

import {
submitSolution,
Expand All @@ -21,21 +19,12 @@ import {

function* sendSolution({payload}) {
try {
const {solutionCode, taskId, tournamentId, userInfo} = payload;
const {solutionCode, taskId} = payload;
if (!(solutionCode && taskId)) {
return put(submitSolutionFailed('Empty solution'));
}
const submitResult = yield call(submitSolution, payload);
yield put(submitSolutionSuccess(submitResult));
const tournament = yield call(getTournamentById, tournamentId);
if (tournament.solved === tournament.total) {
const dataToAmi = {
upsa: userInfo.upsa,
language: tournament.language,
tournament: tournament.id
};
yield call(postToAmi, dataToAmi);
}
} catch (e) {
yield put(submitSolutionFailed(e));
}
Expand Down