From d592e0a9b2931c7c9cbedb27fb8efc9aaacad9bb Mon Sep 17 00:00:00 2001 From: Chocobozzz Date: Thu, 14 Sep 2017 11:57:49 +0200 Subject: Move to HttpClient and PrimeNG data table --- .../app/shared/video-abuse/video-abuse.service.ts | 41 ++++++++++++++-------- 1 file changed, 26 insertions(+), 15 deletions(-) (limited to 'client/src/app/shared/video-abuse/video-abuse.service.ts') diff --git a/client/src/app/shared/video-abuse/video-abuse.service.ts b/client/src/app/shared/video-abuse/video-abuse.service.ts index 636a02084..984581114 100644 --- a/client/src/app/shared/video-abuse/video-abuse.service.ts +++ b/client/src/app/shared/video-abuse/video-abuse.service.ts @@ -1,42 +1,53 @@ import { Injectable } from '@angular/core' -import { Http } from '@angular/http' -import { Observable } from 'rxjs/Observable' +import { HttpClient, HttpParams } from '@angular/common/http' import 'rxjs/add/operator/catch' import 'rxjs/add/operator/map' +import { Observable } from 'rxjs/Observable' + +import { SortMeta } from 'primeng/primeng' import { AuthService } from '../core' -import { AuthHttp } from '../auth' -import { RestDataSource, RestExtractor, ResultList } from '../rest' -import { VideoAbuse } from '../../../../../shared' +import { RestExtractor, RestPagination, RestService } from '../rest' +import { Utils } from '../utils' +import { ResultList, VideoAbuse } from '../../../../../shared' @Injectable() export class VideoAbuseService { private static BASE_VIDEO_ABUSE_URL = API_URL + '/api/v1/videos/' constructor ( - private authHttp: AuthHttp, + private authHttp: HttpClient, + private restService: RestService, private restExtractor: RestExtractor ) {} - getDataSource () { - return new RestDataSource(this.authHttp, VideoAbuseService.BASE_VIDEO_ABUSE_URL + 'abuse') + getVideoAbuses (pagination: RestPagination, sort: SortMeta): Observable> { + const url = VideoAbuseService.BASE_VIDEO_ABUSE_URL + 'abuse' + + let params = new HttpParams() + params = this.restService.addRestGetParams(params, pagination, sort) + + return this.authHttp.get>(url, { params }) + .map(res => this.restExtractor.convertResultListDateToHuman(res)) + .map(res => this.restExtractor.applyToResultListData(res, this.formatVideoAbuse.bind(this))) + .catch(res => this.restExtractor.handleError(res)) } reportVideo (id: number, reason: string) { + const url = VideoAbuseService.BASE_VIDEO_ABUSE_URL + id + '/abuse' const body = { reason } - const url = VideoAbuseService.BASE_VIDEO_ABUSE_URL + id + '/abuse' return this.authHttp.post(url, body) .map(this.restExtractor.extractDataBool) - .catch((res) => this.restExtractor.handleError(res)) + .catch(res => this.restExtractor.handleError(res)) } - private extractVideoAbuses (result: ResultList) { - const videoAbuses: VideoAbuse[] = result.data - const totalVideoAbuses = result.total - - return { videoAbuses, totalVideoAbuses } + private formatVideoAbuse (videoAbuse: VideoAbuse) { + return Object.assign(videoAbuse, { + createdAt: Utils.dateToHuman(videoAbuse.createdAt) + }) } + } -- cgit v1.2.3