Merge pull request #36 from dolittle/tutorial-sample

jakhog · web-flow · commit 1b7f30c07e5f · 2020-10-06T16:18:21.000+02:00
Change Basic sample to be the same as the  tutorial sample
diff --git a/Samples/Advanced/.eslintrc.js b/Samples/Advanced/.eslintrc.js
diff --git a/Samples/Advanced/MyEvent.ts b/Samples/Advanced/MyEvent.ts
diff --git a/Samples/Advanced/MyEventHandler.ts b/Samples/Advanced/MyEventHandler.ts
diff --git a/Samples/Advanced/for_Dummy/when_nothing.ts b/Samples/Advanced/for_Dummy/when_nothing.ts
diff --git a/Samples/Advanced/index.ts b/Samples/Advanced/index.ts
@@ -4,21 +4,19 @@
 import { Client } from '@dolittle/sdk';
 import { EventContext, PartitionId } from '@dolittle/sdk.events';
 import { PartitionedFilterResult } from '@dolittle/sdk.events.filtering';
-import { eventHandler } from '@dolittle/sdk.events.handling';
-import { TenantId } from '@dolittle/sdk.execution';
 
 import { MyEvent } from './MyEvent';
 import { MyEventHandler } from './MyEventHandler';
 
 const client = Client
     .forMicroservice('7a6155dd-9109-4488-8f6f-c57fe4b65bfb')
-    .withVersion(1, 3, 4)
-    .withEnvironment('secret mountain lab')
+    .withVersion(1, 0, 2)
+    .withEnvironment('test')
     .withEventTypes(eventTypes =>
         eventTypes.register(MyEvent))
