@adobe/spacecat-shared-data-access 1.1.2 → 1.1.4

package/CHANGELOG.md

@@ -1,3 +1,17 @@
+# [@adobe/spacecat-shared-data-access-v1.1.4](https://github.com/adobe-rnd/spacecat-shared/compare/@adobe/spacecat-shared-data-access-v1.1.3...@adobe/spacecat-shared-data-access-v1.1.4) (2023-12-05)
+
+
+### Bug Fixes
+
+* latest-audits sort key ([#33](https://github.com/adobe-rnd/spacecat-shared/issues/33)) ([21dc14e](https://github.com/adobe-rnd/spacecat-shared/commit/21dc14e75e8aad641f1c99330243a3102e8de465))
+
+# [@adobe/spacecat-shared-data-access-v1.1.3](https://github.com/adobe-rnd/spacecat-shared/compare/@adobe/spacecat-shared-data-access-v1.1.2...@adobe/spacecat-shared-data-access-v1.1.3) (2023-12-05)
+
+
+### Bug Fixes
+
+* switch defaults to dev (force release) ([b85d54c](https://github.com/adobe-rnd/spacecat-shared/commit/b85d54ca7430a4e54b49d112429242c81ff55714))
+
 # [@adobe/spacecat-shared-data-access-v1.1.2](https://github.com/adobe-rnd/spacecat-shared/compare/@adobe/spacecat-shared-data-access-v1.1.1...@adobe/spacecat-shared-data-access-v1.1.2) (2023-12-02)
 
 

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@adobe/spacecat-shared-data-access",
-  "version": "1.1.2",
+  "version": "1.1.4",
   "description": "Shared modules of the Spacecat Services - Data Access",
   "type": "module",
   "main": "src/index.js",
@@ -29,7 +29,7 @@
     "access": "public"
   },
   "dependencies": {
-    "@adobe/spacecat-shared-dynamo": "1.2.3",
+    "@adobe/spacecat-shared-dynamo": "1.2.4",
     "@adobe/spacecat-shared-utils": "1.2.0",
     "@aws-sdk/client-dynamodb": "3.465.0",
     "@aws-sdk/lib-dynamodb": "3.465.0",

package/src/index.js

@@ -12,12 +12,12 @@
 
 import { createDataAccess } from './service/index.js';
 
-const TABLE_NAME_AUDITS = 'spacecat-services-audits';
-const TABLE_NAME_LATEST_AUDITS = 'spacecat-services-latest-audits';
-const TABLE_NAME_SITES = 'spacecat-services-sites';
+const TABLE_NAME_AUDITS = 'spacecat-services-audits-dev';
+const TABLE_NAME_LATEST_AUDITS = 'spacecat-services-latest-audits-dev';
+const TABLE_NAME_SITES = 'spacecat-services-sites-dev';
 
-const INDEX_NAME_ALL_SITES = 'spacecat-services-all-sites';
-const INDEX_NAME_ALL_LATEST_AUDIT_SCORES = 'spacecat-services-all-latest-audit-scores';
+const INDEX_NAME_ALL_SITES = 'spacecat-services-all-sites-dev';
+const INDEX_NAME_ALL_LATEST_AUDIT_SCORES = 'spacecat-services-all-latest-audit-scores-dev';
 
 const PK_ALL_SITES = 'ALL_SITES';
 const PK_ALL_LATEST_AUDITS = 'ALL_LATEST_AUDITS';

package/src/service/audits/accessPatterns.js

@@ -158,10 +158,10 @@ export const getLatestAuditForSite = async (
 ) => {
   const latestAudit = await dynamoClient.query({
     TableName: config.tableNameLatestAudits,
-    KeyConditionExpression: 'siteId = :siteId AND begins_with(SK, :auditType)',
+    KeyConditionExpression: 'siteId = :siteId AND begins_with(auditType, :auditType)',
     ExpressionAttributeValues: {
       ':siteId': siteId,
-      ':auditType': `${auditType}#`,
+      ':auditType': `${auditType}`,
     },
     Limit: 1,
   });
@@ -221,13 +221,18 @@ async function removeAudits(
 ) {
   const tableName = latest ? config.tableNameLatestAudits : config.tableNameAudits;
   // TODO: use batch-remove (needs dynamo client update)
-  const removeAuditPromises = audits.map((audit) => dynamoClient.removeItem(
-    tableName,
-    {
-      siteId: audit.getSiteId(),
-      SK: `${audit.getAuditType()}#${audit.getAuditedAt()}`,
-    },
-  ));
+  const removeAuditPromises = audits.map((audit) => {
+    const sortKey = latest
+      ? { auditType: `${audit.getAuditType()}` }
+      : { SK: `${audit.getAuditType()}#${audit.getAuditedAt()}` };
+    return dynamoClient.removeItem(
+      tableName,
+      {
+        siteId: audit.getSiteId(),
+        ...sortKey,
+      },
+    );
+  });
 
   await Promise.all(removeAuditPromises);
 }