@adobe/spacecat-shared-data-access 2.6.0 → 2.7.1

package/CHANGELOG.md

@@ -1,3 +1,17 @@
+# [@adobe/spacecat-shared-data-access-v2.7.1](https://github.com/adobe/spacecat-shared/compare/@adobe/spacecat-shared-data-access-v2.7.0...@adobe/spacecat-shared-data-access-v2.7.1) (2025-02-19)
+
+
+### Bug Fixes
+
+* get queue url ([#612](https://github.com/adobe/spacecat-shared/issues/612)) ([232af0a](https://github.com/adobe/spacecat-shared/commit/232af0af829289214826275f81504ce6bdae5467))
+
+# [@adobe/spacecat-shared-data-access-v2.7.0](https://github.com/adobe/spacecat-shared/compare/@adobe/spacecat-shared-data-access-v2.6.0...@adobe/spacecat-shared-data-access-v2.7.0) (2025-02-18)
+
+
+### Features
+
+* Implement dependency check for handlers ([#608](https://github.com/adobe/spacecat-shared/issues/608)) ([0ada515](https://github.com/adobe/spacecat-shared/commit/0ada5157a3cf50bf67129e296e719a14ee2c451c)), closes [/github.com/adobe/spacecat-shared/blob/main/packages/spacecat-shared-data-access/src/models/configuration/configuration.schema.js#L35-L39](https://github.com//github.com/adobe/spacecat-shared/blob/main/packages/spacecat-shared-data-access/src/models/configuration/configuration.schema.js/issues/L35-L39)
+
 # [@adobe/spacecat-shared-data-access-v2.6.0](https://github.com/adobe/spacecat-shared/compare/@adobe/spacecat-shared-data-access-v2.5.0...@adobe/spacecat-shared-data-access-v2.6.0) (2025-02-18)
 
 

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@adobe/spacecat-shared-data-access",
-  "version": "2.6.0",
+  "version": "2.7.1",
   "description": "Shared modules of the Spacecat Services - Data Access",
   "type": "module",
   "engines": {

package/src/models/audit/audit.model.js

@@ -71,13 +71,19 @@ class Audit extends BaseModel {
    * The configurations for the audit step destinations. Used with AuditBuilder to configure
    * the destination queue URL and payload formatting.
    * @type {{
-   *   [Audit.AUDIT_STEP_DESTINATIONS.CONTENT_SCRAPER]: {queueUrl: string, formatPayload: function},
-   *   [Audit.AUDIT_STEP_DESTINATIONS.IMPORT_WORKER]: {queueUrl: string, formatPayload: function}
+   *   [Audit.AUDIT_STEP_DESTINATIONS.CONTENT_SCRAPER]: {
+   *     getQueueUrl: function,
+   *     formatPayload: function
+   *   },
+   *   [Audit.AUDIT_STEP_DESTINATIONS.IMPORT_WORKER]: {
+   *     getQueueUrl: function,
+   *     formatPayload: function
+   *   }
    * }}
    */
   static AUDIT_STEP_DESTINATION_CONFIGS = {
     [Audit.AUDIT_STEP_DESTINATIONS.IMPORT_WORKER]: {
-      queueUrl: process.env.IMPORT_WORKER_QUEUE_URL,
+      getQueueUrl: (context) => context.env?.IMPORT_WORKER_QUEUE_URL,
       /**
        * Formats the payload for the import worker queue.
        * @param {object} stepResult - The result of the audit step.
@@ -100,7 +106,7 @@ class Audit extends BaseModel {
       }),
     },
     [Audit.AUDIT_STEP_DESTINATIONS.CONTENT_SCRAPER]: {
-      queueUrl: process.env.CONTENT_SCRAPER_QUEUE_URL,
+      getQueueUrl: (context) => context.env?.CONTENT_SCRAPER_QUEUE_URL,
       /**
        * Formats the payload for the content scraper queue.
        * @param {object} stepResult - The result of the audit step.

package/src/models/configuration/configuration.model.js

@@ -10,7 +10,7 @@
  * governing permissions and limitations under the License.
  */
 
-import { isNonEmptyObject } from '@adobe/spacecat-shared-utils';
+import { isNonEmptyObject, isNonEmptyArray } from '@adobe/spacecat-shared-utils';
 
 import { sanitizeIdAndAuditFields } from '../../util/util.js';
 import BaseModel from '../base/base.model.js';
@@ -146,12 +146,58 @@ class Configuration extends BaseModel {
     const siteId = site.getId();
     if (this.isHandlerEnabledForSite(type, site)) return;
 
+    const deps = this.isHandlerDependencyMetForSite(type, site);
+    if (deps !== true) {
+      throw new Error(`Cannot enable handler ${type} for site ${siteId} because of missing dependencies: ${deps}`);
+    }
+
     this.updateHandlerSites(type, siteId, true);
   }
 
+  /**
+   * Check if all dependencies for a handler of given type are met for the given org.
+   *
+   * @param {string} type handler type
+   * @param {object} org org object
+   * @returns true if all dependencies are met, array with missing dependencies otherwise
+   */
+  isHandlerDependencyMetForOrg(type, org) {
+    const handler = this.getHandler(type);
+
+    if (!handler || !isNonEmptyArray(handler?.dependencies)) return true;
+
+    const unmetDependencies = handler.dependencies
+      .filter(({ handler: depHandler }) => !this.isHandlerEnabledForOrg(depHandler, org))
+      .map(({ handler: depHandler }) => depHandler);
+
+    return isNonEmptyArray(unmetDependencies) ? unmetDependencies : true;
+  }
+
+  /**
+   * Check if all dependencies for a handler of given type are met for the given site.
+   *
+   * @param {string} type handler type
+   * @param {object} site site object
+   * @returns true if all dependencies are met, array with missing dependencies otherwise
+   */
+  isHandlerDependencyMetForSite(type, site) {
+    const handler = this.getHandler(type);
+    if (!handler || !isNonEmptyArray(handler?.dependencies)) return true;
+
+    const unmetDependencies = handler.dependencies
+      .filter(({ handler: depHandler }) => !this.isHandlerEnabledForSite(depHandler, site))
+      .map(({ handler: depHandler }) => depHandler);
+
+    return isNonEmptyArray(unmetDependencies) ? unmetDependencies : true;
+  }
+
   enableHandlerForOrg(type, org) {
     const orgId = org.getId();
     if (this.isHandlerEnabledForOrg(type, org)) return;
+    const deps = this.isHandlerDependencyMetForOrg(type, org);
+    if (deps !== true) {
+      throw new Error(`Cannot enable handler ${type} for org ${orgId} because of missing dependencies: ${deps}`);
+    }
 
     this.updateHandlerOrgs(type, orgId, true);
   }