Merge pull request particle-iot#50 from AntonPuko/events

move events filtering to EventPublisher

Author: jlkalberer

src/controllers/EventsController.js

@@ -63,7 +63,7 @@ class EventsController extends Controller {
     const subscriptionID = this._eventManager.subscribe(
       eventName,
       this._pipeEvent.bind(this),
-      this.user.id,
+      { userID: this.user.id },
     );
 
     await this._closeStream(subscriptionID);
@@ -77,8 +77,10 @@ class EventsController extends Controller {
     const subscriptionID = this._eventManager.subscribe(
       eventName,
       this._pipeEvent.bind(this),
-      this.user.id,
-      deviceID,
+      {
+        deviceID,
+        userID: this.user.id,
+      },
     );
 
     await this._closeStream(subscriptionID);

src/managers/EventManager.js

@@ -3,43 +3,27 @@
 import type { EventPublisher } from 'spark-protocol';
 import type { Event, EventData } from '../types';
 
+type FilterOptions = {
+  deviceID?: string,
+  userID?: string,
+};
+
 class EventManager {
   _eventPublisher: EventPublisher;
 
   constructor(eventPublisher: EventPublisher) {
     this._eventPublisher = eventPublisher;
   }
 
-  _filterEvents = (
-    eventHandler: (event: Event) => void,
-    userID?: string,
-    deviceID?: string,
-  ): (event: Event) => void =>
-    (event: Event) => {
-      if (
-        event.deviceID &&
-        userID && userID !== event.userID
-      ) {
-        return;
-      }
-
-      if (deviceID && deviceID !== event.deviceID) {
-        return;
-      }
-
-      eventHandler(event);
-    };
-
   subscribe = (
     eventName: ?string,
     eventHandler: (event: Event) => void,
-    userID?: string,
-    deviceID?: string,
+    filterOptions?: FilterOptions,
   ): string =>
     this._eventPublisher.subscribe(
       eventName,
-      this._filterEvents(eventHandler, userID, deviceID),
-      deviceID,
+      eventHandler,
+      filterOptions,
     );
 
   unsubscribe = (subscriptionID: string): void =>