fix: fix all tests and coverage

adobe · Jun 25, 2024 · f89e872 · f89e872
2 parents 40f3c83 + 6bed341
commit f89e872
Show file tree

Hide file tree

Showing 15 changed files with 2,933 additions and 2,900 deletions.
diff --git a/package-lock.json b/package-lock.json
diff --git a/package.json b/package.json
@@ -32,8 +32,8 @@
     "@semantic-release/changelog": "6.0.3",
     "@semantic-release/git": "10.0.1",
     "@semantic-release/npm": "12.0.1",
-    "@typescript-eslint/eslint-plugin": "7.13.0",
-    "@typescript-eslint/parser": "7.13.0",
+    "@typescript-eslint/eslint-plugin": "7.13.1",
+    "@typescript-eslint/parser": "7.13.1",
     "ajv": "8.16.0",
     "c8": "10.1.2",
     "eslint": "8.57.0",
@@ -45,7 +45,7 @@
     "nock": "13.5.4",
     "semantic-release": "24.0.0",
     "semantic-release-monorepo": "8.0.2",
-    "typescript": "5.4.5"
+    "typescript": "5.5.2"
   },
   "lint-staged": {
     "*.js": "eslint"

diff --git a/packages/spacecat-shared-ahrefs-client/package.json b/packages/spacecat-shared-ahrefs-client/package.json
@@ -40,6 +40,6 @@
     "nock": "13.5.4",
     "sinon": "18.0.0",
     "sinon-chai": "3.7.0",
-    "typescript": "5.4.5"
+    "typescript": "5.5.2"
   }
 }
diff --git a/packages/spacecat-shared-data-access/CHANGELOG.md b/packages/spacecat-shared-data-access/CHANGELOG.md
@@ -1,3 +1,15 @@
+# [@adobe/spacecat-shared-data-access-v1.33.0](https://github.com/adobe/spacecat-shared/compare/@adobe/spacecat-shared-data-access-v1.32.0...@adobe/spacecat-shared-data-access-v1.33.0) (2024-06-21)
+
+
+### Bug Fixes
+
+* getSitesByOrganizationID performance ([485818f](https://github.com/adobe/spacecat-shared/commit/485818f846c1ceb0e50b32f531bd2e438cee7614))
+
+
+### Features
+
+* introduce fixed URLs in audit type config ([#272](https://github.com/adobe/spacecat-shared/issues/272)) ([07858a9](https://github.com/adobe/spacecat-shared/commit/07858a95ce457f395fd2c4269d79b445f34de504))
+
 # [@adobe/spacecat-shared-data-access-v1.32.0](https://github.com/adobe/spacecat-shared/compare/@adobe/spacecat-shared-data-access-v1.31.0...@adobe/spacecat-shared-data-access-v1.32.0) (2024-06-20)
 
 

diff --git a/packages/spacecat-shared-data-access/package.json b/packages/spacecat-shared-data-access/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@adobe/spacecat-shared-data-access",
-  "version": "1.32.0",
+  "version": "1.33.0",
   "description": "Shared modules of the Spacecat Services - Data Access",
   "type": "module",
   "main": "src/index.js",
@@ -31,10 +31,10 @@
   "dependencies": {
     "@adobe/spacecat-shared-dynamo": "1.2.5",
     "@adobe/spacecat-shared-utils": "1.2.0",
-    "@aws-sdk/client-dynamodb": "3.598.0",
-    "@aws-sdk/lib-dynamodb": "3.598.0",
+    "@aws-sdk/client-dynamodb": "3.602.0",
+    "@aws-sdk/lib-dynamodb": "3.602.0",
     "@types/joi": "17.2.3",
-    "joi": "17.13.1",
+    "joi": "17.13.3",
     "uuid": "10.0.0"
   },
   "devDependencies": {

diff --git a/packages/spacecat-shared-data-access/src/models/site/config.js b/packages/spacecat-shared-data-access/src/models/site/config.js
@@ -25,6 +25,10 @@ export const configSchema = Joi.object({
       brokenTargetURL: Joi.string().optional(),
       targetURL: Joi.string().optional(),
     })).optional(),
+    fixedURLs: Joi.array().items(Joi.object({
+      brokenTargetURL: Joi.string().optional(),
+      targetURL: Joi.string().optional(),
+    })).optional(),
   }).unknown(true)).unknown(true),
 }).unknown(true);
 
