Remove websockets gateway from origin backend

packages/origin-backend-app/package.json

@@ -40,7 +40,6 @@
         "@nestjs/common": "7.0.7",
         "@nestjs/config": "^0.4.0",
         "@nestjs/core": "7.0.7",
-        "@nestjs/platform-ws": "7.0.7",
         "body-parser": "1.19.0",
         "class-validator": "0.11.1",
         "cors": "2.8.5",

packages/origin-backend-app/src/main.ts

@@ -1,7 +1,6 @@
 import { AppModule as ExchangeModule } from '@energyweb/exchange';
 import { LoggerService } from '@nestjs/common';
 import { NestFactory } from '@nestjs/core';
-import { WsAdapter } from '@nestjs/platform-ws';
 import { useContainer } from 'class-validator';
 
 import { OriginAppModule } from './origin-app.module';
@@ -13,7 +12,6 @@ export async function startAPI(logger?: LoggerService) {
     console.log(`Backend starting on port: ${PORT}`);
 
     const app = await NestFactory.create(OriginAppModule.register(null));
-    app.useWebSocketAdapter(new WsAdapter(app));
     app.enableCors();
     app.setGlobalPrefix('api');
 

packages/origin-backend-app/src/port.ts

@@ -12,7 +12,3 @@ export function extractPort(url: string): number {
 export function getPort(): number {
     return parseInt(process.env.BACKEND_PORT, 10) || 3030;
 }
-
-export function getEventsServerPort(): number {
-    return getPort() + 1;
-}

packages/origin-backend-client-mocks/src/DeviceClientMock.ts

@@ -1,25 +1,18 @@
-import moment from 'moment';
+import { IDeviceClient } from '@energyweb/origin-backend-client';
 import {
-    IDevice,
-    DeviceUpdateData,
-    DeviceStatusChangedEvent,
-    SupportedEvents,
-    IEvent,
-    ISmartMeterRead,
     DeviceStatus,
+    DeviceUpdateData,
+    IDevice,
     IDeviceWithRelationsIds,
-    IExternalDeviceId
+    IExternalDeviceId,
+    ISmartMeterRead
 } from '@energyweb/origin-backend-core';
 
-import { IDeviceClient, IEventClient } from '@energyweb/origin-backend-client';
-
 export class DeviceClientMock implements IDeviceClient {
     private storage = new Map<number, IDeviceWithRelationsIds>();
 
     private idCounter = 0;
 
-    constructor(public eventClient: IEventClient) {}
-
     async getByExternalId(id: IExternalDeviceId): Promise<IDeviceWithRelationsIds> {
         return [...this.storage.values()].find((d) =>
             d.externalDeviceIds?.find((i) => i.type === id.type && i.id === id.id)
@@ -58,20 +51,6 @@ export class DeviceClientMock implements IDeviceClient {
 
         this.storage.set(id, device);
 
-        const event: DeviceStatusChangedEvent = {
-            deviceId: id.toString(),
-            status: data.status,
-            deviceManagersEmails: []
-        };
-
-        const sendEvent: IEvent = {
-            type: SupportedEvents.DEVICE_STATUS_CHANGED,
-            data: event,
-            timestamp: moment().unix()
-        };
-
-        (this.eventClient as any).triggerEvent(sendEvent);
-
         return device;
     }
 

packages/origin-backend-client-mocks/src/OffChainDataSourceMock.ts

@@ -7,7 +7,6 @@ import {
     IRequestClient,
     RequestClient,
     IOrganizationClient,
-    IEventClient,
     IFilesClient,
     ICertificateClient
 } from '@energyweb/origin-backend-client';
@@ -17,7 +16,6 @@ import { ConfigurationClientMock } from './ConfigurationClientMock';
 import { UserClientMock } from './UserClientMock';
 import { DeviceClientMock } from './DeviceClientMock';
 import { OrganizationClientMock } from './OrganizationClientMock';
-import { EventClientMock } from './EventClientMock';
 import { CertificateClientMock } from './CertificateClientMock';
 
 export class OffChainDataSourceMock implements IOffChainDataSource {
@@ -29,8 +27,6 @@ export class OffChainDataSourceMock implements IOffChainDataSource {
 
     userClient: IUserClient = new UserClientMock();
 
-    eventClient: IEventClient = new EventClientMock();
-
     deviceClient: IDeviceClient;
 
     organizationClient: IOrganizationClient;
@@ -42,9 +38,7 @@ export class OffChainDataSourceMock implements IOffChainDataSource {
     certificateClient: ICertificateClient = new CertificateClientMock();
 
     constructor() {
-        this.eventClient.start();
-
-        this.deviceClient = new DeviceClientMock(this.eventClient);
-        this.organizationClient = new OrganizationClientMock(this.eventClient);
+        this.deviceClient = new DeviceClientMock();
+        this.organizationClient = new OrganizationClientMock();
     }
 }

packages/origin-backend-client-mocks/src/OrganizationClientMock.ts

@@ -1,31 +1,22 @@
-import moment from 'moment';
+import { IOrganizationClient } from '@energyweb/origin-backend-client';
 import {
-    IOrganizationWithRelationsIds,
-    OrganizationPostData,
-    OrganizationUpdateData,
-    OrganizationInviteCreateReturnData,
     IOrganizationInvitation,
-    OrganizationStatus,
-    OrganizationRemoveMemberReturnData,
+    IOrganizationWithRelationsIds,
     IUserWithRelationsIds,
-    OrganizationStatusChangedEvent,
-    IEvent,
-    SupportedEvents,
     OrganizationInvitationStatus,
-    OrganizationInvitationEvent,
-    OrganizationRemovedMemberEvent
+    OrganizationInviteCreateReturnData,
+    OrganizationPostData,
+    OrganizationRemoveMemberReturnData,
+    OrganizationStatus,
+    OrganizationUpdateData
 } from '@energyweb/origin-backend-core';
 
-import { IOrganizationClient, IEventClient } from '@energyweb/origin-backend-client';
-
 interface ITmpUser {
     id: number;
     email: string;
 }
 
 export class OrganizationClientMock implements IOrganizationClient {
-    constructor(public eventClient: IEventClient) {}
-
     private storage = new Map<number, IOrganizationWithRelationsIds>();
 
     private invitationStorage = new Map<number, IOrganizationInvitation>();
@@ -87,20 +78,6 @@ export class OrganizationClientMock implements IOrganizationClient {
 
         this.storage.set(id, organization);
 
-        const eventData: OrganizationStatusChangedEvent = {
-            organizationId: id,
-            organizationEmail: organization.email,
-            status: data.status
-        };
-
-        const sendEvent: IEvent = {
-            type: SupportedEvents.ORGANIZATION_STATUS_CHANGED,
-            data: eventData,
-            timestamp: moment().unix()
-        };
-
-        (this.eventClient as any).triggerEvent(sendEvent);
-
         return Promise.resolve(organization);
     }
 
@@ -121,19 +98,6 @@ export class OrganizationClientMock implements IOrganizationClient {
 
         this.invitationStorage.set(organizationInvitation.id, organizationInvitation);
 
-        const eventData: OrganizationInvitationEvent = {
-            organizationName: organization.name,
-            email
-        };
-
-        const sendEvent: IEvent = {
-            type: SupportedEvents.ORGANIZATION_INVITATION,
-            data: eventData,
-            timestamp: moment().unix()
-        };
-
-        (this.eventClient as any).triggerEvent(sendEvent);
-
         this.userCounter++;
         this.userStorage.push({
             id: this.userCounter,
@@ -156,23 +120,10 @@ export class OrganizationClientMock implements IOrganizationClient {
     ): Promise<OrganizationRemoveMemberReturnData> {
         const organization = this.storage.get(organizationId);
 
-        organization.users = organization.users.filter(user => user !== userId);
+        organization.users = organization.users.filter((user) => user !== userId);
 
         this.storage.set(organization.id, organization);
 
-        const eventData: OrganizationRemovedMemberEvent = {
-            organizationName: organization.name,
-            email: this.userStorage.find(user => user.id === userId).email
-        };
-
-        const sendEvent: IEvent = {
-            type: SupportedEvents.ORGANIZATION_REMOVED_MEMBER,
-            data: eventData,
-            timestamp: moment().unix()
-        };
-
-        (this.eventClient as any).triggerEvent(sendEvent);
-
         const returnData: OrganizationRemoveMemberReturnData = {
             success: true,
             error: ''
@@ -196,25 +147,12 @@ export class OrganizationClientMock implements IOrganizationClient {
     acceptInvitation(invitationId: number): Promise<any> {
         const invitation = this.invitationStorage.get(invitationId);
         const organization = this.storage.get(invitation.organization as number);
-        const user = this.userStorage.find(user => user.email === invitation.email);
+        const user = this.userStorage.find((user) => user.email === invitation.email);
 
         invitation.status = OrganizationInvitationStatus.Accepted;
 
         organization.users.push(user.id);
 
-        const eventData: OrganizationInvitationEvent = {
-            organizationName: organization.name,
-            email: invitation.email
-        };
-
-        const sendEvent: IEvent = {
-            type: SupportedEvents.ORGANIZATION_INVITATION,
-            data: eventData,
-            timestamp: moment().unix()
-        };
-
-        (this.eventClient as any).triggerEvent(sendEvent);
-
         this.invitationStorage.set(invitationId, invitation);
         this.storage.set(organization.id, organization);