Update tsconfig (#23)

* build: update settings in tsconfig * chore: fix errors due to new tsconfig * chore: update express dependency * chore: use fulfillmenttools SDK 0.1.12 * build: update GH action
fulfillmenttools · Apr 12, 2024 · eae15a1 · eae15a1
1 parent f59ef3b
commit eae15a1
Show file tree

Hide file tree

Showing 16 changed files with 129 additions and 80 deletions.
diff --git a/.github/workflows/publish.yml b/.github/workflows/publish.yml
@@ -25,7 +25,7 @@ jobs:
           echo "release-version=${NEW_VERSION}" >> $GITHUB_OUTPUT
 
       - name: Create GH release
-        uses: softprops/action-gh-release@de2c0eb89ae2a093876385947365aca7b0e5f844
+        uses: softprops/action-gh-release@9d7c94cfd0a1f3ed45544c887983e9fa900f0564
         with:
           token: ${{ secrets.GITHUB_TOKEN }}
           tag_name: ${{ steps.version.outputs.release-version }}

diff --git a/event/package-lock.json b/event/package-lock.json
diff --git a/event/package.json b/event/package.json
@@ -63,11 +63,11 @@
     "@commercetools-backend/loggers": "22.19.0",
     "@commercetools/platform-sdk": "7.4.0",
     "@commercetools/sdk-client-v2": "2.3.0",
-    "@fulfillmenttools/fulfillmenttools-sdk-typescript": "0.1.10",
+    "@fulfillmenttools/fulfillmenttools-sdk-typescript": "0.1.12",
     "body-parser": "1.20.2",
     "date-fns": "2.30.0",
     "dotenv": "16.4.5",
-    "express": "4.18.3",
+    "express": "4.19.2",
     "jsonwebtoken": "9.0.2",
     "msw": "1.3.2",
     "shared": "file:../shared",

diff --git a/event/src/connector/actions.ts b/event/src/connector/actions.ts
@@ -27,7 +27,7 @@ export async function createOrderStateChangedSubscription(
       .withKey({ key: ORDER_STATE_CHANGED_SUBSCRIPTION_KEY })
       .delete({
         queryArgs: {
-          version: subscription.version,
+          version: subscription?.version || 0,
         },
       })
       .execute();
@@ -74,7 +74,7 @@ export async function deleteOrderStateChangedSubscription(apiRoot: ByProjectKeyR
       .withKey({ key: ORDER_STATE_CHANGED_SUBSCRIPTION_KEY })
       .delete({
         queryArgs: {
-          version: subscription.version,
+          version: subscription?.version || 0,
         },
       })
       .execute();
@@ -105,7 +105,7 @@ export async function createChannelResourceSubscription(
       .withKey({ key: CHANNEL_RESOURCE_SUBSCRIPTION_KEY })
       .delete({
         queryArgs: {
-          version: subscription.version,
+          version: subscription?.version || 0,
         },
       })
       .execute();
@@ -151,7 +151,7 @@ export async function deleteChannelResourceSubscription(apiRoot: ByProjectKeyReq
       .withKey({ key: CHANNEL_RESOURCE_SUBSCRIPTION_KEY })
       .delete({
         queryArgs: {
-          version: subscription.version,
+          version: subscription?.version || 0,
         },
       })
       .execute();

diff --git a/event/src/services/channelService.ts b/event/src/services/channelService.ts
@@ -95,7 +95,7 @@ export class ChannelService {
     defaultName: string,
     countries: string[]
   ): FacilityAddressForCreation {
-    const defaultCountry = countries && countries.length > 0 ? countries[0] : 'DE';
+    const defaultCountry = countries?.[0] || 'DE';
     if (address) {
       return {
         street: address.streetName?.trim() || 'not set',

diff --git a/event/tests/orderMapper.test.ts b/event/tests/orderMapper.test.ts
@@ -32,6 +32,7 @@ describe('OrderMapper', () => {
     expect(fulfillmenttoolsOrder.consumer.email).toEqual('max.mustermann@fulfillmenttools.com');
     expect(fulfillmenttoolsOrder.consumer.addresses).toHaveLength(1);
     const consumerAddress = fulfillmenttoolsOrder.consumer.addresses[0];
+    expect(consumerAddress).toBeDefined();
     expect(consumerAddress.city).toEqual('Köln');
     expect(consumerAddress.street).toEqual('Schanzenstraße');
     expect(consumerAddress.houseNumber).toEqual('30');
@@ -43,6 +44,7 @@ describe('OrderMapper', () => {
 
     expect(fulfillmenttoolsOrder.orderLineItems).toHaveLength(1);
     const orderLineItem = fulfillmenttoolsOrder.orderLineItems[0];
+    expect(orderLineItem).toBeDefined();
     expect(orderLineItem.quantity).toEqual(1);
     expect(orderLineItem.article).toBeDefined();
     const article = orderLineItem.article;

diff --git a/event/tsconfig.json b/event/tsconfig.json
@@ -1,12 +1,22 @@
 {
   "extends": "@tsconfig/recommended/tsconfig.json",
-  "exclude": ["node_modules", "tmp", "**/*.spec.ts", "**/*.test.ts"],
+  "exclude": [
+    "node_modules",
+    "tmp",
+    "**/*.spec.ts",
+    "**/*.test.ts"
+  ],
   "compilerOptions": {
-    "lib": ["es2021"],
-    "target": "es2021",
-    "resolveJsonModule": true,
+    "allowSyntheticDefaultImports": true,
+    "lib": [
+      "es2021"
+    ],
+    "noFallthroughCasesInSwitch": true,
+    "noImplicitReturns": true,
+    // "noUncheckedIndexedAccess": true,
     "outDir": "./build",
+    "resolveJsonModule": true,
     "rootDir": "./src",
-    "inlineSourceMap": true
+    "target": "es2021",
   }
 }
diff --git a/service/package-lock.json b/service/package-lock.json
diff --git a/service/package.json b/service/package.json
@@ -63,11 +63,11 @@
     "@commercetools-backend/loggers": "22.19.0",
     "@commercetools/platform-sdk": "7.4.0",
     "@commercetools/sdk-client-v2": "2.3.0",
-    "@fulfillmenttools/fulfillmenttools-sdk-typescript": "0.1.10",
+    "@fulfillmenttools/fulfillmenttools-sdk-typescript": "0.1.12",
     "body-parser": "1.20.2",
     "date-fns": "2.30.0",
     "dotenv": "16.4.5",
-    "express": "4.18.3",
+    "express": "4.19.2",
     "jsonwebtoken": "9.0.2",
     "msw": "1.3.2",
     "shared": "file:../shared",

diff --git a/service/src/routes/serviceRouter.ts b/service/src/routes/serviceRouter.ts
@@ -49,25 +49,33 @@ export class ServiceRouter {
       middleware.push(checkJwt);
     }
 
-    this.serviceRouter.post(fftEvents.ORDER_CREATED, middleware, asyncHandler(orderController.orderCreated));
-
-    this.serviceRouter.post(fftEvents.PICK_JOB_CREATED, middleware, asyncHandler(pickJobController.pickJobCreated));
-    this.serviceRouter.post(
-      fftEvents.PICK_JOB_PICKING_FINISHED,
-      middleware,
-      asyncHandler(pickJobController.pickJobFinished)
-    );
-
-    this.serviceRouter.post(
-      fftEvents.HANDOVERJOB_CREATED,
-      middleware,
-      asyncHandler(handoverJobController.handoverJobCreated)
-    );
-    this.serviceRouter.post(
-      fftEvents.HANDOVERJOB_HANDED_OVER,
-      middleware,
-      asyncHandler(handoverJobController.handoverJobHandedOver)
-    );
+    if (fftEvents.ORDER_CREATED) {
+      this.serviceRouter.post(fftEvents.ORDER_CREATED, middleware, asyncHandler(orderController.orderCreated));
+    }
+    if (fftEvents.PICK_JOB_CREATED) {
+      this.serviceRouter.post(fftEvents.PICK_JOB_CREATED, middleware, asyncHandler(pickJobController.pickJobCreated));
+    }
+    if (fftEvents.PICK_JOB_PICKING_FINISHED) {
+      this.serviceRouter.post(
+        fftEvents.PICK_JOB_PICKING_FINISHED,
+        middleware,
+        asyncHandler(pickJobController.pickJobFinished)
+      );
+    }
+    if (fftEvents.HANDOVERJOB_CREATED) {
+      this.serviceRouter.post(
+        fftEvents.HANDOVERJOB_CREATED,
+        middleware,
+        asyncHandler(handoverJobController.handoverJobCreated)
+      );
+    }
+    if (fftEvents.HANDOVERJOB_HANDED_OVER) {
+      this.serviceRouter.post(
+        fftEvents.HANDOVERJOB_HANDED_OVER,
+        middleware,
+        asyncHandler(handoverJobController.handoverJobHandedOver)
+      );
+    }
   }
 
   public getRouter(): Router {

diff --git a/service/tsconfig.json b/service/tsconfig.json
@@ -1,12 +1,22 @@
 {
   "extends": "@tsconfig/recommended/tsconfig.json",
-  "exclude": ["node_modules", "tmp", "**/*.spec.ts", "**/*.test.ts"],
+  "exclude": [
+    "node_modules",
+    "tmp",
+    "**/*.spec.ts",
+    "**/*.test.ts"
+  ],
   "compilerOptions": {
-    "lib": ["es2021"],
-    "target": "es2021",
-    "resolveJsonModule": true,
+    "allowSyntheticDefaultImports": true,
+    "lib": [
+      "es2021"
+    ],
+    "noFallthroughCasesInSwitch": true,
+    "noImplicitReturns": true,
+    "noUncheckedIndexedAccess": true,
     "outDir": "./build",
+    "resolveJsonModule": true,
     "rootDir": "./src",
-    "inlineSourceMap": true
+    "target": "es2021",
   }
 }
diff --git a/shared/package-lock.json b/shared/package-lock.json