@adobe/spacecat-shared-data-access 1.61.17 → 1.61.19

package/CHANGELOG.md

@@ -1,3 +1,17 @@
+# [@adobe/spacecat-shared-data-access-v1.61.19](https://github.com/adobe/spacecat-shared/compare/@adobe/spacecat-shared-data-access-v1.61.18...@adobe/spacecat-shared-data-access-v1.61.19) (2025-01-10)
+
+
+### Bug Fixes
+
+* dependent remove errors, more tests ([#532](https://github.com/adobe/spacecat-shared/issues/532)) ([cdec563](https://github.com/adobe/spacecat-shared/commit/cdec563c881d088feeb5ed24514f528173eec59d))
+
+# [@adobe/spacecat-shared-data-access-v1.61.18](https://github.com/adobe/spacecat-shared/compare/@adobe/spacecat-shared-data-access-v1.61.17...@adobe/spacecat-shared-data-access-v1.61.18) (2025-01-08)
+
+
+### Bug Fixes
+
+* import top pages ([c68b563](https://github.com/adobe/spacecat-shared/commit/c68b563e45b3af5810a569ab52f317751b2df847))
+
 # [@adobe/spacecat-shared-data-access-v1.61.17](https://github.com/adobe/spacecat-shared/compare/@adobe/spacecat-shared-data-access-v1.61.16...@adobe/spacecat-shared-data-access-v1.61.17) (2025-01-07)
 
 

package/package.json

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

package/src/v2/models/base/base.model.js

@@ -252,14 +252,27 @@ class BaseModel {
   async _remove() {
     try {
       const dependents = await this.#fetchDependents();
-      // eslint-disable-next-line no-underscore-dangle
-      const removePromises = dependents.map((dependent) => dependent._remove());
-      removePromises.push(this.entity.remove({ [this.idName]: this.getId() }).go());
+
+      const removePromises = dependents.map(async (dependent) => {
+        try {
+          // eslint-disable-next-line no-underscore-dangle
+          await dependent._remove();
+        } catch (e) {
+          this.log.error(`Failed to remove dependent entity ${dependent.entityName} with ID ${dependent.getId()}`, e);
+          throw new DataAccessError(
+            `Failed to remove dependent entity ${dependent.entityName} with ID ${dependent.getId()}`,
+            dependent,
+            e,
+          );
+        }
+      });
 
       this.log.info(`Removing entity ${this.entityName} with ID ${this.getId()} and ${dependents.length} dependents`);
 
       await Promise.all(removePromises);
 
+      await this.entity.remove({ [this.idName]: this.getId() }).go();
+
       this.#invalidateCache();
 
       return this;

package/src/v2/models/site-top-page/site-top-page.collection.js

@@ -10,7 +10,7 @@
  * governing permissions and limitations under the License.
  */
 
-import { hasText } from '@adobe/spacecat-shared-utils';
+import { hasText, isNonEmptyArray } from '@adobe/spacecat-shared-utils';
 
 import BaseCollection from '../base/base.collection.js';
 
@@ -37,7 +37,9 @@ class SiteTopPageCollection extends BaseCollection {
 
     const topPageIdsToRemove = topPagesToRemove.map((topPage) => topPage.getId());
 
-    await this.removeByIds(topPageIdsToRemove);
+    if (isNonEmptyArray(topPageIdsToRemove)) {
+      await this.removeByIds(topPageIdsToRemove);
+    }
   }
 }