-
Notifications
You must be signed in to change notification settings - Fork 29
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Bugfix with paying rewards when solving all tasks on a quest manually as
gm
- Loading branch information
1 parent
3373570
commit 5964683
Showing
1 changed file
with
101 additions
and
96 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
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,96 +1,101 @@ | ||
| import {Quest} from './../Interfaces/Quest'; | ||
| import {Task} from './../Interfaces/Task'; | ||
| import {Injectable} from '@angular/core'; | ||
| import {Response} from '@angular/http'; | ||
|
|
||
| import {environment} from '../../environments/environment'; | ||
| import {World} from '../Interfaces/World'; | ||
| import 'rxjs/add/operator/map'; | ||
| import 'rxjs/add/operator/catch'; | ||
| import {StandardTaskService} from './standard-task.service'; | ||
| import {SpecialTaskService} from './special-task.service'; | ||
| import {HttpClient} from '@angular/common/http'; | ||
|
|
||
| @Injectable() | ||
| export class TaskService { | ||
|
|
||
| constructor(public http: HttpClient, | ||
| private standardTaskService: StandardTaskService, | ||
| private specialTaskService: SpecialTaskService) { | ||
| } | ||
|
|
||
| public getTasksForQuest(quest: Quest): Promise<Task[]> { | ||
| return this.http.get<Task[]>(`${environment.endpoint}/task/quest/${quest.id}`) | ||
| .toPromise() | ||
| .catch(this.handleError); | ||
| } | ||
|
|
||
| addToQuest(task: any, quest: any): Promise<Task> { | ||
| return this.http.post<Task>(`${environment.endpoint}/task/${task.id}/addToQuest/${quest.id}`, null) | ||
| .toPromise() | ||
| .catch(this.handleError); | ||
| } | ||
|
|
||
| deleteFromQuest(task: any): Promise<any> { | ||
| return this.http.delete(`${environment.endpoint}/task/${task.id}/deleteFromQuest`) | ||
| .toPromise() | ||
| } | ||
|
|
||
| solveTaskManually(task: any): Promise<any> { | ||
| return this.http.put(`${environment.endpoint}/task/${task.id}/solveManually`, task.id) | ||
| .toPromise() | ||
| } | ||
|
|
||
| refreshTasks(world: World) { | ||
| this.standardTaskService.getStandardTasksForWorld(world); | ||
| this.specialTaskService.getSpecialTasksForWorld(world); | ||
| } | ||
|
|
||
| calculateGoldAmountOfTasks(tasks: Task[]): number { | ||
| return tasks.map(task => task.gold).reduce(function (a, b) { | ||
| return a + b; | ||
| }, 0); | ||
| } | ||
|
|
||
| calculateXpAmountOfTasks(tasks: Task[]): number { | ||
| return tasks.map(task => task.xp).reduce(function (a, b) { | ||
| return a + b; | ||
| }, 0); | ||
| } | ||
|
|
||
| identifyNewAndDeselectedTasks(oldTasks: Task[], currentTasks: Task[]): Array<Task[]> { | ||
| const newTasks = this.taskDifference(currentTasks, oldTasks); | ||
| const deselectedTasks = this.taskDifference(oldTasks, currentTasks) | ||
| return [newTasks, deselectedTasks]; | ||
| } | ||
|
|
||
| addParticipation(task: Task, quest: Quest): Promise<Task> { | ||
| return this.http.post<Task>(`${environment.endpoint}/task/${task.id}/addParticipation/${quest.id}`, null) | ||
| .toPromise() | ||
| .catch(this.handleError); | ||
| } | ||
|
|
||
| removeParticipation(task: any): Promise<any> { | ||
| return this.http.delete(`${environment.endpoint}/task/${task.id}/deleteParticipation`) | ||
| .toPromise() | ||
| } | ||
|
|
||
| private taskDifference(array1: Array<Task>, array2: Array<Task>) { | ||
| return array1.filter(x => !array2.includes(x)); | ||
| } | ||
|
|
||
| private handleError(error: Response | any) { | ||
| let errMsg: string; | ||
| if (error instanceof Response) { | ||
| const body = error.json() || ''; | ||
| const err = body.error || JSON.stringify(body); | ||
| errMsg = `${error.status} - ${error.statusText || ''} ${err}`; | ||
| } else { | ||
| errMsg = error.message ? error.message : error.toString(); | ||
| } | ||
| console.error(errMsg); | ||
| return Promise.reject(errMsg); | ||
| } | ||
|
|
||
|
|
||
| } | ||
| import {Quest} from './../Interfaces/Quest'; | ||
| import {Task} from './../Interfaces/Task'; | ||
| import {Injectable} from '@angular/core'; | ||
| import {Response} from '@angular/http'; | ||
|
|
||
| import {environment} from '../../environments/environment'; | ||
| import {World} from '../Interfaces/World'; | ||
| import 'rxjs/add/operator/map'; | ||
| import 'rxjs/add/operator/catch'; | ||
| import {StandardTaskService} from './standard-task.service'; | ||
| import {SpecialTaskService} from './special-task.service'; | ||
| import {HttpClient} from '@angular/common/http'; | ||
|
|
||
| @Injectable() | ||
| export class TaskService { | ||
|
|
||
| constructor(public http: HttpClient, | ||
| private standardTaskService: StandardTaskService, | ||
| private specialTaskService: SpecialTaskService) { | ||
| } | ||
|
|
||
| public getTasksForQuest(quest: Quest): Promise<Task[]> { | ||
| return this.http.get<Task[]>(`${environment.endpoint}/task/quest/${quest.id}`) | ||
| .toPromise() | ||
| .catch(this.handleError); | ||
| } | ||
|
|
||
| addToQuest(task: any, quest: any): Promise<Task> { | ||
| return this.http.post<Task>(`${environment.endpoint}/task/${task.id}/addToQuest/${quest.id}`, null) | ||
| .toPromise() | ||
| .catch(this.handleError); | ||
| } | ||
|
|
||
| deleteFromQuest(task: any): Promise<any> { | ||
| return this.http.delete(`${environment.endpoint}/task/${task.id}/deleteFromQuest`) | ||
| .toPromise() | ||
| } | ||
|
|
||
| solveTaskManually(task: any): Promise<any> { | ||
| return this.http.put(`${environment.endpoint}/task/${task.id}/solveManually`, task.id) | ||
| .toPromise() | ||
| } | ||
|
|
||
| solveAllTasksInQuest(quest: any): Promise<any> { | ||
| return this.http.put(`${environment.endpoint}/task/solveAllTasksInQuest/${quest.id}`, quest.id) | ||
| .toPromise() | ||
| } | ||
|
|
||
| refreshTasks(world: World) { | ||
| this.standardTaskService.getStandardTasksForWorld(world); | ||
| this.specialTaskService.getSpecialTasksForWorld(world); | ||
| } | ||
|
|
||
| calculateGoldAmountOfTasks(tasks: Task[]): number { | ||
| return tasks.map(task => task.gold).reduce(function (a, b) { | ||
| return a + b; | ||
| }, 0); | ||
| } | ||
|
|
||
| calculateXpAmountOfTasks(tasks: Task[]): number { | ||
| return tasks.map(task => task.xp).reduce(function (a, b) { | ||
| return a + b; | ||
| }, 0); | ||
| } | ||
|
|
||
| identifyNewAndDeselectedTasks(oldTasks: Task[], currentTasks: Task[]): Array<Task[]> { | ||
| const newTasks = this.taskDifference(currentTasks, oldTasks); | ||
| const deselectedTasks = this.taskDifference(oldTasks, currentTasks) | ||
| return [newTasks, deselectedTasks]; | ||
| } | ||
|
|
||
| addParticipation(task: Task, quest: Quest): Promise<Task> { | ||
| return this.http.post<Task>(`${environment.endpoint}/task/${task.id}/addParticipation/${quest.id}`, null) | ||
| .toPromise() | ||
| .catch(this.handleError); | ||
| } | ||
|
|
||
| removeParticipation(task: any): Promise<any> { | ||
| return this.http.delete(`${environment.endpoint}/task/${task.id}/deleteParticipation`) | ||
| .toPromise() | ||
| } | ||
|
|
||
| private taskDifference(array1: Array<Task>, array2: Array<Task>) { | ||
| return array1.filter(x => !array2.includes(x)); | ||
| } | ||
|
|
||
| private handleError(error: Response | any) { | ||
| let errMsg: string; | ||
| if (error instanceof Response) { | ||
| const body = error.json() || ''; | ||
| const err = body.error || JSON.stringify(body); | ||
| errMsg = `${error.status} - ${error.statusText || ''} ${err}`; | ||
| } else { | ||
| errMsg = error.message ? error.message : error.toString(); | ||
| } | ||
| console.error(errMsg); | ||
| return Promise.reject(errMsg); | ||
| } | ||
|
|
||
|
|
||
| } |