[WIP] Switched to gql #162-2

kdb-web/src/app/services/data/data.service.ts

@@ -1,53 +1,30 @@
-import { HttpClient, HttpHeaders } from '@angular/common/http';
-import { Injectable } from '@angular/core';
-import { Observable } from 'rxjs';
-import { ServerDTO } from 'src/app/models/discord/server.dto';
-import { GetFilteredServersResultDTO } from 'src/app/models/selection/server/get-filtered-servers-result.dto';
-import { ServerSelectCriterion } from 'src/app/models/selection/server/server-select-criterion.dto';
-import { SettingsService } from '../settings/settings.service';
+import { HttpClient } from "@angular/common/http";
+import { Injectable } from "@angular/core";
+import { SettingsService } from "../settings/settings.service";
+import { Apollo, gql } from "apollo-angular";
 
 @Injectable({
   providedIn: 'root'
 })
 export class DataService {
 
+  serverQuery = this.apollo.watchQuery({
+      query: gql`
+        {
+          serverCount
+          servers {
+            id
+            name
+          }
+        }
+      `
+    });
+
+
   constructor(
     private appsettings: SettingsService,
     private http: HttpClient,
-  ) { }
+    private apollo: Apollo
+  ) {}
 
-
-
-  /* data requests */
-  getAllServers(): Observable<Array<ServerDTO>> {
-    return this.http.get<Array<ServerDTO>>(`${this.appsettings.getApiURL()}/api/discord/server/servers`, {
-      headers: new HttpHeaders({
-        'Content-Type': 'application/json'
-      })
-    });
-  }
-  
-  getAllServersByUser(): Observable<Array<ServerDTO>> {
-    return this.http.get<Array<ServerDTO>>(`${this.appsettings.getApiURL()}/api/discord/server/servers-by-user`, {
-      headers: new HttpHeaders({
-        'Content-Type': 'application/json'
-      })
-    });
-  }
-
-  getFilteredServers(selectCriterions: ServerSelectCriterion): Observable<GetFilteredServersResultDTO> {
-    return this.http.post<GetFilteredServersResultDTO>(`${this.appsettings.getApiURL()}/api/discord/server/get/filtered`, selectCriterions, {
-      headers: new HttpHeaders({
-        'Content-Type': 'application/json'
-      })
-    });
-  }
-  
-  getServerByID(id: number): Observable<ServerDTO> {
-    return this.http.get<ServerDTO>(`${this.appsettings.getApiURL()}/api/discord/server/get/${id}`, {
-      headers: new HttpHeaders({
-        'Content-Type': 'application/json'
-      })
-    });
-  }
 }

kdb-web/src/app/services/data/server.service.ts

@@ -1,14 +1,14 @@
-import { Injectable } from '@angular/core';
-import { BehaviorSubject, Subject } from 'rxjs';
-import { ServerDTO } from 'src/app/models/discord/server.dto';
+import { Injectable } from "@angular/core";
+import { BehaviorSubject } from "rxjs";
+import { Server } from "src/app/models/data/server.model";
 
 @Injectable({
   providedIn: 'root'
 })
 export class ServerService {
 
-  private server!: ServerDTO;
-  server$ = new BehaviorSubject<ServerDTO | null>(null);
+  private server!: Server;
+  server$ = new BehaviorSubject<Server | null>(null);
 
   constructor() {
     this.server$.subscribe(server => {