From 89173f1f57f948631d9b67ee187f9f1826d7b22f Mon Sep 17 00:00:00 2001 From: seantokuzo Date: Wed, 20 Dec 2023 10:58:15 -0800 Subject: [PATCH 1/3] Updates to common package --- .../microservices/common/src/events/events.ts | 77 ++++++++++++++++++- 1 file changed, 76 insertions(+), 1 deletion(-) diff --git a/examples_new/microservices/common/src/events/events.ts b/examples_new/microservices/common/src/events/events.ts index 4f537e7c5..e62a0ca68 100644 --- a/examples_new/microservices/common/src/events/events.ts +++ b/examples_new/microservices/common/src/events/events.ts @@ -1,4 +1,4 @@ -export enum Events { +export enum EventTypes { USER_CREATED = 'USER_CREATED', ITEM_CREATED = 'ITEM_CREATED', ITEM_UPDATED = 'ITEM_UPDATED', @@ -9,3 +9,78 @@ export enum Events { ORDER_CREATED = 'ORDER_CREATED', ORDER_DELETED = 'ORDER_DELETED', } + +export type Events = + | { + type: EventTypes.USER_CREATED; + payload: { + id: string; + username: string; + }; + } + | { + type: EventTypes.ITEM_CREATED; + payload: { + id: string; + itemName: string; + sellerId: string; + unitPrice: number; + }; + } + | { + type: EventTypes.ITEM_UPDATED; + payload: { + id: string; + itemName: string; + sellerId: string; + unitPrice: number; + }; + } + | { + type: EventTypes.ITEM_DELETED; + payload: { + id: string; + }; + } + | { + type: EventTypes.INVENTORY_CREATED; + payload: { + id: string; + itemId: string; + itemName: string; + sellerId: string; + unitPrice: number; + units: number; + }; + } + | { + type: EventTypes.INVENTORY_UPDATED; + payload: { + id: string; + itemId: string; + itemName: string; + sellerId: string; + unitPrice: number; + units: number; + }; + } + | { + type: EventTypes.INVENTORY_DELETED; + payload: { + itemId: string; + }; + } + | { + type: EventTypes.ORDER_CREATED; + payload: { + itemId: string; + amount: number; + }; + } + | { + type: EventTypes.ORDER_DELETED; + payload: { + itemId: string; + amount: number; + }; + }; From f58d5b0e48e037ba7b39f35768cc7a2e5a54c8c4 Mon Sep 17 00:00:00 2001 From: seantokuzo Date: Wed, 20 Dec 2023 10:59:09 -0800 Subject: [PATCH 2/3] Updates to common package --- .../common/build/events/events.d.ts | 75 ++++++++++++++++++- .../common/build/events/events.js | 20 +++-- .../microservices/common/package-lock.json | 4 +- .../microservices/common/package.json | 2 +- 4 files changed, 89 insertions(+), 12 deletions(-) diff --git a/examples_new/microservices/common/build/events/events.d.ts b/examples_new/microservices/common/build/events/events.d.ts index 81c000c2c..59e55405d 100644 --- a/examples_new/microservices/common/build/events/events.d.ts +++ b/examples_new/microservices/common/build/events/events.d.ts @@ -1,5 +1,76 @@ -export declare enum Events { +export declare enum EventTypes { USER_CREATED = "USER_CREATED", ITEM_CREATED = "ITEM_CREATED", - ORDER_CREATED = "ORDER_CREATED" + ITEM_UPDATED = "ITEM_UPDATED", + ITEM_DELETED = "ITEM_DELETED", + INVENTORY_CREATED = "INVENTORY_CREATED", + INVENTORY_UPDATED = "INVENTORY_UPDATED", + INVENTORY_DELETED = "INVENTORY_DELETED", + ORDER_CREATED = "ORDER_CREATED", + ORDER_DELETED = "ORDER_DELETED" } +export type Events = { + type: EventTypes.USER_CREATED; + payload: { + id: string; + username: string; + }; +} | { + type: EventTypes.ITEM_CREATED; + payload: { + id: string; + itemName: string; + sellerId: string; + unitPrice: number; + }; +} | { + type: EventTypes.ITEM_UPDATED; + payload: { + id: string; + itemName: string; + sellerId: string; + unitPrice: number; + }; +} | { + type: EventTypes.ITEM_DELETED; + payload: { + id: string; + }; +} | { + type: EventTypes.INVENTORY_CREATED; + payload: { + id: string; + itemId: string; + itemName: string; + sellerId: string; + unitPrice: number; + units: number; + }; +} | { + type: EventTypes.INVENTORY_UPDATED; + payload: { + id: string; + itemId: string; + itemName: string; + sellerId: string; + unitPrice: number; + units: number; + }; +} | { + type: EventTypes.INVENTORY_DELETED; + payload: { + itemId: string; + }; +} | { + type: EventTypes.ORDER_CREATED; + payload: { + itemId: string; + amount: number; + }; +} | { + type: EventTypes.ORDER_DELETED; + payload: { + itemId: string; + amount: number; + }; +}; diff --git a/examples_new/microservices/common/build/events/events.js b/examples_new/microservices/common/build/events/events.js index ea1f3f06d..fa356ee2e 100644 --- a/examples_new/microservices/common/build/events/events.js +++ b/examples_new/microservices/common/build/events/events.js @@ -1,9 +1,15 @@ "use strict"; Object.defineProperty(exports, "__esModule", { value: true }); -exports.Events = void 0; -var Events; -(function (Events) { - Events["USER_CREATED"] = "USER_CREATED"; - Events["ITEM_CREATED"] = "ITEM_CREATED"; - Events["ORDER_CREATED"] = "ORDER_CREATED"; -})(Events = exports.Events || (exports.Events = {})); +exports.EventTypes = void 0; +var EventTypes; +(function (EventTypes) { + EventTypes["USER_CREATED"] = "USER_CREATED"; + EventTypes["ITEM_CREATED"] = "ITEM_CREATED"; + EventTypes["ITEM_UPDATED"] = "ITEM_UPDATED"; + EventTypes["ITEM_DELETED"] = "ITEM_DELETED"; + EventTypes["INVENTORY_CREATED"] = "INVENTORY_CREATED"; + EventTypes["INVENTORY_UPDATED"] = "INVENTORY_UPDATED"; + EventTypes["INVENTORY_DELETED"] = "INVENTORY_DELETED"; + EventTypes["ORDER_CREATED"] = "ORDER_CREATED"; + EventTypes["ORDER_DELETED"] = "ORDER_DELETED"; +})(EventTypes = exports.EventTypes || (exports.EventTypes = {})); diff --git a/examples_new/microservices/common/package-lock.json b/examples_new/microservices/common/package-lock.json index ec137f428..9132b497e 100644 --- a/examples_new/microservices/common/package-lock.json +++ b/examples_new/microservices/common/package-lock.json @@ -1,12 +1,12 @@ { "name": "@chronosrx/common", - "version": "1.0.2", + "version": "1.0.3", "lockfileVersion": 3, "requires": true, "packages": { "": { "name": "@chronosrx/common", - "version": "1.0.2", + "version": "1.0.3", "license": "ISC", "dependencies": { "express": "^4.18.2", diff --git a/examples_new/microservices/common/package.json b/examples_new/microservices/common/package.json index 59ac9db4a..7931f15c2 100644 --- a/examples_new/microservices/common/package.json +++ b/examples_new/microservices/common/package.json @@ -1,6 +1,6 @@ { "name": "@chronosrx/common", - "version": "1.0.2", + "version": "1.0.3", "description": "Common modules for Chronos Microservice", "main": "./build/index.js", "types": "./build/index.d.ts", From ef6b68e93cc1e2d638c8a7e7ecb5a5202a930191 Mon Sep 17 00:00:00 2001 From: seantokuzo Date: Wed, 20 Dec 2023 11:02:01 -0800 Subject: [PATCH 3/3] update common package --- examples_new/microservices/auth/package-lock.json | 8 ++++---- examples_new/microservices/auth/package.json | 2 +- examples_new/microservices/common/package-lock.json | 4 ++-- examples_new/microservices/common/package.json | 2 +- examples_new/microservices/event-bus/package-lock.json | 8 ++++---- examples_new/microservices/event-bus/package.json | 2 +- examples_new/microservices/inventory/package-lock.json | 8 ++++---- examples_new/microservices/inventory/package.json | 2 +- examples_new/microservices/items/package-lock.json | 8 ++++---- examples_new/microservices/items/package.json | 2 +- 10 files changed, 23 insertions(+), 23 deletions(-) diff --git a/examples_new/microservices/auth/package-lock.json b/examples_new/microservices/auth/package-lock.json index 32e16c6ae..f6c4d05cb 100644 --- a/examples_new/microservices/auth/package-lock.json +++ b/examples_new/microservices/auth/package-lock.json @@ -9,7 +9,7 @@ "version": "1.0.0", "license": "ISC", "dependencies": { - "@chronosrx/common": "^1.0.3", + "@chronosrx/common": "^1.0.4", "axios": "^1.6.2", "bcryptjs": "^2.4.3", "cookie-parser": "^1.4.6", @@ -717,9 +717,9 @@ "dev": true }, "node_modules/@chronosrx/common": { - "version": "1.0.3", - "resolved": "https://registry.npmjs.org/@chronosrx/common/-/common-1.0.3.tgz", - "integrity": "sha512-xvzss3jUrX1ZRcBumLKyx3+OqK2Wy0pTAADL1jdibjL9t+k0seC5VvwXltZYYOUm8vE9lN2zOS86jblXuzMQmg==", + "version": "1.0.4", + "resolved": "https://registry.npmjs.org/@chronosrx/common/-/common-1.0.4.tgz", + "integrity": "sha512-PjOqcxKeZKSEDmB1t06WVyOoJwbIX0XEt/xOa3F1OssXhBtKide/exzM0PNYauM2h2iWKMsHH8vKKEspjirBvw==", "dependencies": { "express": "^4.18.2", "jsonwebtoken": "^9.0.2" diff --git a/examples_new/microservices/auth/package.json b/examples_new/microservices/auth/package.json index de5b008bc..64805aceb 100644 --- a/examples_new/microservices/auth/package.json +++ b/examples_new/microservices/auth/package.json @@ -18,7 +18,7 @@ "author": "", "license": "ISC", "dependencies": { - "@chronosrx/common": "^1.0.3", + "@chronosrx/common": "^1.0.4", "axios": "^1.6.2", "bcryptjs": "^2.4.3", "cookie-parser": "^1.4.6", diff --git a/examples_new/microservices/common/package-lock.json b/examples_new/microservices/common/package-lock.json index 9132b497e..74c097f46 100644 --- a/examples_new/microservices/common/package-lock.json +++ b/examples_new/microservices/common/package-lock.json @@ -1,12 +1,12 @@ { "name": "@chronosrx/common", - "version": "1.0.3", + "version": "1.0.4", "lockfileVersion": 3, "requires": true, "packages": { "": { "name": "@chronosrx/common", - "version": "1.0.3", + "version": "1.0.4", "license": "ISC", "dependencies": { "express": "^4.18.2", diff --git a/examples_new/microservices/common/package.json b/examples_new/microservices/common/package.json index 7931f15c2..ea62abdd0 100644 --- a/examples_new/microservices/common/package.json +++ b/examples_new/microservices/common/package.json @@ -1,6 +1,6 @@ { "name": "@chronosrx/common", - "version": "1.0.3", + "version": "1.0.4", "description": "Common modules for Chronos Microservice", "main": "./build/index.js", "types": "./build/index.d.ts", diff --git a/examples_new/microservices/event-bus/package-lock.json b/examples_new/microservices/event-bus/package-lock.json index 73a742b4a..2361f5726 100644 --- a/examples_new/microservices/event-bus/package-lock.json +++ b/examples_new/microservices/event-bus/package-lock.json @@ -9,7 +9,7 @@ "version": "1.0.0", "license": "ISC", "dependencies": { - "@chronosrx/common": "^1.0.3", + "@chronosrx/common": "^1.0.4", "axios": "^1.6.2", "express": "^4.18.2", "ts-node-dev": "^2.0.0" @@ -19,9 +19,9 @@ } }, "node_modules/@chronosrx/common": { - "version": "1.0.3", - "resolved": "https://registry.npmjs.org/@chronosrx/common/-/common-1.0.3.tgz", - "integrity": "sha512-xvzss3jUrX1ZRcBumLKyx3+OqK2Wy0pTAADL1jdibjL9t+k0seC5VvwXltZYYOUm8vE9lN2zOS86jblXuzMQmg==", + "version": "1.0.4", + "resolved": "https://registry.npmjs.org/@chronosrx/common/-/common-1.0.4.tgz", + "integrity": "sha512-PjOqcxKeZKSEDmB1t06WVyOoJwbIX0XEt/xOa3F1OssXhBtKide/exzM0PNYauM2h2iWKMsHH8vKKEspjirBvw==", "dependencies": { "express": "^4.18.2", "jsonwebtoken": "^9.0.2" diff --git a/examples_new/microservices/event-bus/package.json b/examples_new/microservices/event-bus/package.json index c65d5a058..885a32b53 100644 --- a/examples_new/microservices/event-bus/package.json +++ b/examples_new/microservices/event-bus/package.json @@ -11,7 +11,7 @@ "author": "", "license": "ISC", "dependencies": { - "@chronosrx/common": "^1.0.3", + "@chronosrx/common": "^1.0.4", "axios": "^1.6.2", "express": "^4.18.2", "ts-node-dev": "^2.0.0" diff --git a/examples_new/microservices/inventory/package-lock.json b/examples_new/microservices/inventory/package-lock.json index 1f1ae07ea..b30bb2fce 100644 --- a/examples_new/microservices/inventory/package-lock.json +++ b/examples_new/microservices/inventory/package-lock.json @@ -9,7 +9,7 @@ "version": "1.0.0", "license": "ISC", "dependencies": { - "@chronosrx/common": "^1.0.3", + "@chronosrx/common": "^1.0.4", "cookie-parser": "^1.4.6", "dotenv": "^16.3.1", "express": "^4.18.2", @@ -710,9 +710,9 @@ "dev": true }, "node_modules/@chronosrx/common": { - "version": "1.0.3", - "resolved": "https://registry.npmjs.org/@chronosrx/common/-/common-1.0.3.tgz", - "integrity": "sha512-xvzss3jUrX1ZRcBumLKyx3+OqK2Wy0pTAADL1jdibjL9t+k0seC5VvwXltZYYOUm8vE9lN2zOS86jblXuzMQmg==", + "version": "1.0.4", + "resolved": "https://registry.npmjs.org/@chronosrx/common/-/common-1.0.4.tgz", + "integrity": "sha512-PjOqcxKeZKSEDmB1t06WVyOoJwbIX0XEt/xOa3F1OssXhBtKide/exzM0PNYauM2h2iWKMsHH8vKKEspjirBvw==", "dependencies": { "express": "^4.18.2", "jsonwebtoken": "^9.0.2" diff --git a/examples_new/microservices/inventory/package.json b/examples_new/microservices/inventory/package.json index 47642e810..96f22a909 100644 --- a/examples_new/microservices/inventory/package.json +++ b/examples_new/microservices/inventory/package.json @@ -18,7 +18,7 @@ "author": "", "license": "ISC", "dependencies": { - "@chronosrx/common": "^1.0.3", + "@chronosrx/common": "^1.0.4", "cookie-parser": "^1.4.6", "dotenv": "^16.3.1", "express": "^4.18.2", diff --git a/examples_new/microservices/items/package-lock.json b/examples_new/microservices/items/package-lock.json index a14446b82..0af0ead30 100644 --- a/examples_new/microservices/items/package-lock.json +++ b/examples_new/microservices/items/package-lock.json @@ -9,7 +9,7 @@ "version": "1.0.0", "license": "ISC", "dependencies": { - "@chronosrx/common": "^1.0.3", + "@chronosrx/common": "^1.0.4", "axios": "^1.6.2", "cookie-parser": "^1.4.6", "dotenv": "^16.3.1", @@ -756,9 +756,9 @@ "dev": true }, "node_modules/@chronosrx/common": { - "version": "1.0.3", - "resolved": "https://registry.npmjs.org/@chronosrx/common/-/common-1.0.3.tgz", - "integrity": "sha512-xvzss3jUrX1ZRcBumLKyx3+OqK2Wy0pTAADL1jdibjL9t+k0seC5VvwXltZYYOUm8vE9lN2zOS86jblXuzMQmg==", + "version": "1.0.4", + "resolved": "https://registry.npmjs.org/@chronosrx/common/-/common-1.0.4.tgz", + "integrity": "sha512-PjOqcxKeZKSEDmB1t06WVyOoJwbIX0XEt/xOa3F1OssXhBtKide/exzM0PNYauM2h2iWKMsHH8vKKEspjirBvw==", "dependencies": { "express": "^4.18.2", "jsonwebtoken": "^9.0.2" diff --git a/examples_new/microservices/items/package.json b/examples_new/microservices/items/package.json index fce97e3e1..2a9cf30c5 100644 --- a/examples_new/microservices/items/package.json +++ b/examples_new/microservices/items/package.json @@ -18,7 +18,7 @@ "author": "", "license": "ISC", "dependencies": { - "@chronosrx/common": "^1.0.3", + "@chronosrx/common": "^1.0.4", "axios": "^1.6.2", "cookie-parser": "^1.4.6", "dotenv": "^16.3.1",