@adobe/spacecat-shared-data-access 1.1.3 → 1.1.5

package/CHANGELOG.md

@@ -1,3 +1,17 @@
+# [@adobe/spacecat-shared-data-access-v1.1.5](https://github.com/adobe-rnd/spacecat-shared/compare/@adobe/spacecat-shared-data-access-v1.1.4...@adobe/spacecat-shared-data-access-v1.1.5) (2023-12-05)
+
+
+### Bug Fixes
+
+* get audit no query ([#34](https://github.com/adobe-rnd/spacecat-shared/issues/34)) ([8fadd0a](https://github.com/adobe-rnd/spacecat-shared/commit/8fadd0a21a1e0cc232a06ccf805d1ac5c946b8be))
+
+# [@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)
 
 

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@adobe/spacecat-shared-data-access",
-  "version": "1.1.3",
+  "version": "1.1.5",
   "description": "Shared modules of the Spacecat Services - Data Access",
   "type": "module",
   "main": "src/index.js",

package/src/service/audits/accessPatterns.js

@@ -65,17 +65,12 @@ export const getAuditForSite = async (
   auditType,
   auditedAt,
 ) => {
-  const audit = await dynamoClient.query({
-    TableName: config.tableNameAudits,
-    KeyConditionExpression: 'siteId = :siteId AND SK = :sk',
-    ExpressionAttributeValues: {
-      ':siteId': siteId,
-      ':sk': `${auditType}#${auditedAt}`,
-    },
-    Limit: 1,
+  const audit = await dynamoClient.getItem(config.tableNameAudits, {
+    siteId,
+    SK: `${auditType}#${auditedAt}`,
   });
 
-  return audit.length > 0 ? AuditDto.fromDynamoItem(audit[0]) : null;
+  return audit ? AuditDto.fromDynamoItem(audit) : null;
 };
 
 /**
@@ -158,10 +153,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 auditType = :auditType',
     ExpressionAttributeValues: {
       ':siteId': siteId,
-      ':auditType': `${auditType}#`,
+      ':auditType': `${auditType}`,
     },
     Limit: 1,
   });
@@ -221,13 +216,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);
 }