Tuukka Kivilahti · @tkfftk · Aino Leppänen · Aino Leppänen
--- a/code/moya-angular/src/app/modules/viplist/viplist.service.ts
+++ b/code/moya-angular/src/app/modules/viplist/viplist.service.ts


 import {HttpClient} from '@angular/common/http';
-import {MOYA_BASE_URL} from '../../shared/tools/moya-rest.tool';
+import {MOYA_BASE_URL, MOYA_REST_URL} from '../../shared/config/moya.config';
+import gql from 'graphql-tag';
+import {EventUser} from '../../shared/models/event-user.model';
+import {Apollo} from 'apollo-angular';
+import 'rxjs-compat/add/operator/map';
--- a/code/moya-angular/src/app/modules/viplist/viplist.service.ts
+++ b/code/moya-angular/src/app/modules/viplist/viplist.service.ts

  /**
   * get vips
-   * @param searchString: searchString, skip to return all vips
   */
-  public get(searchString?: string): Observable<Array<Vip>> {
-
-    if (!searchString) {
-      return this.http.get(MOYA_BASE_URL + 'v3/vip/all').pipe(
-        switchMap(res => observableForkJoin(...(res as Array<any>), map(apiRow => this.hostPopulator(apiRow)))));
-    }
-
-    return this.http.get(MOYA_BASE_URL + 'v3/vip/search/' + searchString).pipe(
-      switchMap(v => observableForkJoin(...(v as Array<any>), map(x => this.hostPopulator(x)))));
+  public get(): Observable<Array<Vip>> {
+    return this.apollo.watchQuery<VipsQueryRoot>({query: Q_VIPS_N_DATA}).valueChanges.pipe(map(x => { console.log(x.data.vips); return x.data.vips; }));