Merge branch 'refs/heads/main' into feature/37070-webhooks

# Conflicts: # paypal-commercetools-extension/tests/post-deploy.spec.ts
mediaopt · Sep 16, 2024 · 51ed6db · 51ed6db
2 parents 248a083 + 1deb457
commit 51ed6db
Show file tree

Hide file tree

Showing 8 changed files with 1,077 additions and 1,297 deletions.
diff --git a/paypal-commercetools-custom-application/yarn.lock b/paypal-commercetools-custom-application/yarn.lock
diff --git a/paypal-commercetools-events/package.json b/paypal-commercetools-events/package.json
@@ -41,7 +41,7 @@
     "axios": "^1.5.1",
     "body-parser": "^1.20.2",
     "dotenv": "^16.3.1",
-    "express": "^4.19.2",
+    "express": "^4.21.0",
     "listr2": "^6.6.1",
     "validator": "^13.11.0"
   }

diff --git a/paypal-commercetools-events/src/service/commercetools.service.ts b/paypal-commercetools-events/src/service/commercetools.service.ts
@@ -52,10 +52,10 @@ export const findMatchingSubscription = async (
     return subscriptions.length > 0 ? subscriptions[0] : undefined;
   }
   const fittingSubscriptions = subscriptions.filter(
-    (subscription) =>
-      subscription.destination.type === 'GoogleCloudPubSub' &&
-      subscription.destination.topic === topic &&
-      subscription.destination.projectId === projectId
+    ({ destination }) =>
+      destination.type === 'GoogleCloudPubSub' &&
+      destination.topic === topic &&
+      destination.projectId === projectId
   );
   return fittingSubscriptions.length > 0 ? fittingSubscriptions[0] : undefined;
 };
diff --git a/paypal-commercetools-events/yarn.lock b/paypal-commercetools-events/yarn.lock
diff --git a/paypal-commercetools-extension/package.json b/paypal-commercetools-extension/package.json
@@ -45,7 +45,7 @@
     "axios": "^1.5.1",
     "body-parser": "^1.20.0",
     "dotenv": "^16.0.3",
-    "express": "4.19.2",
+    "express": "4.21.0",
     "nodemailer": "^6.9.10",
     "validator": "^13.7.0"
   }

diff --git a/paypal-commercetools-extension/src/service/commercetools.service.ts b/paypal-commercetools-extension/src/service/commercetools.service.ts
@@ -337,9 +337,8 @@ export async function findMatchingExtension(
     .execute();
 
   const matchingExtensions = extensions.filter(
-    (extension) =>
-      extension.destination.type === 'HTTP' &&
-      extension.destination.url === applicationUrl
+    ({ destination }) =>
+      destination.type === 'HTTP' && destination.url === applicationUrl
   );
   return matchingExtensions.length > 0 ? matchingExtensions[0] : undefined;
 }
diff --git a/paypal-commercetools-extension/tests/pre-undeploy.spec.ts b/paypal-commercetools-extension/tests/pre-undeploy.spec.ts
@@ -21,8 +21,10 @@ const mockConfigModule = () => {
     customObjects: jest.fn(() => apiRoot),
     extensions: jest.fn(() => apiRoot),
     withKey: jest.fn(() => apiRoot),
+    withContainerAndKey: jest.fn(() => apiRoot),
     delete: jest.fn(() => apiRequest),
     get: jest.fn(() => apiRequest),
+    post: jest.fn(() => apiRequest),
   };
   jest.mock('../src/client/create.client', () => {
     return {
@@ -40,8 +42,9 @@ describe('Testing pre undeploy', () => {
   test('Testing pre undeploy', async () => {
     require('../src/connector/pre-undeploy');
     await sleep(5000);
-    expect(apiRoot.delete).toBeCalledTimes(2);
-    expect(apiRoot.get).toBeCalledTimes(2);
-    expect(apiRequest.execute).toBeCalledTimes(4);
+    expect(apiRoot.delete).toBeCalledTimes(3);
+    expect(apiRoot.get).toBeCalledTimes(5);
+    expect(apiRoot.post).toBeCalledTimes(2);
+    expect(apiRequest.execute).toBeCalledTimes(10);
   }, 15000);
 });
diff --git a/paypal-commercetools-extension/yarn.lock b/paypal-commercetools-extension/yarn.lock