@adobe/spacecat-shared-data-access 3.72.0 → 3.73.0

package/CHANGELOG.md

@@ -1,3 +1,15 @@
+## [@adobe/spacecat-shared-data-access-v3.73.0](https://github.com/adobe/spacecat-shared/compare/@adobe/spacecat-shared-data-access-v3.72.1...@adobe/spacecat-shared-data-access-v3.73.0) (2026-05-28)
+
+### Features
+
+* **data-access:** rename BrandSemrushProject accessors (LLMO-5190) ([#1635](https://github.com/adobe/spacecat-shared/issues/1635)) ([f97b09d](https://github.com/adobe/spacecat-shared/commit/f97b09df6f15323baa74ede7aa1f431ba7d68293))
+
+## [@adobe/spacecat-shared-data-access-v3.72.1](https://github.com/adobe/spacecat-shared/compare/@adobe/spacecat-shared-data-access-v3.72.0...@adobe/spacecat-shared-data-access-v3.72.1) (2026-05-28)
+
+### Bug Fixes
+
+* (data-access) include all fixes in getAllFixesWithSuggestionsByOpportunityId (SITES-45307) ([#1634](https://github.com/adobe/spacecat-shared/issues/1634)) ([49e073e](https://github.com/adobe/spacecat-shared/commit/49e073e9e79813597fb11a922fc9f561136ce1d8))
+
 ## [@adobe/spacecat-shared-data-access-v3.72.0](https://github.com/adobe/spacecat-shared/compare/@adobe/spacecat-shared-data-access-v3.71.2...@adobe/spacecat-shared-data-access-v3.72.0) (2026-05-27)
 
 ### Features

package/package.json

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

package/src/models/brand-semrush-project/brand-semrush-project.collection.js

@@ -22,17 +22,17 @@ class BrandSemrushProjectCollection extends BaseCollection {
   static COLLECTION_NAME = 'BrandSemrushProjectCollection';
 
   /**
-   * Find the single row for a (brand, semrushLocationId, language) slice, or
-   * null. Used by spacecat-api-service POST /v2/orgs/.../semrush/projects to
-   * 409 on a duplicate slice before calling Semrush.
+   * Find the single row for a (brand, geoTargetId, languageCode) slice, or
+   * null. Used by spacecat-api-service POST /v2/orgs/.../serenity/markets to
+   * 409 on a duplicate slice before calling the upstream.
    *
    * @param {string} brandId
-   * @param {number} semrushLocationId
-   * @param {string} language
+   * @param {number} geoTargetId Google Ads Geo Target ID.
+   * @param {string} languageCode BCP-47 primary subtag.
    * @returns {Promise<BrandSemrushProject|null>}
    */
-  async findBySlice(brandId, semrushLocationId, language) {
-    return this.findByIndexKeys({ brandId, semrushLocationId, language });
+  async findBySlice(brandId, geoTargetId, languageCode) {
+    return this.findByIndexKeys({ brandId, geoTargetId, languageCode });
   }
 }
 

package/src/models/brand-semrush-project/brand-semrush-project.model.js

@@ -13,10 +13,12 @@
 import BaseModel from '../base/base.model.js';
 
 /**
- * BrandSemrushProject - mapping between an Adobe brand and a Semrush AIO
- * project. One row per (brand, semrushLocationId, language) slice. The Semrush
- * workspace is reachable via brand -> organization.getSemrushWorkspaceId() and
- * is not duplicated on this entity.
+ * BrandSemrushProject - mapping between an Adobe brand and an upstream
+ * Semrush AIO project. One row per (brand, geoTargetId, languageCode) slice.
+ * The Semrush workspace is reachable via
+ * brand -> organization.getSemrushWorkspaceId() and is not duplicated on this
+ * entity. Entity + table names retain the `Semrush` prefix as internal
+ * storage identifiers; the public JS accessors do not.
  *
  * @class BrandSemrushProject
  * @extends BaseModel

package/src/models/brand-semrush-project/brand-semrush-project.schema.js

@@ -16,11 +16,16 @@ import SchemaBuilder from '../base/schema.builder.js';
 import BrandSemrushProject from './brand-semrush-project.model.js';
 import BrandSemrushProjectCollection from './brand-semrush-project.collection.js';
 
+// "upstream" in the comments below refers to Semrush AIO — the entity name,
+// table name, and `semrushProjectId` accessor stay because the value IS the
+// upstream identifier. The public API surface decouples via the LLMO-5190
+// rename plan (see the schema attributes' `postgrestField` overrides).
+
 // Mirrors the CHECK constraint on brand_to_semrush_projects.language
 // (db/migrations/20260528000000_brand_to_semrush_projects.sql). The slice
 // uniqueness gate is an exact DB string match, so inconsistent casing or
 // format between callers would silently bypass the 409 and bill a duplicate
-// Semrush project. Accepts BCP-47-shaped tags: 2/3-letter primary subtag
+// upstream project. Accepts BCP-47-shaped tags: 2/3-letter primary subtag
 // (`en`, `de`, `zho`) optionally followed by a 2-4-letter region/script
 // subtag (`de-ch`, `pt-br`, `zh-hant`). All lowercase by contract.
 const LANGUAGE_TAG_REGEX = /^[a-z]{2,3}(-[a-z]{2,4})?$/;
@@ -45,15 +50,23 @@ const schema = new SchemaBuilder(BrandSemrushProject, BrandSemrushProjectCollect
     required: true,
     validate: (value) => hasText(value),
   })
-  .addAttribute('semrushLocationId', {
+  // Google Ads Geo Target ID (criterion_id for the country). Semrush re-uses
+  // it as their location identifier; the value is owned by Google Ads, not
+  // Semrush. DB column stays `semrush_location_id` — the table layout is
+  // subject to change independently (see LLMO-5190 plan §Context).
+  .addAttribute('geoTargetId', {
     type: 'number',
     required: true,
     validate: (value) => Number.isInteger(value) && value > 0,
+    postgrestField: 'semrush_location_id',
   })
-  .addAttribute('language', {
+  // BCP-47 primary subtag (`en`, `de`, `fr`), optionally with a region/script
+  // subtag (`de-ch`, `pt-br`, `zh-hant`). DB column stays `language`.
+  .addAttribute('languageCode', {
     type: 'string',
     required: true,
     validate: (value) => hasText(value) && LANGUAGE_TAG_REGEX.test(value),
+    postgrestField: 'language',
   })
   .addAllIndex(['semrushProjectId']);
 

package/src/models/brand-semrush-project/index.d.ts

@@ -22,11 +22,11 @@ import type {
 export interface BrandSemrushProject extends BaseModel {
   getBrandId(): string;
   getSemrushProjectId(): string;
-  getSemrushLocationId(): number;
-  getLanguage(): string;
+  getGeoTargetId(): number;
+  getLanguageCode(): string;
   setSemrushProjectId(value: string): BrandSemrushProject;
-  setSemrushLocationId(value: number): BrandSemrushProject;
-  setLanguage(value: string): BrandSemrushProject;
+  setGeoTargetId(value: number): BrandSemrushProject;
+  setLanguageCode(value: string): BrandSemrushProject;
 }
 
 export interface BrandSemrushProjectCollection extends
@@ -37,7 +37,7 @@ export interface BrandSemrushProjectCollection extends
   findBySemrushProjectId(semrushProjectId: string): Promise<BrandSemrushProject | null>;
   findBySlice(
     brandId: string,
-    semrushLocationId: number,
-    language: string,
+    geoTargetId: number,
+    languageCode: string,
   ): Promise<BrandSemrushProject | null>;
 }

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

@@ -193,15 +193,15 @@ class FixEntityCollection extends BaseCollection {
 
   /**
    * 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.
+   * Fetches fix entities and mapping records in parallel, then batch-loads
+   * suggestions. Fixes without mapping records are included with
+   * suggestions: [].
    *
    * @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
+   *   - suggestions: Array of associated Suggestion models (empty if none mapped)
    * @throws {DataAccessError} - Throws an error if the query fails.
    * @throws {ValidationError} - Throws an error if opportunityId is not provided.
    */
@@ -211,10 +211,12 @@ class FixEntityCollection extends BaseCollection {
     try {
       const fixEntitySuggestionCollection = this.entityRegistry.getCollection('FixEntitySuggestionCollection');
 
-      const fixEntitySuggestions = await fixEntitySuggestionCollection
-        .allByIndexKeys({ opportunityId });
+      const [allFixEntities, fixEntitySuggestions] = await Promise.all([
+        this.allByOpportunityId(opportunityId),
+        fixEntitySuggestionCollection.allByIndexKeys({ opportunityId }),
+      ]);
 
-      return this.#buildFixesWithSuggestions(fixEntitySuggestions);
+      return this.#buildAllFixesWithSuggestions(allFixEntities, fixEntitySuggestions);
     } catch (error) {
       if (error instanceof DataAccessError) {
         throw error;
@@ -276,6 +278,44 @@ class FixEntityCollection extends BaseCollection {
 
     return result;
   }
+
+  async #buildAllFixesWithSuggestions(allFixEntities, fixEntitySuggestions) {
+    if (allFixEntities.length === 0) {
+      return [];
+    }
+
+    const suggestionIdsByFixEntityId = {};
+    for (const junction of fixEntitySuggestions) {
+      const fixEntityId = junction.getFixEntityId();
+      const suggestionId = junction.getSuggestionId();
+      if (!suggestionIdsByFixEntityId[fixEntityId]) {
+        suggestionIdsByFixEntityId[fixEntityId] = [];
+      }
+      suggestionIdsByFixEntityId[fixEntityId].push(suggestionId);
+    }
+
+    const allSuggestionIds = Object.values(suggestionIdsByFixEntityId).flat();
+    const suggestionsById = {};
+
+    if (allSuggestionIds.length > 0) {
+      const suggestionCollection = this.entityRegistry.getCollection('SuggestionCollection');
+      const suggestions = await suggestionCollection.batchGetByKeys(
+        allSuggestionIds.map((id) => ({ [suggestionCollection.idName]: id })),
+      );
+      for (const suggestion of suggestions.data) {
+        suggestionsById[suggestion.getId()] = suggestion;
+      }
+    }
+
+    return allFixEntities.map((fixEntity) => {
+      const fixEntityId = fixEntity.getId();
+      const suggestionIds = suggestionIdsByFixEntityId[fixEntityId] || [];
+      const suggestions = suggestionIds
+        .map((id) => suggestionsById[id])
+        .filter(Boolean);
+      return { fixEntity, suggestions };
+    });
+  }
 }
 
 export default FixEntityCollection;