Revize ecf648bb

Re#7493 Fixed user service put request call

webapp/src/app/models/post-requests.model.ts

@@ -1 @@
-import {RequestStatus, TimeUnit, UserType} from '../enums/common.enum';
+import {RequestStatus} from '../enums/common.enum';
 
 export interface UserRequest {
   id: number;

webapp/src/app/services/user.service.ts

@@ -5 +5 @@
 import {Calendar, CalendarEdit, PostCalendar} from '../models/calendar.model';
 import {BasicService} from './basic.service';
 import {catchError} from 'rxjs/operators';
-import {Languages, RequestStatus} from '../enums/common.enum';
+import {Languages, RequestStatus, RequestTypes} from '../enums/common.enum';
 import {UserRequest} from '../models/post-requests.model';
 import {PostUserSettings} from '../models/settings.model';
 
@@ -116 +116 @@
    * Accept or deny user request
    * @param request request to accept or deny
    */
-  putUserRequest(request: UserRequest) {
-    return this.makePutUserRequestApiCall(request, null);
+  putUserRequest(request: UserRequest, type: RequestTypes) {
+    return this.makePutUserRequestApiCall(request, type, null);
   }
 
   /**
@@ -125 +125 @@
    * @param request request to accept or deny
    * @param language specify language
    */
-  putUserRequestWithLanguage(request: UserRequest, language: Languages) {
-    return this.makePutUserRequestApiCall(request, language);
+  putUserRequestWithLanguage(request: UserRequest, type: RequestTypes, language: Languages) {
+    return this.makePutUserRequestApiCall(request, type, language);
   }
 
   /**
@@ -195 +195 @@
    * @param request request to accept or reject
    * @param language specify language
    */
-  private makePutUserRequestApiCall(request: UserRequest, language: Languages) {
-    const httpParams: HttpParams = this.createParams({lang: language});
+  private makePutUserRequestApiCall(request: UserRequest, reqType: RequestTypes, language: Languages) {
+    const httpParams: HttpParams = this.createParams({type: reqType, lang: language});
     const options = {params: httpParams};
 
-    return this.http.put<UserRequest>(this._userUrl + 'request', request, options)
+    return this.http.put<UserRequest>(this._userUrl + 'requests', request, options)
       .pipe(
         catchError(err => this.handleError(err))
       );