diff --git a/src/app/core/services/skydive/jumps.service.ts b/src/app/core/services/skydive/jumps.service.ts index c1f594c..a1750be 100644 --- a/src/app/core/services/skydive/jumps.service.ts +++ b/src/app/core/services/skydive/jumps.service.ts @@ -12,7 +12,7 @@ import { @Injectable({ providedIn: 'root' }) export class JumpsService { - private _apiVersion = '/v1'; + private _apiDomain = '/skydive'; constructor( private apiService: ApiService ) { } @@ -51,7 +51,7 @@ export class JumpsService { Object.assign(params, config.filters); return this.apiService .get( - `${this._apiVersion}/jumps` + ((config.type === 'feed') ? '/feed' : ''), + `${this._apiDomain}/jumps`, new HttpParams({ fromObject: <{ [param: string]: string | number | boolean | readonly (string | number | boolean)[]; }>params }) @@ -63,82 +63,82 @@ export class JumpsService { .pipe(map(data => { return { jump: data.jump, prevJump: data.prevJump, nextJump: data.nextJump }; })); */ - return this.apiService.get(`${this._apiVersion}/jumps/${slug}`); + return this.apiService.get(`${this._apiDomain}/jumps/${slug}`); } getAll(): Observable> { - return this.apiService.get(`${this._apiVersion}/jumps`).pipe(map(data => data.jumps)); + return this.apiService.get(`${this._apiDomain}/jumps`).pipe(map(data => data.jumps)); } getAllByDate(): Observable> { - return this.apiService.get(`${this._apiVersion}/jumps/allByDate`).pipe(map(data => data.jumps)); + return this.apiService.get(`${this._apiDomain}/jumps/allByDate`).pipe(map(data => data.jumps)); } getAllByCategorie(): Observable> { - return this.apiService.get(`${this._apiVersion}/jumps/allByCategorie`).pipe(map(data => data.jumps)); + return this.apiService.get(`${this._apiDomain}/jumps/allByCategorie`).pipe(map(data => data.jumps)); } getAllByDay(config: JumpListConfig): Observable> { const params: JumpListFilters = {} as JumpListFilters; Object.assign(params, config.filters); - return this.apiService.get(`${this._apiVersion}/jumps/allByDay`, new HttpParams({ fromObject: <{ + return this.apiService.get(`${this._apiDomain}/jumps/allByDay`, new HttpParams({ fromObject: <{ [param: string]: string | number | boolean | readonly (string | number | boolean)[]; }>params })) .pipe(map(data => data.days)); } getAllByModule(): Observable> { - return this.apiService.get(`${this._apiVersion}/jumps/allByModule`).pipe(map(data => data.jumps)); + return this.apiService.get(`${this._apiDomain}/jumps/allByModule`).pipe(map(data => data.jumps)); } getAllFromSkydiverIdApi(config: JumpListConfig): Observable { const params: JumpListFilters = {} as JumpListFilters; Object.assign(params, config.filters); - return this.apiService.get(`${this._apiVersion}/jumps/allFromSkydiverIdApi`, new HttpParams({ fromObject: <{ + return this.apiService.get(`${this._apiDomain}/jumps/allFromSkydiverIdApi`, new HttpParams({ fromObject: <{ [param: string]: string | number | boolean | readonly (string | number | boolean)[]; }>params })) .pipe(map(data => data.jumps)); } getLastJump(): Observable { - return this.apiService.get(`${this._apiVersion}/jumps/last`).pipe(map(data => data.jump)); + return this.apiService.get(`${this._apiDomain}/jumps/last`).pipe(map(data => data.jump)); } create(jump: Jump): Observable { - return this.apiService.post(`${this._apiVersion}/jumps/`, { jump: jump }).pipe(map(data => data.jump)); + return this.apiService.post(`${this._apiDomain}/jumps/`, { jump: jump }).pipe(map(data => data.jump)); } update(jump: Jump): Observable { - return this.apiService.put(`${this._apiVersion}/jumps/${jump.slug}`, { jump: jump }).pipe(map(data => data.jump)); + return this.apiService.put(`${this._apiDomain}/jumps/${jump.slug}`, { jump: jump }).pipe(map(data => data.jump)); } destroy(slug: string): Observable { - return this.apiService.delete(`${this._apiVersion}/jumps/${slug}`).pipe(map(data => data.deleted)); + return this.apiService.delete(`${this._apiDomain}/jumps/${slug}`).pipe(map(data => data.deleted)); } save(jump: Jump): Observable { // If we're updating an existing jump if (jump.slug) { - return this.apiService.put(`${this._apiVersion}/jumps/${jump.slug}`, { jump: jump }).pipe(map(data => data.jump)); + return this.apiService.put(`${this._apiDomain}/jumps/${jump.slug}`, { jump: jump }).pipe(map(data => data.jump)); // Otherwise, create a new jump } else { - return this.apiService.post(`${this._apiVersion}/jumps/`, { jump: jump }).pipe(map(data => data.jump)); + return this.apiService.post(`${this._apiDomain}/jumps/`, { jump: jump }).pipe(map(data => data.jump)); } } saveX2Data(slug: string, file: JumpFile, data: X2Data): Observable { - return this.apiService.post(`${this._apiVersion}/jumps/data/${slug}`, { file: file, data: data }) + return this.apiService.post(`${this._apiDomain}/jumps/data/${slug}`, { file: file, data: data }) .pipe(map(data => data.jump)); } saveFile(slug: string, file: JumpFile): Observable { - return this.apiService.post(`${this._apiVersion}/jumps/file/${slug}`, { file: file }) + return this.apiService.post(`${this._apiDomain}/jumps/file/${slug}`, { file: file }) .pipe(map(data => data.file)); } saveKml(slug: string, file: JumpFile): Observable { - return this.apiService.post(`${this._apiVersion}/jumps/kml/${slug}`, { file: file }) + return this.apiService.post(`${this._apiDomain}/jumps/kml/${slug}`, { file: file }) .pipe(map(data => data.file)); }