@@ -56,6 +60,7 @@ export const Config = (data = {}) => {
   self.getHandlers = () => state.handlers;
   self.getExcludedURLs = (type) => state?.handlers[type]?.excludedURLs;
   self.getManualOverrides = (type) => state?.handlers[type]?.manualOverwrites;
+  self.getFixedURLs = (type) => state?.handlers[type]?.fixedURLs;
 
   self.updateSlackConfig = (channel, workspace, invitedUserCount) => {
     state.slack = {
@@ -84,6 +89,12 @@ export const Config = (data = {}) => {
     state.handlers[type].manualOverwrites = manualOverwrites;
   };
 
+  self.updateFixedURLs = (type, fixedURLs) => {
+    state.handlers = state.handlers || {};
+    state.handlers[type] = state.handlers[type] || {};
+    state.handlers[type].fixedURLs = fixedURLs;
+  };
+
   return Object.freeze(self);
 };
 

diff --git a/packages/spacecat-shared-data-access/src/service/sites/accessPatterns.js b/packages/spacecat-shared-data-access/src/service/sites/accessPatterns.js
@@ -260,7 +260,6 @@ export const getSitesByOrganizationID = async (
     ExpressionAttributeValues: {
       ':organizationId': organizationId,
     },
-    Limit: 1,
   });
 
   return dynamoItems.map((dynamoItem) => SiteDto.fromDynamoItem(dynamoItem));

diff --git a/packages/spacecat-shared-data-access/test/unit/models/site/config.test.js b/packages/spacecat-shared-data-access/test/unit/models/site/config.test.js
@@ -109,6 +109,17 @@ describe('Config Tests', () => {
       const updatedManualOverrides = config.getManualOverrides('broken-backlinks');
       expect(updatedManualOverrides).to.deep.equal(manualOverrides);
     });
+
+    it('correctly updates the fixedURLs array to an empty array', () => {
+      const fixedURLs = [
+        { brokenTargetURL: 'https://broken.co', targetURL: 'https://fixed.co' },
+        { brokenTargetURL: 'https://broken.link.co', targetURL: 'https://fixed.link.co' },
+      ];
+      const config = Config();
+      config.updateFixedURLs('broken-backlinks', fixedURLs);
+      config.updateFixedURLs('broken-backlinks', []);
+      expect(config.getFixedURLs('broken-backlinks')).to.be.an('array').that.is.empty;
+    });
   });
 
   describe('fromDynamoItem Static Method', () => {

diff --git a/packages/spacecat-shared-dynamo/package.json b/packages/spacecat-shared-dynamo/package.json
@@ -29,8 +29,8 @@
     "access": "public"
   },
   "dependencies": {
-    "@aws-sdk/client-dynamodb": "3.598.0",
-    "@aws-sdk/lib-dynamodb": "3.598.0",
+    "@aws-sdk/client-dynamodb": "3.602.0",
+    "@aws-sdk/lib-dynamodb": "3.602.0",
     "@adobe/spacecat-shared-utils": "1.1.0"
   },
   "devDependencies": {

diff --git a/packages/spacecat-shared-google-client/package.json b/packages/spacecat-shared-google-client/package.json
@@ -34,7 +34,7 @@
     "@adobe/helix-universal": "5.0.5",
     "@adobe/spacecat-shared-http-utils": "1.1.4",
     "@adobe/spacecat-shared-utils": "1.15.1",
-    "@aws-sdk/client-secrets-manager": "3.598.0",
+    "@aws-sdk/client-secrets-manager": "3.600.0",
     "google-auth-library": "9.11.0",
     "googleapis": "140.0.0"
   },
@@ -44,6 +44,6 @@
     "nock": "13.5.4",
     "sinon": "18.0.0",
     "sinon-chai": "3.7.0",
-    "typescript": "5.4.5"
+    "typescript": "5.5.2"
   }
 }
diff --git a/packages/spacecat-shared-gpt-client/package.json b/packages/spacecat-shared-gpt-client/package.json
@@ -41,6 +41,6 @@
     "nock": "13.5.4",
     "sinon": "18.0.0",
     "sinon-chai": "3.7.0",
-    "typescript": "5.4.5"
+    "typescript": "5.5.2"
   }
 }
diff --git a/packages/spacecat-shared-ims-client/package.json b/packages/spacecat-shared-ims-client/package.json
@@ -40,6 +40,6 @@
     "nock": "13.5.4",
     "sinon": "18.0.0",
     "sinon-chai": "3.7.0",
-    "typescript": "5.4.5"
+    "typescript": "5.5.2"
   }
 }
diff --git a/packages/spacecat-shared-rum-api-client/package.json b/packages/spacecat-shared-rum-api-client/package.json
@@ -44,6 +44,6 @@
     "nock": "13.5.4",
     "sinon": "18.0.0",
     "sinon-chai": "3.7.0",
-    "typescript": "5.4.5"
+    "typescript": "5.5.2"
   }
 }
diff --git a/packages/spacecat-shared-slack-client/package.json b/packages/spacecat-shared-slack-client/package.json
@@ -31,7 +31,7 @@
   "dependencies": {
     "@adobe/helix-universal": "5.0.5",
     "@adobe/spacecat-shared-utils": "1.7.2",
-    "@slack/web-api": "7.1.0"
+    "@slack/web-api": "7.2.0"
   },
   "devDependencies": {
     "chai": "4.4.1",
@@ -40,6 +40,6 @@
     "sinon": "18.0.0",
     "sinon-chai": "3.7.0",
     "slack-block-builder": "2.8.0",
-    "typescript": "5.4.5"
+    "typescript": "5.5.2"
   }
 }
diff --git a/packages/spacecat-shared-utils/package.json b/packages/spacecat-shared-utils/package.json
@@ -41,8 +41,8 @@
   },
   "dependencies": {
     "@adobe/fetch": "4.1.8",
-    "@aws-sdk/client-s3": "3.598.0",
-    "@aws-sdk/client-sqs": "3.598.0",
+    "@aws-sdk/client-s3": "3.600.0",
+    "@aws-sdk/client-sqs": "3.600.0",
     "@json2csv/plainjs": "7.0.6"
   }
 }