-    .withEventHandlers(eventHandlers => {
-        eventHandlers.register(MyEventHandler);
-    })
+    .withEventHandlers(eventHandlers =>
+        eventHandlers
+            .register(MyEventHandler))
     .withFilters(filterBuilder =>
         filterBuilder
             .createPrivateFilter('79e12ab3-2751-47e1-b959-d898dc4d6ee8', fb =>
@@ -38,11 +36,12 @@ const client = Client
     )
     .build();
 
+
 const event = new MyEvent();
 event.anInteger = 42;
 event.aString = 'Forty two';
 
 client
     .eventStore
-    .forTenant(TenantId.development)
+    .forTenant('900893e7-c4cc-4873-8032-884e965e4b97')
     .commitPublic(event, 'd8cb7301-4bec-4451-a72b-2db53c6dc05d');
diff --git a/Samples/Advanced/package.json b/Samples/Advanced/package.json
@@ -0,0 +1,23 @@
+{
+    "name": "advanced",
+    "private": true,
+    "version": "13.0.0",
+    "main": "index.js",
+    "author": "Dolittle",
+    "license": "MIT",
+    "scripts": {
+        "watch": "nodemon --watch **/*.ts --exec 'ts-node' index.ts",
+        "start": "ts-node index.ts",
+        "build": "tsc -p ./tsconfig.json"
+    },
+    "dependencies": {
+        "@dolittle/sdk": "13.0.0",
+        "@dolittle/sdk.artifacts": "13.0.0",
+        "@dolittle/sdk.events": "13.0.0",
+        "@dolittle/sdk.events.handling": "13.0.0"
+    },
+    "devDependencies": {
+        "nodemon": "^2.0.4",
+        "ts-node": "^8.10.1"
+    }
+}
diff --git a/Samples/Advanced/tsconfig.json b/Samples/Advanced/tsconfig.json
diff --git a/Samples/Kitchen/.eslintrc.js b/Samples/Kitchen/.eslintrc.js
@@ -0,0 +1,10 @@
+// Copyright (c) Dolittle. All rights reserved.
+// Licensed under the MIT license. See LICENSE file in the project root for full license information.
+
+module.exports = {
+    extends: '../../.eslintrc.js',
+    rules: {
+        'no-restricted-globals': 'off',
+        '@typescript-eslint/naming-convention' : 'off'
+    }
+};
diff --git a/Samples/Kitchen/DishHandler.ts b/Samples/Kitchen/DishHandler.ts
@@ -0,0 +1,16 @@
+// Copyright (c) Dolittle. All rights reserved.
+// Licensed under the MIT license. See LICENSE file in the project root for full license information.
+// Sample code for the tutorial at https://dolittle.io/tutorials/getting-started/typescript/
+
+import { EventContext } from '@dolittle/sdk.events';
+import { eventHandler, handles } from '@dolittle/sdk.events.handling';
+import { DishPrepared } from './DishPrepared';
+
+@eventHandler('f2d366cf-c00a-4479-acc4-851e04b6fbba')
+export class DishHandler {
+
+    @handles(DishPrepared)
+    dishPrepared(event: DishPrepared, eventContext: EventContext) {
+        console.log(`${event.Chef} has prepared ${event.Dish}. Yummm!`);
+    }
+}
diff --git a/Samples/Kitchen/DishPrepared.ts b/Samples/Kitchen/DishPrepared.ts
@@ -0,0 +1,10 @@
+// Copyright (c) Dolittle. All rights reserved.
+// Licensed under the MIT license. See LICENSE file in the project root for full license information.
+// Sample code for the tutorial at https://dolittle.io/tutorials/getting-started/typescript/
+
+import { eventType } from '@dolittle/sdk.events';
+
+@eventType('1844473f-d714-4327-8b7f-5b3c2bdfc26a')
+export class DishPrepared {
+    constructor(readonly Dish: string, readonly Chef: string) {}
+}
diff --git a/Samples/Kitchen/for_Dummy/when_nothing.ts b/Samples/Kitchen/for_Dummy/when_nothing.ts
@@ -0,0 +1,6 @@
+// Copyright (c) Dolittle. All rights reserved.
+// Licensed under the MIT license. See LICENSE file in the project root for full license information.
+
+describe('when nothing', () => {
+    it('should be fine', () => true.should.be.true);
+});
diff --git a/Samples/Kitchen/index.ts b/Samples/Kitchen/index.ts
@@ -0,0 +1,22 @@
+// Copyright (c) Dolittle. All rights reserved.
+// Licensed under the MIT license. See LICENSE file in the project root for full license information.
+// Sample code for the tutorial at https://dolittle.io/tutorials/getting-started/typescript/
+
+import { Client } from '@dolittle/sdk';
+import { TenantId } from '@dolittle/sdk.execution';
+import { DishPrepared } from './DishPrepared';
+import { DishHandler } from './DishHandler';
+
+const client = Client
+    .forMicroservice('f39b1f61-d360-4675-b859-53c05c87c0e6')
+    .withEventTypes(eventTypes =>
+        eventTypes.register(DishPrepared))
+    .withEventHandlers(builder =>
+        builder.register(DishHandler))
+    .build();
+
+const preparedTaco = new DishPrepared('Bean Blaster Taco', 'Mr. Taco');
+
+client.eventStore
+    .forTenant(TenantId.development)
+    .commit(preparedTaco, 'bfe6f6e4-ada2-4344-8a3b-65a3e1fe16e9');
diff --git a/Samples/Kitchen/package.json b/Samples/Kitchen/package.json
@@ -1,5 +1,5 @@
 {
-    "name": "basic",
+    "name": "kitchen",
     "private": true,
     "version": "14.0.0",
     "main": "index.js",
@@ -20,4 +20,4 @@
         "nodemon": "^2.0.4",
         "ts-node": "^8.10.1"
     }
-}
+}
diff --git a/Samples/Kitchen/tsconfig.json b/Samples/Kitchen/tsconfig.json
@@ -0,0 +1,15 @@
+{
+    "extends": "../../tsconfig.settings.json",
+    "compilerOptions": {
+        "rootDir": ".",
+        "sourceRoot": "../",
+        "inlineSourceMap": true,
+        "sourceMap": false,
+        "outDir": "Distribution"
+    },
+    "include": ["**/*.ts"],
+    "exclude": ["node_modules", "Distribution"],
+    "references": [
+        { "path": "../../Source/sdk" }
+    ]
+}
diff --git a/Samples/tsconfig.json b/Samples/tsconfig.json
@@ -2,8 +2,8 @@
     "files": [],
     "include": [],
     "references": [
-        { "path": "./Basic" },
+        { "path": "./Kitchen" },
         { "path": "./Container" },
         { "path": "./EventHorizon" }
     ]
-}
+}
diff --git a/Source/events.handling/Builder/eventHandlerDecorator.ts b/Source/events.handling/Builder/eventHandlerDecorator.ts
@@ -20,7 +20,7 @@ export function eventHandler(eventHandlerId: EventHandlerId | Guid | string, o
         EventHandlerDecoratedTypes.register(new EventHandlerDecoratedType(
             EventHandlerId.from(eventHandlerId),
             options.inScope ? ScopeId.from(options.inScope) : ScopeId.default,
-            !!options.partitioned,
+            options.partitioned === undefined || options.partitioned,
             target));
     };
 }
diff --git a/package.json b/package.json
@@ -2,7 +2,7 @@
   "private": true,
   "workspaces": [
     "Source/*",
-    "Samples/Basic",
+    "Samples/Kitchen",
     "Samples/Container",
     "Samples/EventHorizon"
   ],
