@adobe/spacecat-shared-data-access 1.2.6 → 1.3.0

package/CHANGELOG.md

@@ -1,3 +1,17 @@
+# [@adobe/spacecat-shared-data-access-v1.3.0](https://github.com/adobe-rnd/spacecat-shared/compare/@adobe/spacecat-shared-data-access-v1.2.7...@adobe/spacecat-shared-data-access-v1.3.0) (2023-12-16)
+
+
+### Features
+
+* add audit config ([#59](https://github.com/adobe-rnd/spacecat-shared/issues/59)) ([f851862](https://github.com/adobe-rnd/spacecat-shared/commit/f8518623a8b8e4e337b3c44a16b65724a953596a))
+
+# [@adobe/spacecat-shared-data-access-v1.2.7](https://github.com/adobe-rnd/spacecat-shared/compare/@adobe/spacecat-shared-data-access-v1.2.6...@adobe/spacecat-shared-data-access-v1.2.7) (2023-12-11)
+
+
+### Bug Fixes
+
+* sort order sites with latest audits ([#46](https://github.com/adobe-rnd/spacecat-shared/issues/46)) ([8da2bf1](https://github.com/adobe-rnd/spacecat-shared/commit/8da2bf16b904ced6787d8c56ba2b4b72678687a0))
+
 # [@adobe/spacecat-shared-data-access-v1.2.6](https://github.com/adobe-rnd/spacecat-shared/compare/@adobe/spacecat-shared-data-access-v1.2.5...@adobe/spacecat-shared-data-access-v1.2.6) (2023-12-11)
 
 

package/package.json

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

package/src/dto/site.js

@@ -11,6 +11,7 @@
  */
 
 import { createSite } from '../models/site.js';
+import AuditConfig from '../models/site/audit-config.js';
 
 /**
  * Data transfer object for Site.
@@ -30,6 +31,7 @@ export const SiteDto = {
     createdAt: site.getCreatedAt(),
     updatedAt: site.getUpdatedAt(),
     GSI1PK: 'ALL_SITES',
+    auditConfig: AuditConfig.toDynamoItem(site.getAuditConfig()),
   }),
 
   /**
@@ -46,6 +48,7 @@ export const SiteDto = {
       isLive: dynamoItem.isLive,
       createdAt: dynamoItem.createdAt,
       updatedAt: dynamoItem.updatedAt,
+      auditConfig: dynamoItem.auditConfig,
     };
 
     return createSite(siteData);

package/src/index.d.ts

@@ -20,9 +20,21 @@ export interface Audit {
   getExpiresAt: () => Date;
   getFullAuditRef: () => string;
   isLive: () => boolean;
+  isError: () => boolean;
   getScores: () => object;
 }
 
+// AuditConfigType defines the structure for specific audit type configurations
+export interface AuditConfigType {
+  disabled(): boolean;
+}
+
+// AuditConfig defines the structure for the overall audit configuration of a site
+export interface AuditConfig {
+  auditsDisabled: () => boolean;
+  getAuditConfigForType: (auditType: string) => AuditConfigType;
+}
+
 export interface Site {
   getId: () => string;
   getBaseURL: () => string;
@@ -30,6 +42,7 @@ export interface Site {
   getImsOrgId: () => string;
   getCreatedAt: () => string;
   getUpdatedAt: () => string;
+  getAuditConfig: () => AuditConfig;
   getAudits: () => Audit[];
   isLive: () => boolean;
   setAudits: (audits: Audit[]) => Site;

package/src/models/audit.js

@@ -61,6 +61,7 @@ const Audit = (data = {}) => {
   self.getExpiresAt = () => self.state.expiresAt;
   self.getFullAuditRef = () => self.state.fullAuditRef;
   self.isLive = () => self.state.isLive;
+  self.isError = () => hasText(self.getAuditResult().runtimeError?.code);
   self.getScores = () => self.getAuditResult().scores;
 
   return Object.freeze(self);

package/src/models/site/audit-config-type.js

@@ -0,0 +1,28 @@
+/*
+ * Copyright 2023 Adobe. All rights reserved.
+ * This file is licensed to you under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License. You may obtain a copy
+ * of the License at http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software distributed under
+ * the License is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR REPRESENTATIONS
+ * OF ANY KIND, either express or implied. See the License for the specific language
+ * governing permissions and limitations under the License.
+ */
+
+const AuditConfigType = (data = {}, allAuditsDisabled = false) => ({
+  disabled: () => allAuditsDisabled || data.disabled || false,
+});
+
+AuditConfigType.fromDynamoItem = (dynamoItem) => {
+  const auditConfigTypeData = {
+    disabled: dynamoItem.disabled,
+  };
+  return AuditConfigType(auditConfigTypeData);
+};
+
+AuditConfigType.toDynamoItem = (auditConfigType) => ({
+  disabled: auditConfigType.disabled(),
+});
+
+export default AuditConfigType;

package/src/models/site/audit-config.js

@@ -0,0 +1,41 @@
+/*
+ * Copyright 2023 Adobe. All rights reserved.
+ * This file is licensed to you under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License. You may obtain a copy
+ * of the License at http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software distributed under
+ * the License is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR REPRESENTATIONS
+ * OF ANY KIND, either express or implied. See the License for the specific language
+ * governing permissions and limitations under the License.
+ */
+import AuditConfigType from './audit-config-type.js';
+
+function getAuditTypeConfigs(auditTypeConfigs, auditsDisabled) {
+  return Object.entries(auditTypeConfigs || {}).reduce((acc, [key, value]) => {
+    acc[key] = AuditConfigType(value, auditsDisabled);
+    return acc;
+  }, {});
+}
+
+const AuditConfig = (data = {}) => {
+  const auditTypeConfigs = getAuditTypeConfigs(data.auditTypeConfigs, data.auditsDisabled);
+  return {
+    auditsDisabled: () => data.auditsDisabled || false,
+    getAuditTypeConfigs: () => auditTypeConfigs,
+    getAuditTypeConfig: (type) => auditTypeConfigs[type],
+  };
+};
+
+AuditConfig.fromDynamoItem = (dynamoItem) => AuditConfig(dynamoItem);
+
+AuditConfig.toDynamoItem = (auditConfig) => ({
+  auditsDisabled: auditConfig.auditsDisabled(),
+  auditTypeConfigs: Object.entries(auditConfig.getAuditTypeConfigs())
+    .reduce((acc, [key, value]) => {
+      acc[key] = AuditConfigType.toDynamoItem(value);
+      return acc;
+    }, {}),
+});
+
+export default AuditConfig;

package/src/models/site.js

@@ -10,8 +10,10 @@
  * governing permissions and limitations under the License.
  */
 
-import { hasText, isValidUrl } from '@adobe/spacecat-shared-utils';
+import { hasText, isObject, isValidUrl } from '@adobe/spacecat-shared-utils';
+
 import { Base } from './base.js';
+import AuditConfig from './site/audit-config.js';
 
 /**
  * Creates a new Site.
@@ -22,6 +24,7 @@ import { Base } from './base.js';
 const Site = (data = {}) => {
   const self = Base(data);
 
+  self.getAuditConfig = () => self.state.auditConfig;
   self.getAudits = () => self.state.audits;
   self.getBaseURL = () => self.state.baseURL;
   self.getGitHubURL = () => self.state.gitHubURL;
@@ -135,5 +138,14 @@ export const createSite = (data) => {
     newState.audits = [];
   }
 
+  if (!isObject(newState.auditConfig)) {
+    newState.auditConfig = {
+      auditsDisabled: false,
+      auditTypeConfigs: {},
+    };
+  }
+
+  newState.auditConfig = AuditConfig(newState.auditConfig);
+
   return Site(newState);
 };

package/src/service/sites/accessPatterns.js

@@ -55,19 +55,18 @@ export const getSitesToAudit = async (dynamoClient, config) => {
 };
 
 /**
- * Retrieves sites with their latest audit of a specified type. If there is
- * no audit of the specified type for a site, the site will be returned with
- * an empty audits array.
- * The audits are sorted ascending or descending by scores.
- *
+ * Retrieves all sites with their latest audit. Sites without a latest audit will be included
+ * in the result, but will have an empty audits array. The sites are sorted by their latest
+ * audit scores in ascending order by default. The sortAuditsAscending parameter can be used
+ * to change the sort order. If a site has no latest audit, it will be sorted at the end of
+ * the list.
  * @param {DynamoDbClient} dynamoClient - The DynamoDB client.
  * @param {DataAccessConfig} config - The data access config.
  * @param {Logger} log - The logger.
- * @param {string} auditType - The type of the latest audits to retrieve for each site.
- * @param {boolean} [sortAuditsAscending] - Optional. Determines if the audits
- * should be sorted ascending or descending by scores.
- * @returns {Promise<Readonly<Site>[]>} A promise that resolves to an array of site objects,
- * each with its latest audit of the specified type.
+ * @param {string} auditType - The type of audits to retrieve for the sites.
+ * @param {boolean} [sortAuditsAscending=true] - Determines if the audits should be sorted in
+ * @return {Promise<Readonly<Site>[]>} A promise that resolves to an array of sites with their
+ * latest audit.
  */
 export const getSitesWithLatestAudit = async (
   dynamoClient,
@@ -81,17 +80,26 @@ export const getSitesWithLatestAudit = async (
     getLatestAudits(dynamoClient, config, log, auditType, sortAuditsAscending),
   ]);
 
-  const auditsMap = new Map(latestAudits.map((audit) => [audit.getSiteId(), audit]));
+  const sitesMap = new Map(sites.map((site) => [site.getId(), site]));
+  const orderedSites = [];
 
-  return sites.map((site) => {
-    const audit = auditsMap.get(site.getId());
-    if (audit) {
+  // First, append sites with a latest audit in the sorted order
+  latestAudits.forEach((audit) => {
+    const site = sitesMap.get(audit.getSiteId());
+    if (site) {
       site.setAudits([audit]);
-    } else {
-      site.setAudits([]);
+      orderedSites.push(site);
+      sitesMap.delete(site.getId()); // Remove the site from the map to avoid adding it again
     }
-    return site;
   });
+
+  // Then, append the remaining sites (without a latest audit)
+  sitesMap.forEach((site) => {
+    site.setAudits([]);
+    orderedSites.push(site);
+  });
+
+  return orderedSites;
 };
 
 /**