@adobe/spacecat-shared-data-access 1.10.1 → 1.10.3

package/CHANGELOG.md

@@ -1,3 +1,17 @@
+# [@adobe/spacecat-shared-data-access-v1.10.3](https://github.com/adobe/spacecat-shared/compare/@adobe/spacecat-shared-data-access-v1.10.2...@adobe/spacecat-shared-data-access-v1.10.3) (2024-01-24)
+
+
+### Bug Fixes
+
+* organizations query ([37b4b14](https://github.com/adobe/spacecat-shared/commit/37b4b1439e6f2b6ab7c87b1abcfcefb9b2c8a394))
+
+# [@adobe/spacecat-shared-data-access-v1.10.2](https://github.com/adobe/spacecat-shared/compare/@adobe/spacecat-shared-data-access-v1.10.1...@adobe/spacecat-shared-data-access-v1.10.2) (2024-01-24)
+
+
+### Bug Fixes
+
+* add missing org data layer methods ([#107](https://github.com/adobe/spacecat-shared/issues/107)) ([0504d8e](https://github.com/adobe/spacecat-shared/commit/0504d8e8f0486d1f1a00f44a18c42948ddfd93c7))
+
 # [@adobe/spacecat-shared-data-access-v1.10.1](https://github.com/adobe/spacecat-shared/compare/@adobe/spacecat-shared-data-access-v1.10.0...@adobe/spacecat-shared-data-access-v1.10.1) (2024-01-23)
 
 

package/package.json

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

package/src/index.d.ts

@@ -336,6 +336,9 @@ export interface DataAccess {
   removeSite: (
     siteId: string,
   ) => Promise<void>;
+  removeSitesForOrganization: (
+    organizationId: string,
+  ) => Promise<void>;
   getOrganizations:
       () => Promise<Organization[]>;
   getOrganizationByID: (
@@ -347,7 +350,7 @@ export interface DataAccess {
   updateOrganization: (
       organization: Organization,
   ) => Promise<Organization>;
-  removeRemoveOrganization: (
+  removeOrganization: (
       organizationId: string,
   ) => Promise<void>;
 }

package/src/index.js

@@ -50,7 +50,7 @@ export default function dataAccessWrapper(fn) {
         tableNameOrganizations: DYNAMO_TABLE_NAME_ORGANIZATIONS,
         tableNameSites: DYNAMO_TABLE_NAME_SITES,
         indexNameAllSites: DYNAMO_INDEX_NAME_ALL_SITES,
-        indexNameOrganizations: DYNAMO_INDEX_NAME_ALL_ORGANIZATIONS,
+        indexNameAllOrganizations: DYNAMO_INDEX_NAME_ALL_ORGANIZATIONS,
         indexNameAllSitesByDeliveryType: DYNAMO_INDEX_NAME_ALL_SITES_BY_DELIVERY_TYPE,
         indexNameAllLatestAuditScores: DYNAMO_INDEX_NAME_ALL_LATEST_AUDIT_SCORES,
         indexNameAllSitesOrganizations: DYNAMO_INDEX_NAME_ALL_SITES_ORGANIZATIONS,

package/src/service/organizations/accessPatterns.js

@@ -14,6 +14,7 @@ import { isObject } from '@adobe/spacecat-shared-utils';
 
 import { createOrganization } from '../../models/organization.js';
 import { OrganizationDto } from '../../dto/organization.js';
+import { removeSitesForOrganization } from '../sites/accessPatterns.js';
 
 /**
  * Retrieves all organizations.
@@ -123,6 +124,8 @@ export const removeOrganization = async (
   organizationId,
 ) => {
   try {
+    await removeSitesForOrganization(dynamoClient, config, log, organizationId);
+
     await dynamoClient.removeItem(config.tableNameOrganizations, { id: organizationId });
   } catch (error) {
     log.error(`Error removing organization: ${error.message}`);

package/src/service/sites/accessPatterns.js

@@ -15,7 +15,8 @@ import { isObject } from '@adobe/spacecat-shared-utils';
 import {
   getAuditsForSite,
   getLatestAuditForSite,
-  getLatestAudits, removeAuditsForSite,
+  getLatestAudits,
+  removeAuditsForSite,
 } from '../audits/accessPatterns.js';
 
 import { createSite } from '../../models/site.js';
@@ -369,3 +370,49 @@ export const removeSite = async (
     throw error;
   }
 };
+
+/**
+ * Removes all given sites.
+ * @param {DynamoDbClient} dynamoClient - The DynamoDB client.
+ * @param {DataAccessConfig} config - The data access config.
+ * @param {Array<Site>} sites - The sites to remove.
+ * @return {Promise<void>} A promise that resolves when all sites have been removed.
+ */
+async function removeSites(
+  dynamoClient,
+  config,
+  sites,
+) {
+  const tableName = config.tableNameSites;
+  // TODO: use batch-remove (needs dynamo client update)
+  const removeSitePromises = sites.map((site) => dynamoClient.removeItem(
+    tableName,
+    { id: site.getId() },
+  ));
+
+  await Promise.all(removeSitePromises);
+}
+
+/**
+ * Removes all sites for an organization.
+ * @param {DynamoDbClient} dynamoClient - The DynamoDB client.
+ * @param {DataAccessConfig} config - The data access config.
+ * @param {Logger} log - The logger.
+ * @param {string} organizationId - The ID of the organization to remove the sites for.
+ * @return {Promise<void>} A promise that resolves when all sites for the organization have been
+ * removed.
+ */
+export const removeSitesForOrganization = async (
+  dynamoClient,
+  config,
+  log,
+  organizationId,
+) => {
+  try {
+    const sites = await getSitesByOrganizationID(dynamoClient, config, organizationId);
+    await removeSites(dynamoClient, config, sites);
+  } catch (error) {
+    log.error(`Error removing sites for organization ${organizationId}: ${error.message}`);
+    throw error;
+  }
+};

package/src/service/sites/index.js

@@ -17,9 +17,13 @@ import {
   getSiteByBaseURLWithAudits,
   getSiteByBaseURLWithLatestAudit,
   getSiteByID,
-  getSites, getSitesByDeliveryType, getSitesByOrganizationID,
+  getSites,
+  getSitesByDeliveryType,
+  getSitesByOrganizationID,
   getSitesToAudit,
-  getSitesWithLatestAudit, removeSite,
+  getSitesWithLatestAudit,
+  removeSite,
+  removeSitesForOrganization,
   updateSite,
 } from './accessPatterns.js';
 
@@ -91,4 +95,10 @@ export const siteFunctions = (dynamoClient, config, log) => ({
   addSite: (siteData) => addSite(dynamoClient, config, log, siteData),
   updateSite: (site) => updateSite(dynamoClient, config, log, site),
   removeSite: (siteId) => removeSite(dynamoClient, config, log, siteId),
+  removeSitesForOrganization: (organizationId) => removeSitesForOrganization(
+    dynamoClient,
+    config,
+    log,
+    organizationId,
+  ),
 });