Refactor request service

- Add http post and postgraphql methods to base service
master
Trivernis 5 years ago
parent 99f1a315ef
commit 76adff40eb

@ -51,6 +51,7 @@ export class LoginComponent implements OnInit {
}); });
}, (error: IErrorResponse) => { }, (error: IErrorResponse) => {
if (error.error) { if (error.error) {
console.error(error);
this.loginError(error); this.loginError(error);
} }
}); });

@ -5,10 +5,10 @@ import {RequestService} from '../../services/request/request.service';
import {SettingsService} from '../../services/settings/settings.service'; import {SettingsService} from '../../services/settings/settings.service';
import {environment} from 'src/environments/environment'; import {environment} from 'src/environments/environment';
import {Levellist} from 'src/app/models/levellist'; import {Levellist} from 'src/app/models/levellist';
import {Http} from '@angular/http';
import {Router} from '@angular/router'; import {Router} from '@angular/router';
import {User} from 'src/app/models/user'; import {User} from 'src/app/models/user';
import {OverlayContainer} from '@angular/cdk/overlay'; import {OverlayContainer} from '@angular/cdk/overlay';
import {LoginService} from '../../services/login/login.service';
@Component({ @Component({
selector: 'app-main-navigation', selector: 'app-main-navigation',
@ -21,9 +21,10 @@ export class MainNavigationComponent implements OnInit {
public overlayContainer: OverlayContainer, public overlayContainer: OverlayContainer,
private data: DatasharingService, private data: DatasharingService,
private settingsService: SettingsService, private settingsService: SettingsService,
private requestservice: RequestService, private requestService: RequestService,
private breakpointObserver: BreakpointObserver, private breakpointObserver: BreakpointObserver,
private http: Http, private router: Router, private loginService: LoginService,
private router: Router,
) { ) {
this.overlay = overlayContainer.getContainerElement(); this.overlay = overlayContainer.getContainerElement();
} }
@ -123,30 +124,25 @@ export class MainNavigationComponent implements OnInit {
localStorage.setItem('theme', theme); localStorage.setItem('theme', theme);
} }
/**
* Logs out
*/
logout() { logout() {
const url = environment.graphQLUrl; this.loginService.logout().subscribe(() => {
const headers = new Headers();
headers.set('Content-Type', 'application/json');
const body = {
query: `mutation {
logout
}`
};
this.http.post(url, body).subscribe(response => {
});
this.loggedIn = false; this.loggedIn = false;
const user = new User(); const user = new User();
user.loggedIn = false; user.loggedIn = false;
this.data.changeUserInfo(user); this.data.changeUserInfo(user);
this.router.navigate(['login']); this.router.navigate(['login']);
});
} }
/**
* Accepts a request
* @param id
*/
acceptRequest(id: number) { acceptRequest(id: number) {
const headers = new Headers(); this.requestService.acceptRequest(id).subscribe(response => {
headers.set('Content-Type', 'application/json');
this.http.post(environment.graphQLUrl, this.requestservice.buildJsonAcceptRequest(id))
.subscribe(response => {
for (let i = 0; i < this.user.receivedRequests.length; i++) { for (let i = 0; i < this.user.receivedRequests.length; i++) {
if (this.user.receivedRequests[i].senderUserID === id) { if (this.user.receivedRequests[i].senderUserID === id) {
this.user.receivedRequests.splice(i, 1); this.user.receivedRequests.splice(i, 1);
@ -156,11 +152,12 @@ export class MainNavigationComponent implements OnInit {
}); });
} }
/**
* Denys a request
* @param id
*/
denyRequest(id: number) { denyRequest(id: number) {
const headers = new Headers(); this.requestService.denyRequest(id).subscribe(() => {
headers.set('Content-Type', 'application/json');
this.http.post(environment.graphQLUrl, this.requestservice.buildJsonDenyRequest(id))
.subscribe(response => {
for (let i = 0; i < this.user.receivedRequests.length; i++) { for (let i = 0; i < this.user.receivedRequests.length; i++) {
if (this.user.receivedRequests[i].senderUserID === id) { if (this.user.receivedRequests[i].senderUserID === id) {
this.user.receivedRequests.splice(i, 1); this.user.receivedRequests.splice(i, 1);

@ -1,7 +1,8 @@
import {Injectable} from '@angular/core'; import {Injectable} from '@angular/core';
import { HttpErrorResponse, HttpHeaders} from '@angular/common/http'; import {HttpClient, HttpHeaders} from '@angular/common/http';
import {delay, mergeMap, retryWhen} from 'rxjs/operators'; import {delay, mergeMap, retry, retryWhen} from 'rxjs/operators';
import {Observable, of, throwError} from 'rxjs'; import {Observable, of, throwError} from 'rxjs';
import {environment} from '../../environments/environment';
const httpTooManyCode = 429; const httpTooManyCode = 429;
const httpHeaderRateRetry = 'Retry-After'; const httpHeaderRateRetry = 'Retry-After';
@ -11,11 +12,33 @@ const httpHeaderRateRetry = 'Retry-After';
}) })
export abstract class BaseService { export abstract class BaseService {
protected headers: HttpHeaders; protected headers: HttpHeaders;
protected constructor() { protected constructor(protected http?: HttpClient) {
this.headers = new HttpHeaders(); this.headers = new HttpHeaders();
this.headers.set('Content-Type', 'application/json'); this.headers.set('Content-Type', 'application/json');
} }
/**
* Does a http post request
* @param url
* @param body
* @param options
* @param retryLimit
*/
protected post<T>(url: string, body: any, options?: any, retryLimit: number = 3): Observable<any | T> {
return this.http.post<T>(url, body, Object.assign({headers: this.headers}, options))
.pipe(this.retryRated(retryLimit));
}
/**
* Does a http post to the graphql url
* @param body
* @param options
* @param retryLimit
*/
protected postGraphql<T>(body: any, options?: any, retryLimit: number = 3): Observable<any | T> {
return this.post<T>(environment.graphQLUrl, body, options, retryLimit);
}
/** /**
* Retries a request according to the rate limit * Retries a request according to the rate limit
* @param maxRetry * @param maxRetry

@ -1,12 +0,0 @@
import {TestBed} from '@angular/core/testing';
import {DocumentService} from './document.service';
describe('DocumentService', () => {
beforeEach(() => TestBed.configureTestingModule({}));
it('should be created', () => {
const service: DocumentService = TestBed.get(DocumentService);
expect(service).toBeTruthy();
});
});

@ -1,39 +0,0 @@
import {Injectable} from '@angular/core';
import {Socket} from 'ngx-socket-io';
import {Document} from '../models/document';
@Injectable({
providedIn: 'root'
})
export class DocumentService {
currentDocument = this.socket.fromEvent<Document>('document');
documents = this.socket.fromEvent<string[]>('documents');
constructor(private socket: Socket) {
}
getDocument(id: string) {
this.socket.emit('getDoc', id);
}
newDocument() {
this.socket.emit('addDoc', {id: this.docId(), doc: ''});
}
editDocument(document: Document) {
this.socket.emit('editDoc', document);
}
private docId() {
let text = '';
const possible = 'ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz0123456789';
for (let i = 0; i < 5; i++) {
text += possible.charAt(Math.floor(Math.random() * possible.length));
}
return text;
}
}

@ -99,8 +99,8 @@ export enum Sort {
}) })
export class FeedService extends BaseService { export class FeedService extends BaseService {
constructor(private http: HttpClient) { constructor(http: HttpClient) {
super(); super(http);
} }
public postsAvailable = new BehaviorSubject<boolean>(true); public postsAvailable = new BehaviorSubject<boolean>(true);
@ -159,7 +159,7 @@ export class FeedService extends BaseService {
* @param body * @param body
*/ */
private createPostRequest(body: { variables: any; query: string }) { private createPostRequest(body: { variables: any; query: string }) {
return this.http.post(environment.graphQLUrl, body, {headers: this.headers}) return this.postGraphql(body, null, 0)
.pipe(tap(response => { .pipe(tap(response => {
if (this.activePostList === Sort.NEW) { if (this.activePostList === Sort.NEW) {
const updatedPosts = this.posts.getValue(); const updatedPosts = this.posts.getValue();
@ -180,7 +180,7 @@ export class FeedService extends BaseService {
} }
}; };
return this.http.post(environment.graphQLUrl, body, {headers: this.headers}).pipe(this.retryRated()); return this.postGraphql(body);
} }
/** /**
@ -194,7 +194,7 @@ export class FeedService extends BaseService {
} }
}; };
return this.http.post(environment.graphQLUrl, body, {headers: this.headers}).pipe(this.retryRated()); return this.postGraphql(body);
} }
/** /**

@ -137,5 +137,4 @@ export class GroupService {
}; };
return this.http.post(environment.graphQLUrl, body); return this.http.post(environment.graphQLUrl, body);
} }
} }

@ -42,13 +42,17 @@ const graphqlQuery = `mutation($email: String!, $pwHash: String!) {
} }
}`; }`;
const logoutGqlQuery = `mutation {
logout
}`;
@Injectable({ @Injectable({
providedIn: 'root' providedIn: 'root'
}) })
export class LoginService extends BaseService { export class LoginService extends BaseService {
constructor(private http: HttpClient, private datasharingService: DatasharingService) { constructor(http: HttpClient, private datasharingService: DatasharingService) {
super(); super(http);
} }
/** /**
@ -65,17 +69,33 @@ export class LoginService extends BaseService {
}; };
} }
/**
* Builds a logout request
*/
public static buildLogoutBody(): any {
return {
query: logoutGqlQuery
};
}
/** /**
* Performs a login request and returns the data of the logged in user. * Performs a login request and returns the data of the logged in user.
* @param login * @param login
*/ */
public login(login: Login) { public login(login: Login) {
const body = LoginService.buildRequestBody(login); const body = LoginService.buildRequestBody(login);
return this.http.post<ILoginRequestResult>(environment.graphQLUrl, body, {headers: this.headers}) return this.postGraphql<ILoginRequestResult>(body, null, 0)
.pipe(tap(response => { .pipe(tap(response => {
const user = new User(); const user = new User();
user.assignFromResponse(response.data.login); user.assignFromResponse(response.data.login);
this.datasharingService.changeUserInfo(user); this.datasharingService.changeUserInfo(user);
})); }));
} }
/**
* Loggs out
*/
public logout() {
return this.postGraphql(LoginService.buildLogoutBody());
}
} }

@ -51,8 +51,8 @@ const graphqlGetProfileQuery = `query($userId: ID) {
}) })
export class ProfileService extends BaseService { export class ProfileService extends BaseService {
constructor(private http: HttpClient) { constructor(http: HttpClient) {
super(); super(http);
} }
public proflile: Subject<any> = new Subject(); public proflile: Subject<any> = new Subject();
@ -77,8 +77,7 @@ export class ProfileService extends BaseService {
public getUserData(userId: string) { public getUserData(userId: string) {
const headers = new Headers(); const headers = new Headers();
headers.set('Content-Type', 'application/json'); headers.set('Content-Type', 'application/json');
this.http.post(environment.graphQLUrl, ProfileService.buildGetProfileBody(userId)) this.postGraphql(ProfileService.buildGetProfileBody(userId))
.pipe(this.retryRated())
.subscribe(result => { .subscribe(result => {
this.proflile.next(this.getProfileData(result)); this.proflile.next(this.getProfileData(result));
return this.proflile; return this.proflile;

@ -1,18 +1,74 @@
import {Injectable} from '@angular/core'; import {Injectable} from '@angular/core';
import {Headers, Http} from '@angular/http';
import {DatasharingService} from '../datasharing.service'; import {DatasharingService} from '../datasharing.service';
import {Router} from '@angular/router'; import {Router} from '@angular/router';
import {environment} from 'src/environments/environment';
import {User} from 'src/app/models/user'; import {User} from 'src/app/models/user';
import {GroupInfo} from 'src/app/models/groupinfo'; import {GroupInfo} from 'src/app/models/groupinfo';
import {HttpClient} from '@angular/common/http';
import {BaseService} from '../base.service';
const denyRequestGqlQuery = `mutation($id: ID!) {
denyRequest(sender: $id, type: FRIENDREQUEST)
}`;
const acceptRequestGqlQuery = `mutation($id: ID!) {
acceptRequest(sender: $id, type: FRIENDREQUEST)
}`;
const sendRequestGqlQuery = `mutation($id: ID!, $type: RequestType) {
sendRequest(receiver: $id, type: $type) {
id
}
}`;
@Injectable({ @Injectable({
providedIn: 'root' providedIn: 'root'
}) })
export class RequestService { export class RequestService extends BaseService {
constructor(http: HttpClient, private data: DatasharingService, private router: Router) {
super(http);
}
constructor(private http: Http, private data: DatasharingService, private router: Router) { private static buildDenyRequestBody(id: number): any {
return {
query: denyRequestGqlQuery
, variables: {
id
}
};
}
private static buildAcceptRequestBody(id: number): any {
return {
query: acceptRequestGqlQuery
, variables: {
id
}
};
}
private static buildJoinGroupBody(id: number): any {
return {
query: `mutation($id: ID!) {
joinGroup(id: $id) {
id
}
}`
, variables: {
id
}
};
}
private static buildSendRequestBody(id: number, type: String): any {
return {
query: sendRequestGqlQuery
, variables: {
id,
type
}
};
} }
public isAllowedToSendRequest(userID: number, self: User): boolean { public isAllowedToSendRequest(userID: number, self: User): boolean {
@ -55,74 +111,39 @@ export class RequestService {
return true; return true;
} }
/**
* Sends a send request
* @param user
*/
public sendFriendRequest(user: User) { public sendFriendRequest(user: User) {
this.postGraphql(RequestService.buildSendRequestBody(user.userID, 'FRIENDREQUEST'))
.subscribe(() => {
this.data.addSentRequestUserID(user.userID); this.data.addSentRequestUserID(user.userID);
const headers = new Headers();
headers.set('Content-Type', 'application/json');
this.http.post(environment.graphQLUrl, this.buildJsonRequest(user.userID, 'FRIENDREQUEST'))
.subscribe(response => {
}); });
} }
/**
* Joins a group
* @param group
*/
public joinGroup(group: GroupInfo) { public joinGroup(group: GroupInfo) {
const headers = new Headers(); this.postGraphql(RequestService.buildJoinGroupBody(group.id))
headers.set('Content-Type', 'application/json'); .subscribe();
this.http.post(environment.graphQLUrl, this.buildJsonJoinGroup(group.id))
.subscribe(response => {
});
}
public buildJsonRequest(id_: number, type_: String): any {
const body = {
query: `mutation($id: ID!, $type: RequestType) {
sendRequest(receiver: $id, type: $type) {
id
}
}`
, variables: {
id: id_,
type: type_
}
};
return body;
}
public buildJsonJoinGroup(id_: number): any {
const body = {
query: `mutation($id: ID!) {
joinGroup(id: $id) {
id
}
}`
, variables: {
id: id_
}
};
return body;
} }
public buildJsonAcceptRequest(id_: number): any { /**
const body = { * Accepts a request
query: `mutation($id: ID!) { * @param id
acceptRequest(sender: $id, type: FRIENDREQUEST) */
}` public acceptRequest(id: number) {
, variables: { return this.postGraphql(RequestService.buildAcceptRequestBody(id));
id: id_
}
};
return body;
} }
public buildJsonDenyRequest(id_: number): any { /**
const body = { * Denys a request
query: `mutation($id: ID!) { * @param id
denyRequest(sender: $id, type: FRIENDREQUEST) */
}` public denyRequest(id: number) {
, variables: { return this.postGraphql(RequestService.buildDenyRequestBody(id));
id: id_
}
};
return body;
} }
} }

@ -41,8 +41,8 @@ const graphqlQuery = `query($query: String!, $first: Int, $offset: Int) {
providedIn: 'root' providedIn: 'root'
}) })
export class SearchService extends BaseService { export class SearchService extends BaseService {
constructor(private http: HttpClient, private data: DatasharingService, private router: Router) { constructor(http: HttpClient, private data: DatasharingService, private router: Router) {
super(); super(http);
} }
/** /**
@ -101,7 +101,7 @@ export class SearchService extends BaseService {
*/ */
public search(query: string): Observable<ISearchRequestResult> { public search(query: string): Observable<ISearchRequestResult> {
const body = SearchService.buildRequestBody(query); const body = SearchService.buildRequestBody(query);
return this.http.post<ISearchRequestResult>(environment.graphQLUrl, body, {headers: this.headers}) return this.postGraphql<ISearchRequestResult>(body)
.pipe(this.retryRated()); .pipe(this.retryRated());
} }
} }

@ -40,8 +40,8 @@ const getSelfGraphqlQuery = `{
}) })
export class SelfService extends BaseService { export class SelfService extends BaseService {
constructor(private http: HttpClient, private data: DatasharingService) { constructor(http: HttpClient, private data: DatasharingService) {
super(); super(http);
} }
/** /**
@ -61,8 +61,7 @@ export class SelfService extends BaseService {
const headers = new Headers(); const headers = new Headers();
headers.set('Content-Type', 'application/json'); headers.set('Content-Type', 'application/json');
return this.http.post(url, SelfService.buildGetSelfBody(), {headers: this.headers}) return this.postGraphql(SelfService.buildGetSelfBody())
.pipe(this.retryRated())
.pipe(tap(response => { .pipe(tap(response => {
this.updateUserInfo(response); this.updateUserInfo(response);
})); }));
@ -75,7 +74,7 @@ export class SelfService extends BaseService {
public changeProfilePicture(file: any) { public changeProfilePicture(file: any) {
const formData: any = new FormData(); const formData: any = new FormData();
formData.append('profilePicture', file); formData.append('profilePicture', file);
return this.http.post<IFileUploadResult>(environment.greenvironmentUrl + '/upload', formData) return this.post<IFileUploadResult>(environment.greenvironmentUrl + '/upload', formData, null, 0)
.pipe(this.retryRated()); .pipe(this.retryRated());
} }

@ -14,8 +14,8 @@ const graphqlCreateGroupQuery = `mutation($name: String!) {
}) })
export class SocialService extends BaseService { export class SocialService extends BaseService {
constructor(private http: HttpClient) { constructor(http: HttpClient) {
super(); super(http);
} }
/** /**
@ -36,7 +36,6 @@ export class SocialService extends BaseService {
*/ */
createGroup(name: string) { createGroup(name: string) {
const body = SocialService.buildGroupCreateBody(name); const body = SocialService.buildGroupCreateBody(name);
return this.http.post(environment.graphQLUrl, body, {headers: this.headers}) return this.postGraphql(body);
.pipe(this.retryRated());
} }
} }

Loading…
Cancel
Save