@adobe/spacecat-shared-data-access 1.35.2 → 1.37.0

package/CHANGELOG.md

@@ -1,3 +1,24 @@
+# [@adobe/spacecat-shared-data-access-v1.37.0](https://github.com/adobe/spacecat-shared/compare/@adobe/spacecat-shared-data-access-v1.36.0...@adobe/spacecat-shared-data-access-v1.37.0) (2024-07-22)
+
+
+### Bug Fixes
+
+* **deps:** update external fixes ([#295](https://github.com/adobe/spacecat-shared/issues/295)) ([4e8d50d](https://github.com/adobe/spacecat-shared/commit/4e8d50d8d88b2d68b483fda2ead31542d15ee952))
+
+
+### Features
+
+* new config data model ([2525af4](https://github.com/adobe/spacecat-shared/commit/2525af48d1d4dad7e1b6e1fb3fbf3cda79d1252d))
+* update the config model for sites and orgs ([ed556bd](https://github.com/adobe/spacecat-shared/commit/ed556bda995d8cb6b79cb44efbee7d0b779dc0aa))
+* update to trigger release ([b1610ab](https://github.com/adobe/spacecat-shared/commit/b1610ab8160a75348803b470deaa8c28d2baf6f1))
+
+# [@adobe/spacecat-shared-data-access-v1.36.0](https://github.com/adobe/spacecat-shared/compare/@adobe/spacecat-shared-data-access-v1.35.2...@adobe/spacecat-shared-data-access-v1.36.0) (2024-07-16)
+
+
+### Features
+
+* Get all import jobs by date range ([#292](https://github.com/adobe/spacecat-shared/issues/292)) ([21accd3](https://github.com/adobe/spacecat-shared/commit/21accd34a543af3ab39aacaa0545f84c7bb50f3b))
+
 # [@adobe/spacecat-shared-data-access-v1.35.2](https://github.com/adobe/spacecat-shared/compare/@adobe/spacecat-shared-data-access-v1.35.1...@adobe/spacecat-shared-data-access-v1.35.2) (2024-07-13)
 
 

package/migration.sh

@@ -0,0 +1,135 @@
+#!/bin/bash
+
+# Define AWS CLI command with local DynamoDB endpoint
+AWS_CMD="aws dynamodb --endpoint-url http://localhost:8000"
+REGION="us-west-2"
+
+# Define table names
+SITE_TABLE="spacecat-services-sites"
+ORGANIZATION_TABLE="spacecat-services-organizations"
+
+# Fetch all sites
+SITES=$($AWS_CMD scan --table-name $SITE_TABLE)
+ORGANIZATIONS=$($AWS_CMD scan --table-name $ORGANIZATION_TABLE)
+
+# Migrate each site
+echo "$SITES" | jq -c '.Items[]' | while read -r site; do
+    SITE_ID=$(echo $site | jq -r '.id.S')
+    BASE_URL=$(echo $site | jq -r '.baseURL.S')
+    DELIVERY_TYPE=$(echo $site | jq -r '.deliveryType.S')
+    GITHUB_URL=$(echo $site | jq -r '.gitHubURL.S')
+    ORG_ID=$(echo $site | jq -r '.organizationId.S')
+    IS_LIVE=$(echo $site | jq -r '.isLive.BOOL // false')
+    IS_LIVE_TOGGLED_AT=$(echo $site | jq -r '.isLiveToggledAt.S // empty')
+    GSI1PK=$(echo $site | jq -r '.GSI1PK.S')
+    CREATED_AT=$(echo $site | jq -r '.createdAt.S')
+    UPDATED_AT=$(echo $site | jq -r '.updatedAt.S')
+    SLACK=$(echo $site | jq -r '.config.M.slack // {"M": {}}')
+    IMPORTS=$(echo $site | jq -r '.config.M.imports // {"L": []}')
+    HLX_CONFIG=$(echo $site | jq -r '.hlxConfig // {"M": {}}')
+
+    # Check for 404 and broken-backlinks mentions
+    ALERTS=$(echo $site | jq -c '.config.M.alerts.L')
+    MENTIONS_404_SLACK='{"L":[]}'
+    MENTIONS_BROKEN_BACKLINKS_SLACK='{"L":[]}'
+    for alert in $(echo "$ALERTS" | jq -c '.[]'); do
+        ALERT_TYPE=$(echo $alert | jq -r '.M.type.S // empty')
+        if [ "$ALERT_TYPE" == "404" ]; then
+            MENTIONS_404_SLACK=$(echo $alert | jq -r '.M.mentions.L[0].M.slack // {"L":[]}')
+        elif [ "$ALERT_TYPE" == "broken-backlinks" ]; then
+            MENTIONS_BROKEN_BACKLINKS_SLACK=$(echo $alert | jq -r '.M.mentions.L[0].M.slack // {"L":[]}')
+        fi
+    done
+
+    # Get excluded URLs
+    EXCLUDED_URLS=$(echo $site | jq -c '.auditConfig.M.auditTypeConfigs.M["broken-backlinks"].M.excludedURLs // {"L" :[]} ')
+    MANUAL_OVERWRITES=$(echo $site | jq -c '.auditConfig.M.auditTypeConfigs.M["broken-backlinks"].M.manualOverwrites // {"L" :[]} ')
+    FIXED_URLS=$(echo $site | jq -c '.auditConfig.M.auditTypeConfigs.M["broken-backlinks"].M.fixedURLs // {"L" :[]} ')
+    MIGRATED_SITE=$(cat <<EOF
+{
+    "id": {"S": "$SITE_ID"},
+    "baseURL": {"S": "$BASE_URL"},
+    "deliveryType": {"S": "$DELIVERY_TYPE"},
+    "gitHubURL": {"S": "$GITHUB_URL"},
+    "organizationId": {"S": "$ORG_ID"},
+    "isLive": {"BOOL": $IS_LIVE},
+    "isLiveToggledAt": {"S": "$IS_LIVE_TOGGLED_AT"},
+    "GSI1PK": {"S": "$GSI1PK"},
+    "createdAt": {"S": "$CREATED_AT"},
+    "updatedAt": {"S": "$UPDATED_AT"},
+    "hlxConfig": $HLX_CONFIG,
+    "config": {
+        "M": {
+            "slack": $SLACK,
+            "imports": $IMPORTS,
+            "handlers": {
+                "M": {
+                    "404": {"M": {"mentions": {"M": {"slack": $MENTIONS_404_SLACK}}}},
+                    "broken-backlinks": {"M": {"mentions": {"M": {"slack": $MENTIONS_BROKEN_BACKLINKS_SLACK}}, "excludedURLs": $EXCLUDED_URLS, "manualOverwrites": $MANUAL_OVERWRITES, "fixedURLs": $FIXED_URLS}}
+                }
+              }
+          }
+    }
+}
+EOF
+)
+
+    # Insert migrated site data into the site table
+    $AWS_CMD put-item --table-name $SITE_TABLE --item "$MIGRATED_SITE"
+done
+
+# Migrate each organization
+echo "$ORGANIZATIONS" | jq -c '.Items[]' | while read -r org; do
+    ORG_ID=$(echo $org | jq -r '.id.S')
+    IMS_ORG_ID=$(echo $org | jq -r '.imsOrgId.S')
+    NAME=$(echo $org | jq -r '.name.S')
+    GSI1PK=$(echo $org | jq -r '.GSI1PK.S')
+    CREATED_AT=$(echo $org | jq -r '.createdAt.S')
+    UPDATED_AT=$(echo $org | jq -r '.updatedAt.S')
+    SLACK=$(echo $org | jq -r '.config.M.slack // {"M": {}}')
+    IMPORTS=$(echo $org | jq -r '.config.M.imports // {"L": []}')
+
+    # Check for 404 and broken-backlinks mentions
+    ALERTS=$(echo $org | jq -c '.config.M.alerts.L')
+    MENTIONS_404_SLACK='{"L":[]}'
+    MENTIONS_BROKEN_BACKLINKS_SLACK='{"L":[]}'
+    for alert in $(echo "$ALERTS" | jq -c '.[]'); do
+        ALERT_TYPE=$(echo $alert | jq -r '.M.type.S // empty')
+        if [ "$ALERT_TYPE" == "404" ]; then
+            MENTIONS_404_SLACK=$(echo $alert | jq -r '.M.mentions.L[0].M.slack // {"L":[]}')
+        elif [ "$ALERT_TYPE" == "broken-backlinks" ]; then
+            MENTIONS_BROKEN_BACKLINKS_SLACK=$(echo $alert | jq -r '.M.mentions.L[0].M.slack // {"L":[]}')
+        fi
+    done
+
+
+
+    MIGRATED_ORG=$(cat <<EOF
+{
+    "id": {"S": "$ORG_ID"},
+    "imsOrgId": {"S": "$IMS_ORG_ID"},
+    "name": {"S": "$NAME"},
+    "GSI1PK": {"S": "$GSI1PK"},
+    "createdAt": {"S": "$CREATED_AT"},
+    "updatedAt": {"S": "$UPDATED_AT"},
+    "config": {
+        "M": {
+          "slack": $SLACK,
+          "imports": $IMPORTS,
+          "handlers": {
+              "M": {
+                  "404": {"M": {"mentions": {"M": {"slack": $MENTIONS_404_SLACK}}}},
+                  "broken-backlinks": {"M": {"mentions": {"M": {"slack": $MENTIONS_BROKEN_BACKLINKS_SLACK}}}}
+              }
+        }
+    }
+}
+}
+EOF
+)
+
+    # Insert migrated organization data into the organization table
+    $AWS_CMD put-item --table-name $ORGANIZATION_TABLE --item "$MIGRATED_ORG"
+done
+
+echo "Migration completed successfully."

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@adobe/spacecat-shared-data-access",
-  "version": "1.35.2",
+  "version": "1.37.0",
   "description": "Shared modules of the Spacecat Services - Data Access",
   "type": "module",
   "main": "src/index.js",
@@ -31,8 +31,8 @@
   "dependencies": {
     "@adobe/spacecat-shared-dynamo": "1.2.5",
     "@adobe/spacecat-shared-utils": "1.2.0",
-    "@aws-sdk/client-dynamodb": "3.614.0",
-    "@aws-sdk/lib-dynamodb": "3.614.0",
+    "@aws-sdk/client-dynamodb": "3.616.0",
+    "@aws-sdk/lib-dynamodb": "3.616.0",
     "@types/joi": "17.2.3",
     "joi": "17.13.3",
     "uuid": "10.0.0"

package/src/dto/configuration.js

@@ -26,6 +26,7 @@ export const ConfigurationDto = {
       version: dynamoItem.version,
       queues: dynamoItem.queues,
       jobs: dynamoItem.jobs,
+      handlers: dynamoItem.handlers,
     };
 
     return createConfiguration(configurationData);
@@ -41,5 +42,6 @@ export const ConfigurationDto = {
     version: configuration.getVersion(),
     queues: configuration.getQueues(),
     jobs: configuration.getJobs(),
+    handlers: configuration.getHandlers(),
   }),
 };

package/src/dto/site.js

@@ -11,7 +11,6 @@
  */
 
 import { createSite } from '../models/site.js';
-import AuditConfig from '../models/site/audit-config.js';
 import { Config } from '../models/site/config.js';
 
 /**
@@ -35,7 +34,6 @@ export const SiteDto = {
     createdAt: site.getCreatedAt(),
     updatedAt: site.getUpdatedAt(),
     GSI1PK: 'ALL_SITES',
-    auditConfig: AuditConfig.toDynamoItem(site.getAuditConfig()),
     config: Config.toDynamoItem(site.getConfig()),
   }),
 
@@ -56,7 +54,6 @@ export const SiteDto = {
       isLiveToggledAt: dynamoItem.isLiveToggledAt,
       createdAt: dynamoItem.createdAt,
       updatedAt: dynamoItem.updatedAt,
-      auditConfig: dynamoItem.auditConfig,
       config: dynamoItem.config,
     };
 

package/src/index.d.ts

@@ -84,18 +84,6 @@ export interface Audit {
   getScores: () => object;
 }
 
-/**
- * AuditConfigType defines the structure for specific audit type configurations.
- */
-export interface AuditConfigType {
-  /**
-   * Returns true if the audit type is disabled for the site. If an audit type is disabled, no
-   * audits of that type will be scheduled for the site.
-   * @returns {boolean} True if the audit type is disabled for the site.
-   */
-  disabled: () => boolean;
-}
-
 export interface Config {
 
 }
@@ -104,31 +92,6 @@ export interface FulfillableItems {
   items: string[];
 }
 
-/**
- * AuditConfig defines the structure for the overall audit configuration of a site.
- */
-export interface AuditConfig {
-  /**
-   * Returns true if audits are disabled for the site. If audits are disabled, no audits will be
-   * scheduled for the site. Overrides any audit type specific configurations.
-   * @returns {boolean} True if audits are disabled for the site.
-   */
-  auditsDisabled: () => boolean;
-
-  /**
-   * Returns the audit config for a specific audit type. The audit type is the key.
-   * @param {string} auditType The audit type to get the config for.
-   * @returns {AuditConfigType} The audit config for the audit type.
-   */
-  getAuditTypeConfig: (auditType: string) => AuditConfigType;
-
-  /**
-   * Returns the audit configs for all audit types. The keys are the audit types.
-   * @returns {object} The audit configs for all audit types.
-   */
-  getAuditTypeConfigs: () => object;
-}
-
 /**
  * Represents a key event.
  */
@@ -222,12 +185,6 @@ export interface Site {
    */
   getUpdatedAt: () => string;
 
-  /**
-   * Retrieves the current audit configuration for the site.
-   * @returns {AuditConfig} The current audit configuration.
-   */
-  getAuditConfig: () => AuditConfig;
-
   /**
    * Retrieves the current configuration for the site.
    * @returns {Config} The current configuration.
@@ -435,6 +392,60 @@ export interface Configuration {
    */
   getJobs: () => Array<object>;
 
+    /**
+     * Retrieves the handlers configuration.
+     * @returns {object} The handlers configuration.
+     */
+  getHandlers: () => object;
+
+  /**
+   * Retrieves the handler configuration for handler type.
+   * @returns {object} The handler type configuration.
+   */
+  getHandler: (type) => object;
+
+  /**
+   * Return true if a handler type is enabled for an organization.
+   * @param type handler type
+   * @param org organization
+   */
+  isHandlerEnabledForOrg: (type: string, org: Organization) => boolean;
+
+  /**
+   * Return true if a handler type is enabled for a site.
+   * @param type handler type
+   * @param site site
+   */
+  isHandlerEnabledForSite: (type: string, site: Site) => boolean;
+
+  /**
+   * Enables a handler type for an site.
+   * @param type handler type
+   * @param site site
+   */
+  enableHandlerForSite: (type: string, site: Site) => void;
+
+  /**
+   * Enables a handler type for an organization.
+   * @param type handler type
+   * @param org organization
+   */
+  enableHandlerForOrg: (type: string, org: Organization) => void;
+
+    /**
+     * Disables a handler type for an site.
+     * @param type handler type
+     * @param site site
+     */
+  disableHandlerForSite: (type: string, site: Site) => void;
+
+  /**
+   * Disables a handler type for an organization.
+   * @param type handler type
+   * @param org organization
+   */
+  disableHandlerForOrg: (type:string, org: Organization) => void;
+
 }
 
 export interface ImportJob {
@@ -612,6 +623,10 @@ export interface DataAccess {
   removeOrganization: (
       organizationId: string,
   ) => Promise<void>;
+  getImportJobsByDateRange: (
+      startDate: string,
+      endDate: string,
+  ) => Promise<ImportJob[]>;
   getImportJobByID: (
     id: string,
     ) => Promise<ImportJob | null>;
@@ -681,6 +696,7 @@ interface DataAccessConfig {
   indexNameAllOrganizations: string,
   indexNameAllOrganizationsByImsOrgId: string,
   indexNameAllImportJobsByStatus: string,
+  indexNameAllImportJobsByDateRange: string,
   indexNameAllImportUrlsByJobIdAndStatus: string,
   pkAllSites: string;
   pkAllLatestAudits: string;

package/src/index.js

@@ -33,6 +33,7 @@ const INDEX_NAME_ALL_SITES_BY_DELIVERY_TYPE = 'spacecat-services-all-sites-by-de
 const INDEX_NAME_ALL_LATEST_AUDIT_SCORES = 'spacecat-services-all-latest-audit-scores-dev';
 const INDEX_NAME_ALL_SITES_ORGANIZATIONS = 'spacecat-services-all-sites-organizations-dev';
 const INDEX_NAME_ALL_IMPORT_JOBS_BY_STATUS = 'spacecat-services-all-import-jobs-by-status-dev';
+const INDEX_NAME_ALL_IMPORT_JOBS_BY_DATE_RANGE = 'spacecat-services-all-import-jobs-by-date-range-dev';
 const INDEX_NAME_ALL_IMPORT_URLS_BY_JOB_ID_AND_STATUS = 'spacecat-services-all-import-urls-by-job-id-and-status-dev';
 
 const PK_ALL_SITES = 'ALL_SITES';
@@ -66,6 +67,7 @@ export default function dataAccessWrapper(fn) {
         DYNAMO_INDEX_NAME_ALL_ORGANIZATIONS_BY_IMS_ORG_ID = INDEX_NAME_ALL_ORGANIZATIONS_BY_IMS_ORG_ID,
         DYNAMO_INDEX_NAME_ALL_SITES_ORGANIZATIONS = INDEX_NAME_ALL_SITES_ORGANIZATIONS,
         DYNAMO_INDEX_NAME_ALL_IMPORT_JOBS_BY_STATUS = INDEX_NAME_ALL_IMPORT_JOBS_BY_STATUS,
+        DYNAMO_INDEX_NAME_ALL_IMPORT_JOBS_BY_DATE_RANGE = INDEX_NAME_ALL_IMPORT_JOBS_BY_DATE_RANGE,
         DYNAMO_INDEX_NAME_ALL_IMPORT_URLS_BY_JOB_ID_AND_STATUS =
         INDEX_NAME_ALL_IMPORT_URLS_BY_JOB_ID_AND_STATUS,
       } = context.env;
@@ -89,6 +91,7 @@ export default function dataAccessWrapper(fn) {
         indexNameAllLatestAuditScores: DYNAMO_INDEX_NAME_ALL_LATEST_AUDIT_SCORES,
         indexNameAllSitesOrganizations: DYNAMO_INDEX_NAME_ALL_SITES_ORGANIZATIONS,
         indexNameAllImportJobsByStatus: DYNAMO_INDEX_NAME_ALL_IMPORT_JOBS_BY_STATUS,
+        indexNameAllImportJobsByDateRange: DYNAMO_INDEX_NAME_ALL_IMPORT_JOBS_BY_DATE_RANGE,
         indexNameImportUrlsByJobIdAndStatus: DYNAMO_INDEX_NAME_ALL_IMPORT_URLS_BY_JOB_ID_AND_STATUS,
         pkAllSites: PK_ALL_SITES,
         pkAllOrganizations: PK_ALL_ORGANIZATIONS,

package/src/models/configuration.js

@@ -13,18 +13,151 @@
 import Joi from 'joi';
 
 const Configuration = (data = {}) => {
-  const self = { ...data };
-  self.getJobs = () => self.jobs;
-  self.getVersion = () => self.version;
-  self.getQueues = () => self.queues;
+  const state = { ...data };
+  const self = { state };
+  self.getJobs = () => self.state.jobs;
+  self.getVersion = () => self.state.version;
+  self.getQueues = () => self.state.queues;
+  self.getHandlers = () => self.state.handlers;
+  self.getHandler = (type) => self.state.handlers[type];
+  self.addHandler = (type, handlerData) => {
+    state.handlers = state.handlers || {};
+    state.handlers[type] = { ...handlerData };
+  };
+  self.isHandlerEnabledForSite = (type, site) => {
+    const handler = state.handlers[type];
+    if (!handler) return false;
+
+    const siteId = site.getId();
+    const orgId = site.getOrganizationId();
+
+    if (handler.enabled) {
+      return handler.enabled.sites.includes(siteId) || handler.enabled.orgs.includes(orgId);
+    }
+
+    if (handler.disabled) {
+      return !((handler.disabled.sites && handler.disabled.sites.includes(siteId))
+          || (handler.disabled.orgs && handler.disabled.orgs.includes(orgId)));
+    }
+
+    return handler.enabledByDefault;
+  };
+
+  self.isHandlerEnabledForOrg = (type, org) => {
+    const handler = state.handlers[type];
+    if (!handler) return false;
+
+    const orgId = org.getId();
+
+    if (handler.enabled) {
+      return handler.enabled.orgs.includes(orgId);
+    }
+
+    if (handler.disabled) {
+      return !handler.disabled.orgs.includes(orgId);
+    }
+
+    return handler.enabledByDefault;
+  };
+
+  const updateHandlerOrgs = (type, orgId, enabled) => {
+    const handler = state.handlers[type];
+    if (!handler) return;
+
+    if (enabled) {
+      if (handler.enabledByDefault) {
+        handler.disabled.orgs = handler.disabled.orgs?.filter((id) => id !== orgId) || [];
+      } else {
+        handler.enabled = handler.enabled || { orgs: [] };
+        handler.enabled.orgs = [...(handler.enabled?.orgs || []), orgId];
+      }
+    } else if (handler.enabledByDefault) {
+      handler.disabled = handler.disabled || { orgs: [] };
+      handler.disabled.orgs = [...(handler.disabled?.orgs || []), orgId];
+    } else {
+      handler.enabled.orgs = handler.enabled.orgs?.filter((id) => id !== orgId) || [];
+    }
+  };
+
+  const updateHandlerSites = (type, siteId, enabled) => {
+    const handler = state.handlers[type];
+    if (!handler) return;
+
+    if (enabled) {
+      if (handler.enabledByDefault) {
+        handler.disabled.sites = handler.disabled.sites?.filter((id) => id !== siteId) || [];
+      } else {
+        handler.enabled = handler.enabled || { sites: [] };
+        handler.enabled.sites = [...(handler.enabled.sites || []), siteId];
+      }
+    } else if (handler.enabledByDefault) {
+      handler.disabled = handler.disabled || { sites: [] };
+      handler.disabled.sites = [...(handler.disabled.sites || []), siteId];
+    } else {
+      handler.enabled.sites = handler.enabled.sites?.filter((id) => id !== siteId) || [];
+    }
+  };
+
+  self.enableHandlerForSite = (type, site) => {
+    const siteId = site.getId();
+    if (self.isHandlerEnabledForSite(type, site)) return;
+
+    updateHandlerSites(type, siteId, true);
+  };
+
+  self.enableHandlerForOrg = (type, org) => {
+    const orgId = org.getId();
+    if (self.isHandlerEnabledForOrg(type, org)) return;
+
+    updateHandlerOrgs(type, orgId, true);
+  };
+
+  self.disableHandlerForSite = (type, site) => {
+    const siteId = site.getId();
+    if (!self.isHandlerEnabledForSite(type, site)) return;
+
+    updateHandlerSites(type, siteId, false);
+  };
+
+  self.disableHandlerForOrg = (type, org) => {
+    const orgId = org.getId();
+    if (!self.isHandlerEnabledForOrg(type, org)) return;
+
+    updateHandlerOrgs(type, orgId, false);
+  };
 
   return Object.freeze(self);
 };
 
+/**
+ *
+ * @param configuration
+ * @returns {any}
+ */
+
 export const checkConfiguration = (configuration) => {
   const schema = Joi.object({
     version: Joi.string().required(),
     queues: Joi.object().required(),
+    handlers: Joi.object().pattern(Joi.string(), Joi.object(
+      {
+        enabled: Joi.object({
+          sites: Joi.array().items(Joi.string()),
+          orgs: Joi.array().items(Joi.string()),
+        }),
+        disabled: Joi.object({
+          sites: Joi.array().items(Joi.string()),
+          orgs: Joi.array().items(Joi.string()),
+        }),
+        enabledByDefault: Joi.boolean().required(),
+        dependencies: Joi.array().items(Joi.object(
+          {
+            handler: Joi.string(),
+            actions: Joi.array().items(Joi.string()),
+          },
+        )),
+      },
+    )),
     jobs: Joi.array().required(),
   }).unknown(true);
   const { error, value } = schema.validate(configuration);

package/src/models/organization.js

@@ -26,24 +26,11 @@ export const DEFAULT_ORGANIZATION_ID = 'default';
 const Organization = (data = {}) => {
   const self = Base(data);
 
-  self.getAuditConfig = () => self.state.config.audits;
   self.getConfig = () => self.state.config;
   self.getName = () => self.state.name;
   self.getImsOrgId = () => self.state.imsOrgId;
   self.getFulfillableItems = () => self.state.fulfillableItems;
 
-  self.setAllAuditsDisabled = (disabled) => {
-    self.state.config.audits.updateAuditsDisabled(disabled);
-    self.touch();
-    return self;
-  };
-
-  self.updateAuditTypeConfig = (type, config) => {
-    self.state.config.audits.updateAuditTypeConfig(type, config);
-    self.touch();
-    return self;
-  };
-
   /**
      * Updates the IMS Org ID belonging to the organization.
      * @param {string} imsOrgId - The IMS Org ID.

package/src/models/site/config.js

@@ -11,7 +11,6 @@
  */
 
 import Joi from 'joi';
-import AuditConfig from './audit-config.js';
 
 export const configSchema = Joi.object({
   slack: Joi.object({
@@ -19,35 +18,25 @@ export const configSchema = Joi.object({
     channel: Joi.string(),
     invitedUserCount: Joi.number().integer().min(0),
   }),
-  alerts: Joi.array().items(Joi.object({
-    type: Joi.string().required(),
-    byOrg: Joi.boolean(),
-    mentions: Joi.array().items(Joi.object({ slack: Joi.array().items(Joi.string()) })),
-  }).unknown(true)),
-  audits: Joi.object({
-    auditsDisabled: Joi.boolean().optional(),
-    auditTypeConfigs: Joi.object().pattern(
-      Joi.string(),
-      Joi.object({
-        disabled: Joi.boolean().optional(),
-        excludedURLs: Joi.array().items(Joi.string()).optional(),
-        manualOverwrites: Joi.array().items(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),
+  imports: Joi.array().items(Joi.object({ type: Joi.string() }).unknown(true)),
+  handlers: Joi.object().pattern(Joi.string(), Joi.object({
+    mentions: Joi.object().pattern(Joi.string(), Joi.array().items(Joi.string())),
+    excludedURLs: Joi.array().items(Joi.string()),
+    manualOverwrites: Joi.array().items(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);
 
 export const DEFAULT_CONFIG = {
   slack: {},
-  alerts: [],
-  audits: {},
+  handlers: {
+  },
 };
 
 // Function to validate incoming configuration
@@ -63,11 +52,50 @@ function validateConfiguration(config) {
 
 export const Config = (data = {}) => {
   const validConfig = validateConfiguration(data);
-  validConfig.audits = AuditConfig(validConfig.audits);
 
   const state = { ...validConfig };
+  const self = { state };
+  self.getSlackConfig = () => state.slack;
+  self.getSlackMentions = (type) => state?.handlers[type]?.mentions?.slack;
+  self.getHandlerConfig = (type) => state?.handlers[type];
+  self.getHandlers = () => state.handlers;
+  self.getImports = () => state.imports;
+  self.getExcludedURLs = (type) => state?.handlers[type]?.excludedURLs;
+  self.getManualOverrides = (type) => state?.handlers[type]?.manualOverwrites;
+  self.getFixedURLs = (type) => state?.handlers[type]?.fixedURLs;
 
-  const self = { ...state };
+  self.updateSlackConfig = (channel, workspace, invitedUserCount) => {
+    state.slack = {
+      channel,
+      workspace,
+      invitedUserCount,
+    };
+  };
+
+  self.updateSlackMentions = (type, mentions) => {
+    state.handlers = state.handlers || {};
+    state.handlers[type] = state.handlers[type] || {};
+    state.handlers[type].mentions = state.handlers[type].mentions || {};
+    state.handlers[type].mentions.slack = mentions;
+  };
+
+  self.updateExcludeURLs = (type, excludedURLs) => {
+    state.handlers = state.handlers || {};
+    state.handlers[type] = state.handlers[type] || {};
+    state.handlers[type].excludedURLs = excludedURLs;
+  };
+
+  self.updateManualOverrides = (type, manualOverwrites) => {
+    state.handlers = state.handlers || {};
+    state.handlers[type] = state.handlers[type] || {};
+    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);
 };
@@ -75,6 +103,7 @@ export const Config = (data = {}) => {
 Config.fromDynamoItem = (dynamoItem) => Config(dynamoItem);
 
 Config.toDynamoItem = (config) => ({
-  ...config,
-  audits: AuditConfig.toDynamoItem(config.audits),
+  slack: config.getSlackConfig(),
+  handlers: config.getHandlers(),
+  imports: config.getImports(),
 });

package/src/models/site.js

@@ -13,7 +13,6 @@
 import { hasText, isObject, isValidUrl } from '@adobe/spacecat-shared-utils';
 
 import { Base } from './base.js';
-import AuditConfig from './site/audit-config.js';
 import { Config, DEFAULT_CONFIG } from './site/config.js';
 import { DEFAULT_ORGANIZATION_ID } from './organization.js';
 
@@ -34,7 +33,6 @@ export const DEFAULT_DELIVERY_TYPE = DELIVERY_TYPES.AEM_EDGE;
 const Site = (data = {}) => {
   const self = Base(data);
 
-  self.getAuditConfig = () => self.state.auditConfig;
   self.getAudits = () => self.state.audits;
   self.getBaseURL = () => self.state.baseURL;
   self.getConfig = () => self.state.config;
@@ -82,18 +80,6 @@ const Site = (data = {}) => {
     return self;
   }; */
 
-  self.setAllAuditsDisabled = (disabled) => {
-    self.state.auditConfig.updateAuditsDisabled(disabled);
-    self.touch();
-    return self;
-  };
-
-  self.updateAuditTypeConfig = (type, config) => {
-    self.state.auditConfig.updateAuditTypeConfig(type, config);
-    self.touch();
-    return self;
-  };
-
   /**
    * Updates the site config.
    * @param {string} config - The Site config.
@@ -222,15 +208,6 @@ export const createSite = (data) => {
     newState.audits = [];
   }
 
-  if (!isObject(newState.auditConfig)) {
-    newState.auditConfig = {
-      auditsDisabled: false,
-      auditTypeConfigs: {},
-    };
-  }
-
-  newState.auditConfig = AuditConfig(newState.auditConfig);
-
   if (!isObject(newState.config)) {
     newState.config = { ...DEFAULT_CONFIG };
   }

package/src/service/configurations/accessPatterns.js

@@ -110,8 +110,7 @@ export const updateConfiguration = async (
   const newConfigurationData = { ...configurationData };
   const latestConfiguration = await getConfiguration(dynamoClient, config);
 
-  newConfigurationData.version = incrementVersion(latestConfiguration?.version);
-  newConfigurationData.PK = config.pkAllConfigurations;
+  newConfigurationData.version = incrementVersion(latestConfiguration?.getVersion());
 
   const newConfiguration = createConfiguration(newConfigurationData);
 

package/src/service/import-job/accessPatterns.js

@@ -14,6 +14,31 @@ import { isObject } from '@adobe/spacecat-shared-utils';
 import { ImportJobDto } from '../../dto/import-job.js';
 import { createImportJob } from '../../models/importer/import-job.js';
 
+/**
+ * Get all Import Jobs within a specific date range
+ * @param {DynamoClient} dynamoClient
+ * @param {Object} config
+ * @param {Logger} log
+ * @param {string} startDate
+ * @param {string} endDate
+ */
+export const getImportJobsByDateRange = async (dynamoClient, config, log, startDate, endDate) => {
+  const items = await dynamoClient.query({
+    TableName: config.tableNameImportJobs,
+    IndexName: config.indexNameAllImportJobsByDateRange,
+    KeyConditionExpression: 'GSI1PK = :gsi1pk AND #startTime BETWEEN :startDate AND :endDate',
+    ExpressionAttributeNames: {
+      '#startTime': 'startTime',
+    },
+    ExpressionAttributeValues: {
+      ':gsi1pk': config.pkAllImportJobs,
+      ':startDate': startDate,
+      ':endDate': endDate,
+    },
+  });
+  return items.map((item) => ImportJobDto.fromDynamoItem(item));
+};
+
 /**
  * Get Import Job by ID
  * @param {DynamoClient} dynamoClient

package/src/service/import-job/index.js

@@ -15,9 +15,17 @@ import {
   getImportJobByID,
   getImportJobsByStatus,
   updateImportJob,
+  getImportJobsByDateRange,
 } from './accessPatterns.js';
 
 export const importJobFunctions = (dynamoClient, config, log) => ({
+  getImportJobsByDateRange: (startDate, endDate) => getImportJobsByDateRange(
+    dynamoClient,
+    config,
+    log,
+    startDate,
+    endDate,
+  ),
   getImportJobByID: (id) => getImportJobByID(
     dynamoClient,
     config,

package/src/service/sites/accessPatterns.js

@@ -336,7 +336,6 @@ export const getSiteByID = async (
 
   return isObject(dynamoItem) ? SiteDto.fromDynamoItem(dynamoItem) : null;
 };
-
 /**
  * Adds a site.
  *

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

@@ -1,60 +0,0 @@
-/*
- * 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 = {}) => {
-  const state = {
-    disabled: data.disabled || false,
-    excludedURLs: data.excludedURLs || [],
-    manualOverwrites: data.manualOverwrites || [],
-    fixedURLs: data.fixedURLs || [],
-  };
-
-  const self = {
-    disabled: () => state.disabled,
-    getExcludedURLs: () => state.excludedURLs,
-    updateExcludedURLs: (excludeURLs) => {
-      state.excludedURLs = excludeURLs;
-    },
-    getManualOverwrites: () => state.manualOverwrites,
-    updateManualOverwrites: (manualOverwrites) => {
-      state.manualOverwrites = manualOverwrites;
-    },
-    getFixedURLs: () => state.fixedURLs,
-    updateFixedURLs: (fixedURLs) => {
-      state.fixedURLs = fixedURLs;
-    },
-    updateDisabled: (newValue) => {
-      state.disabled = newValue;
-    },
-  };
-
-  return Object.freeze(self);
-};
-
-AuditConfigType.fromDynamoItem = (dynamoItem) => {
-  const auditConfigTypeData = {
-    disabled: dynamoItem.disabled,
-    excludedURLs: dynamoItem.excludedURLs,
-    manualOverwrites: dynamoItem.manualOverwrites,
-    fixedURLs: dynamoItem.fixedURLs,
-  };
-  return AuditConfigType(auditConfigTypeData);
-};
-
-AuditConfigType.toDynamoItem = (auditConfigType) => ({
-  disabled: auditConfigType.disabled(),
-  excludedURLs: auditConfigType.getExcludedURLs(),
-  manualOverwrites: auditConfigType.getManualOverwrites(),
-  fixedURLs: auditConfigType.getFixedURLs(),
-});
-
-export default AuditConfigType;

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

@@ -1,85 +0,0 @@
-/*
- * 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';
-import {
-  AUDIT_TYPE_BROKEN_BACKLINKS,
-  AUDIT_TYPE_EXPERIMENTATION_ESS_DAILY,
-  AUDIT_TYPE_EXPERIMENTATION_ESS_MONTHLY,
-  AUDIT_TYPE_ORGANIC_KEYWORDS,
-  AUDIT_TYPE_ORGANIC_TRAFFIC,
-} from '../audit.js';
-
-const AUDIT_TYPE_DISABLED_DEFAULTS = {
-  [AUDIT_TYPE_BROKEN_BACKLINKS]: true,
-  [AUDIT_TYPE_EXPERIMENTATION_ESS_DAILY]: true,
-  [AUDIT_TYPE_EXPERIMENTATION_ESS_MONTHLY]: true,
-  [AUDIT_TYPE_ORGANIC_KEYWORDS]: true,
-  [AUDIT_TYPE_ORGANIC_TRAFFIC]: true,
-};
-
-function getAuditTypeConfigs(auditTypeConfigs, auditsDisabled) {
-  if (!auditTypeConfigs || Object.keys(auditTypeConfigs).length === 0) {
-    return {
-      [AUDIT_TYPE_BROKEN_BACKLINKS]: AuditConfigType({ disabled: true }),
-      [AUDIT_TYPE_EXPERIMENTATION_ESS_DAILY]: AuditConfigType({ disabled: true }),
-      [AUDIT_TYPE_EXPERIMENTATION_ESS_MONTHLY]: AuditConfigType({ disabled: true }),
-      [AUDIT_TYPE_ORGANIC_KEYWORDS]: AuditConfigType({ disabled: true }),
-      [AUDIT_TYPE_ORGANIC_TRAFFIC]: AuditConfigType({ disabled: true }),
-    };
-  }
-  return Object.entries(auditTypeConfigs || {}).reduce((acc, [key, value]) => {
-    const disabled = value.disabled !== undefined
-      ? value.disabled : (AUDIT_TYPE_DISABLED_DEFAULTS[key] || auditsDisabled || false);
-    acc[key] = AuditConfigType(
-      {
-        ...value,
-        disabled,
-      },
-    );
-    return acc;
-  }, {});
-}
-
-const AuditConfig = (data = {}) => {
-  const state = {
-    auditsDisabled: data.auditsDisabled || false,
-    auditTypeConfigs: getAuditTypeConfigs(data.auditTypeConfigs, data.auditsDisabled),
-  };
-
-  const self = {
-    auditsDisabled: () => state.auditsDisabled,
-    getAuditTypeConfigs: () => state.auditTypeConfigs,
-    getAuditTypeConfig: (type) => state.auditTypeConfigs[type],
-    updateAuditsDisabled: (newValue) => {
-      state.auditsDisabled = newValue;
-    },
-    updateAuditTypeConfig: (type, config) => {
-      state.auditTypeConfigs[type] = AuditConfigType(config);
-    },
-  };
-
-  return Object.freeze(self);
-};
-
-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;