Merge pull request #33 from dolittle/event-horizons-builder

Fix builder public API to match .NET SDK

Author: woksin

Samples/Basic/index.ts

@@ -7,20 +7,11 @@ import { PartitionedFilterResult } from '@dolittle/sdk.events.filtering';
 
 import { MyEvent } from './MyEvent';
 import { MyEventHandler } from './MyEventHandler';
-import { Version } from '@dolittle/sdk.execution';
 
 const client = Client
-    .create()
-    .forEnvironment('test')
-    .withLogging(logBuilder => {
-        logBuilder
-            .useWinston(winston => {
-                winston.level = 'debug';
-            });
-    })
-    .forMicroservice('7a6155dd-9109-4488-8f6f-c57fe4b65bfb', microservice => {
-        microservice.withVersion(Version.first);
-    })
+    .forMicroservice('7a6155dd-9109-4488-8f6f-c57fe4b65bfb')
+    .withVersion(1, 0, 2)
+    .withEnvironment('test')
     .withEventTypes(eventTypes =>
         eventTypes.register(MyEvent))
     .withEventHandlers(eventHandlers =>
@@ -29,10 +20,12 @@ const client = Client
     .withFilters(filterBuilder =>
         filterBuilder
             .createPrivateFilter('79e12ab3-2751-47e1-b959-d898dc4d6ee8', fb =>
-                fb.handle((event: any, context: EventContext) => {
-                    return new Promise((resolve, reject) => {
-                        console.log('Filtering event', event);
-                    });
+                fb
+                    .unpartitioned()
+                    .handle((event: any, context: EventContext) => {
+                        return new Promise((resolve, reject) => {
+                            console.log('Filtering event', event);
+                        });
                 })
             )
             .createPublicFilter('2c087657-b318-40b1-ae92-a400de44e507', fb =>

Samples/Container/index.ts

@@ -10,10 +10,8 @@ import { MyEventHandler } from './MyEventHandler';
 
 
 const client = Client
-    .create()
     .forMicroservice('7a6155dd-9109-4488-8f6f-c57fe4b65bfb')
     .withContainer(Container)
-    .withLogging(_ => _.useWinston(_ => _.level = 'debug'))
     .withEventTypes(eventTypes =>
         eventTypes.register(MyEvent))
     .withEventHandlers(eventHandlers =>

Samples/EventHorizon/index.ts

@@ -5,30 +5,28 @@ import { Client } from '@dolittle/sdk';
 
 import { MyEventHandler } from './MyEventHandler';
 import { MyEvent } from './MyEvent';
+import { PartitionId } from '@dolittle/sdk.events';
 
 const client = Client
-    .create()
     .forMicroservice('a14bb24e-51f3-4d83-9eba-44c4cffe6bb9')
     .connectToRuntime('localhost', 50055)
-    .withLogging(_ => _.useWinston(_ => _.level = 'debug'))
     .withEventTypes(eventTypes =>
         eventTypes.register(MyEvent))
     .withEventHandlers(eventHandlers =>
         eventHandlers.register(MyEventHandler))
     .withEventHorizons(_ => {
         _.forTenant('900893e7-c4cc-4873-8032-884e965e4b97', ts => {
-            ts.forProducerMicroservice('7a6155dd-9109-4488-8f6f-c57fe4b65bfb', sb => {
-                sb
-                    .fromProducerTenant('900893e7-c4cc-4873-8032-884e965e4b97')
-                    .fromProducerStream('2c087657-b318-40b1-ae92-a400de44e507')
-                    .toScope('406d6473-7cc9-44a6-a55f-775c1021d957')
-                    .onSuccess((t, s, sr) => console.log('Subscription: Success'))
-                    .onFailure((t, s, sr) => console.log(`Subscription: Failed - ${sr.failure?.reason}`))
-                    .onCompleted((t, s, sr) => console.log(`Subscription: Completed`));
-            })
-                .onSuccess((t, s, sr) => console.log('Tenant: Success'))
-                .onFailure((t, s, sr) => console.log(`Tenant: Failed - ${sr.failure?.reason}`))
-                .onCompleted((t, s, sr) => console.log(`Tenant: Completed`));
+            ts.fromProducerMicroservice('7a6155dd-9109-4488-8f6f-c57fe4b65bfb')
+                .fromProducerTenant('900893e7-c4cc-4873-8032-884e965e4b97')
+                .fromProducerStream('2c087657-b318-40b1-ae92-a400de44e507')
+                .fromProducerPartition(PartitionId.unspecified.value)
+                .toScope('406d6473-7cc9-44a6-a55f-775c1021d957')
+                .onSuccess((t, s, sr) => console.log('Subscription: Success'))
+                .onFailure((t, s, sr) => console.log(`Subscription: Failed - ${sr.failure?.reason}`))
+                .onCompleted((t, s, sr) => console.log(`Subscription: Completed`));
+            ts.onSuccess((t, s, sr) => console.log('Tenant: Success'));
+            ts.onFailure((t, s, sr) => console.log(`Tenant: Failed - ${sr.failure?.reason}`));
+            ts.onCompleted((t, s, sr) => console.log(`Tenant: Completed`));
             })
         .onSuccess((t, s, sr) => console.log('EventHorizons: Success'))
         .onFailure((t, s, sr) => console.log(`EventHorizons: Failed - ${sr.failure?.reason}`))

Source/eventHorizon/MissingScopeForSubscription.ts

@@ -0,0 +1,71 @@
+// Copyright (c) Dolittle. All rights reserved.
+// Licensed under the MIT license. See LICENSE file in the project root for full license information.
+
+
+import { StreamId, PartitionId, ScopeId } from '@dolittle/sdk.events';
+import { MicroserviceId, TenantId } from '@dolittle/sdk.execution';
+
+import { Subscription } from './Subscription';
+import { SubscriptionCallbacks, SubscriptionCompleted, SubscriptionFailed, SubscriptionSucceeded } from './SubscriptionCallbacks';
+
+/**
+ * Represents the builder for building subscriptions on a tenant.
+ */
+export class SubscriptionBuilderForConsumerScope {
+
+    private readonly _callbacks: SubscriptionCallbacks = new SubscriptionCallbacks();
+    /**
+     * Initializes a new instance of {@link SubscriptionBuilderForConsumerScope}.
+     * @param {MicroserviceId} _producerMicroserviceId The microservice the subscriptions are for.
+     * @param {Observable<SubscriptionCallbackArguments>} responsesSource The source of responses.
+     */
+    constructor(
+        private readonly _producerMicroserviceId: MicroserviceId,
+        private readonly _producerTenantId: TenantId,
+        private readonly _producerStreamId: StreamId,
+        private readonly _producerPartitionId: PartitionId,
+        private readonly _consumerScopeId: ScopeId) {
+    }
+
+    /**
+     * Sets the {@link SubscriptionCompleted} callback for all subscriptions on the event horizon
+     * @param {SubscriptionCompleted} completed The callback method.
+     * @returns {SubscriptionBuilderForConsumerScope}
+     * @summary The callback will be called on each subscription.
+     */
+    onCompleted(completed: SubscriptionCompleted): SubscriptionBuilderForConsumerScope {
+        this._callbacks.onCompleted(completed);
+        return this;
+    }
+
+    /**
+     * Sets the {@link SubscriptionSucceeded} callback for all subscriptions on the event horizon
+     * @param {SubscriptionSucceeded} succeeded The callback method.
+     * @returns {SubscriptionBuilderForConsumerScope}
+     * @summary The callback will be called on each subscription.
+     */
+    onSuccess(succeeded: SubscriptionSucceeded): SubscriptionBuilderForConsumerScope {
+        this._callbacks.onSucceeded(succeeded);
+        return this;
+    }
+
+    /**
+     * Sets the {@link SubscriptionFailed} callback for all subscriptions on the event horizon
+     * @param {SubscriptionFailed} failed The callback method.
+     * @returns {SubscriptionBuilderForConsumerScope}
+     * @summary The callback will be called on each subscription.
+     */
+    onFailure(failed: SubscriptionFailed): SubscriptionBuilderForConsumerScope {
+        this._callbacks.onFailed(failed);
+        return this;
+    }
+
+    /**
+     * Builds the subscription.
+     * @param {Observable<SubscriptionCallbackArguments} callbackArgumentsSource The observable source of responses.
+     * @returns {Subscription}
+     */
+    build(): Subscription {
+        return new Subscription(this._consumerScopeId, this._producerMicroserviceId, this._producerTenantId, this._producerStreamId, this._producerPartitionId, this._callbacks);
+    }
+}