@adobe/spacecat-shared-data-access 3.71.1 → 3.71.2

package/CHANGELOG.md

@@ -1,3 +1,9 @@
+## [@adobe/spacecat-shared-data-access-v3.71.2](https://github.com/adobe/spacecat-shared/compare/@adobe/spacecat-shared-data-access-v3.71.1...@adobe/spacecat-shared-data-access-v3.71.2) (2026-05-26)
+
+### Bug Fixes
+
+*  (data-access) batch getAllFixesWithSuggestionsByOpportunityId (SITES-45307) ([#1619](https://github.com/adobe/spacecat-shared/issues/1619)) ([608f4cd](https://github.com/adobe/spacecat-shared/commit/608f4cda59af41c701426b8b53c29770efd42a1c))
+
 ## [@adobe/spacecat-shared-data-access-v3.71.1](https://github.com/adobe/spacecat-shared/compare/@adobe/spacecat-shared-data-access-v3.71.0...@adobe/spacecat-shared-data-access-v3.71.1) (2026-05-25)
 
 ### Bug Fixes

package/package.json

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

package/src/models/fix-entity/fix-entity.collection.js

@@ -177,69 +177,104 @@ class FixEntityCollection extends BaseCollection {
 
     try {
       const fixEntitySuggestionCollection = this.entityRegistry.getCollection('FixEntitySuggestionCollection');
-      const suggestionCollection = this.entityRegistry.getCollection('SuggestionCollection');
 
-      // Query fix entity suggestions by opportunity ID and created date
       const fixEntitySuggestions = await fixEntitySuggestionCollection
         .allByOpportunityIdAndFixEntityCreatedDate(opportunityId, fixEntityCreatedDate);
 
-      if (fixEntitySuggestions.length === 0) {
-        return [];
+      return this.#buildFixesWithSuggestions(fixEntitySuggestions);
+    } catch (error) {
+      if (error instanceof DataAccessError) {
+        throw error;
       }
+      this.log.error('Failed to get all fixes with suggestions by created date', error);
+      throw new DataAccessError('Failed to get all fixes with suggestions by created date', this, error);
+    }
+  }
 
-      // Group suggestions by fix entity ID
-      const suggestionsByFixEntityId = {};
-      const fixEntityIds = new Set();
+  /**
+   * Gets all fixes with their suggestions for a specific opportunity.
+   * Fetches all junction records for the opportunity, then batch-loads
+   * fix entities and suggestions. Actual PostgREST call count is
+   * 1 + ceil(N/50) + ceil(M/50) due to batchGetByKeys chunking.
+   *
+   * @async
+   * @param {string} opportunityId - The ID of the opportunity.
+   * @returns {Promise<Array>} - A promise that resolves to an array of objects containing:
+   *   - fixEntity: The FixEntity model
+   *   - suggestions: Array of associated Suggestion models
+   * @throws {DataAccessError} - Throws an error if the query fails.
+   * @throws {ValidationError} - Throws an error if opportunityId is not provided.
+   */
+  async getAllFixesWithSuggestionsByOpportunityId(opportunityId) {
+    guardId('opportunityId', opportunityId, 'FixEntityCollection');
 
-      for (const fixEntitySuggestion of fixEntitySuggestions) {
-        const fixEntityId = fixEntitySuggestion.getFixEntityId();
-        const suggestionId = fixEntitySuggestion.getSuggestionId();
+    try {
+      const fixEntitySuggestionCollection = this.entityRegistry.getCollection('FixEntitySuggestionCollection');
 
-        fixEntityIds.add(fixEntityId);
+      const fixEntitySuggestions = await fixEntitySuggestionCollection
+        .allByIndexKeys({ opportunityId });
 
-        if (!suggestionsByFixEntityId[fixEntityId]) {
-          suggestionsByFixEntityId[fixEntityId] = [];
-        }
-        suggestionsByFixEntityId[fixEntityId].push(suggestionId);
+      return this.#buildFixesWithSuggestions(fixEntitySuggestions);
+    } catch (error) {
+      if (error instanceof DataAccessError) {
+        throw error;
       }
+      this.log.error('Failed to get all fixes with suggestions by opportunity ID', error);
+      throw new DataAccessError('Failed to get all fixes with suggestions by opportunity ID', this, error);
+    }
+  }
 
-      // Get all fix entities
-      const fixEntities = await this.batchGetByKeys(
-        Array.from(fixEntityIds).map((id) => ({ [this.idName]: id })),
-      );
-
-      // Get all suggestions
-      const allSuggestionIds = Object.values(suggestionsByFixEntityId).flat();
-      const suggestions = await suggestionCollection.batchGetByKeys(
-        allSuggestionIds.map((id) => ({ [suggestionCollection.idName]: id })),
-      );
-
-      // Create a map of suggestions by ID for quick lookup
-      const suggestionsById = {};
-      for (const suggestion of suggestions.data) {
-        suggestionsById[suggestion.getId()] = suggestion;
-      }
+  async #buildFixesWithSuggestions(fixEntitySuggestions) {
+    if (fixEntitySuggestions.length === 0) {
+      return [];
+    }
+
+    const suggestionCollection = this.entityRegistry.getCollection('SuggestionCollection');
+
+    const suggestionsByFixEntityId = {};
+    const fixEntityIds = new Set();
+
+    for (const fixEntitySuggestion of fixEntitySuggestions) {
+      const fixEntityId = fixEntitySuggestion.getFixEntityId();
+      const suggestionId = fixEntitySuggestion.getSuggestionId();
+
+      fixEntityIds.add(fixEntityId);
 
-      // Combine fix entities with their suggestions
-      const result = [];
-      for (const fixEntity of fixEntities.data) {
-        const fixEntityId = fixEntity.getId();
-        const suggestionIds = suggestionsByFixEntityId[fixEntityId] || [];
-        const suggestionsForFixEntity = suggestionIds
-          .map((id) => suggestionsById[id])
-          .filter(Boolean);
-
-        result.push({
-          fixEntity,
-          suggestions: suggestionsForFixEntity,
-        });
+      if (!suggestionsByFixEntityId[fixEntityId]) {
+        suggestionsByFixEntityId[fixEntityId] = [];
       }
+      suggestionsByFixEntityId[fixEntityId].push(suggestionId);
+    }
 
-      return result;
-    } catch (error) {
-      this.log.error('Failed to get all fixes with suggestions by created date', error);
-      throw new DataAccessError('Failed to get all fixes with suggestions by created date', this, error);
+    const fixEntities = await this.batchGetByKeys(
+      Array.from(fixEntityIds).map((id) => ({ [this.idName]: id })),
+    );
+
+    const allSuggestionIds = Object.values(suggestionsByFixEntityId).flat();
+    const suggestions = await suggestionCollection.batchGetByKeys(
+      allSuggestionIds.map((id) => ({ [suggestionCollection.idName]: id })),
+    );
+
+    const suggestionsById = {};
+    for (const suggestion of suggestions.data) {
+      suggestionsById[suggestion.getId()] = suggestion;
+    }
+
+    const result = [];
+    for (const fixEntity of fixEntities.data) {
+      const fixEntityId = fixEntity.getId();
+      const suggestionIds = suggestionsByFixEntityId[fixEntityId] || [];
+      const suggestionsForFixEntity = suggestionIds
+        .map((id) => suggestionsById[id])
+        .filter(Boolean);
+
+      result.push({
+        fixEntity,
+        suggestions: suggestionsForFixEntity,
+      });
     }
+
+    return result;
   }
 }
 

package/src/models/fix-entity/index.d.ts

@@ -40,4 +40,6 @@ export interface FixEntityCollection extends BaseCollection<FixEntity> {
   findByOpportunityIdAndStatus(opportunityId: string, status: string): Promise<FixEntity | null>;
   getSuggestionsByFixEntityId(fixEntityId: string): Promise<{data: Array<Suggestion>, unprocessed: Array<string>}>;
   setSuggestionsForFixEntity(opportunityId: string, fixEntity: FixEntity, suggestions: Array<Suggestion>): Promise<{createdItems: Array<FixEntitySuggestion>, errorItems: Array<FixEntitySuggestion>, removedCount: number}>;
+  getAllFixesWithSuggestionByCreatedAt(opportunityId: string, fixEntityCreatedDate: string): Promise<Array<{fixEntity: FixEntity, suggestions: Array<Suggestion>}>>;
+  getAllFixesWithSuggestionsByOpportunityId(opportunityId: string): Promise<Array<{fixEntity: FixEntity, suggestions: Array<Suggestion>}>>;
 }