From 9d4727d6819c98a19b888c5be55b5b6b5ea7ffc9 Mon Sep 17 00:00:00 2001
From: David Eder <e1326201@student.tuwien.ac.at>
Date: Sat, 12 Jun 2021 12:47:04 +0200
Subject: [PATCH] Add docker compose service for control center

---
 .../control_center/src/app/app.module.ts      |  2 -
 .../src/app/services/websocket.service.ts     | 52 -------------------
 .../src/environments/environment.prod.ts      |  3 +-
 .../src/environments/environment.ts           |  4 +-
 components/x_way/requirements.txt             |  4 +-
 kubernetes/docker-compose.yml                 | 12 ++++-
 6 files changed, 16 insertions(+), 61 deletions(-)
 delete mode 100644 components/control_center/src/app/services/websocket.service.ts

diff --git a/components/control_center/src/app/app.module.ts b/components/control_center/src/app/app.module.ts
index 2860e89..8e719fb 100644
--- a/components/control_center/src/app/app.module.ts
+++ b/components/control_center/src/app/app.module.ts
@@ -6,7 +6,6 @@ import {LandingComponent} from './component/landing/landing.component';
 import {RestService} from './services/rest.service';
 import {HTTP_INTERCEPTORS, HttpClientModule} from '@angular/common/http';
 import {InterceptorService} from './services/interceptor.service';
-import {WebsocketService} from './services/websocket.service';
 import {LoggerModule, NgxLoggerLevel} from 'ngx-logger';
 import {environment} from '../environments/environment';
 import {FormsModule, ReactiveFormsModule} from '@angular/forms';
@@ -39,7 +38,6 @@ import {AgmCoreModule, GoogleMapsAPIWrapper} from '@agm/core';
   providers: [
     GoogleMapsAPIWrapper,
     RestService,
-    WebsocketService,
     {
       provide: HTTP_INTERCEPTORS, useClass: InterceptorService, multi: true
     },
diff --git a/components/control_center/src/app/services/websocket.service.ts b/components/control_center/src/app/services/websocket.service.ts
deleted file mode 100644
index c936698..0000000
--- a/components/control_center/src/app/services/websocket.service.ts
+++ /dev/null
@@ -1,52 +0,0 @@
-import {Injectable} from '@angular/core';
-import {NGXLogger} from 'ngx-logger';
-import {fromEvent, interval, Observable} from 'rxjs';
-
-import {environment} from '../../environments/environment';
-import {WSEvents} from '../interfaces/interface';
-
-@Injectable({
-  providedIn: 'root'
-})
-export class WebsocketService {
-  private wsEndpoint = environment.ws_location + ':' + environment.ws_port + '/test-ws-endpoint/';
-  private readonly ws: WebSocket;
-  private wsEvents: WSEvents;
-
-  constructor(private logger: NGXLogger) {
-    this.logger.debug('Initiating ws connection on', this.wsEndpoint);
-    this.ws = new WebSocket(this.wsEndpoint);
-
-    interval(5000).subscribe(() => {
-      // continuously check if the connection is still open
-      if (this.ws.readyState !== WebSocket.OPEN) {
-        this.logger.error('Lost websocket connection ...', this.ws);
-      }
-    });
-
-  }
-
-  wsTestCall(msg: string): WSEvents {
-    this.logger.debug(
-      'Performing ws test call',
-      'current ws ready state ==', this.ws.readyState + ',',
-      'expected == 1 == open');
-
-    if (this.ws.readyState === WebSocket.OPEN) {
-      this.ws.send(msg);
-    } else {
-      return undefined;
-    }
-
-    if (!this.wsEvents) {
-      this.wsEvents = {
-        message: fromEvent(this.ws, 'message'),
-        error: fromEvent(this.ws, 'error'),
-        close: fromEvent(this.ws, 'close')
-      };
-    }
-
-    return this.wsEvents;
-  }
-
-}
diff --git a/components/control_center/src/environments/environment.prod.ts b/components/control_center/src/environments/environment.prod.ts
index f88694a..69acba3 100644
--- a/components/control_center/src/environments/environment.prod.ts
+++ b/components/control_center/src/environments/environment.prod.ts
@@ -2,8 +2,7 @@ import {NgxLoggerLevel} from 'ngx-logger';
 
 export const environment = {
   production: true,
-  location: window.location.hostname,
+  location: 'xway',
   port: 5004,
-  ws_url_root: 'ws://' + window.location.hostname + ':' + window.location.port + '/',
   log_level: NgxLoggerLevel.WARN,
 };
diff --git a/components/control_center/src/environments/environment.ts b/components/control_center/src/environments/environment.ts
index 152fea1..81fa12d 100644
--- a/components/control_center/src/environments/environment.ts
+++ b/components/control_center/src/environments/environment.ts
@@ -6,10 +6,8 @@ import {NgxLoggerLevel} from 'ngx-logger';
 
 export const environment = {
   production: false,
-  location: 'xwayserver',
+  location: 'xway',
   port: 5004,
-  ws_location: 'ws://127.0.0.1',
-  ws_port: 8000,
   log_level: NgxLoggerLevel.DEBUG,
 };
 
diff --git a/components/x_way/requirements.txt b/components/x_way/requirements.txt
index 55c2263..7df827e 100644
--- a/components/x_way/requirements.txt
+++ b/components/x_way/requirements.txt
@@ -1,3 +1,5 @@
 flask
 Flask-Cors
-requests
\ No newline at end of file
+requests
+Flask-PyMongo
+jsonify
\ No newline at end of file
diff --git a/kubernetes/docker-compose.yml b/kubernetes/docker-compose.yml
index ef846cf..01745f8 100644
--- a/kubernetes/docker-compose.yml
+++ b/kubernetes/docker-compose.yml
@@ -75,4 +75,14 @@ services:
     depends_on:
       - entityident
       - orchestration
-      - eventstore
\ No newline at end of file
+      - eventstore
+  controlcenter:
+    build:
+      context: ../components/control_center
+      dockerfile: Dockerfile
+    expose:
+      - 80
+    ports:
+      - 80:80
+    depends_on:
+      - xway
\ No newline at end of file