Merge branch 'main' into 40623-v2

sandsinh · sandsinh · commit ad6c8f744c3d · 2026-03-26T11:17:15.000+05:30
diff --git a/docs/specs/cwv-trends-audit/spec.md b/docs/specs/cwv-trends-audit/spec.md
@@ -0,0 +1,39 @@
+# CWV Trends Audit — spacecat-shared Changes
+
+## Overview
+
+Adds the `CWV_TRENDS_AUDIT` audit type to `Audit.AUDIT_TYPES` in the `spacecat-shared-data-access` package, enabling the new CWV Trends Audit feature across the SpaceCat ecosystem.
+
+## Change
+
+**File:** `packages/spacecat-shared-data-access/src/models/audit/audit.model.js`
+
+```javascript
+static AUDIT_TYPES = {
+  // ... existing types ...
+  CWV_TRENDS_AUDIT: 'cwv-trends-audit',
+};
+```
+
+## Context
+
+The CWV Trends Audit is a weekly audit (`every-sunday`) that:
+
+- Reads 28 days of pre-imported CWV data from S3 (`metrics/cwv-trends/cwv-trends-daily-{date}.json`)
+- Classifies URLs as Good / Needs Improvement / Poor using standard CWV thresholds
+- Determines device type (mobile/desktop) from site handler configuration
+- Creates/updates device-specific opportunities: "Mobile Web Performance Trends Report" or "Desktop Web Performance Trends Report"
+- Syncs per-URL suggestions with `CONTENT_UPDATE` type
+
+## Dependent Repositories
+
+| Repository | Dependency | Action Required |
+|---|---|---|
+| `spacecat-audit-worker` | `@adobe/spacecat-shared-data-access` | Bump version after this package is published |
+| `spacecat-api-service` | `@adobe/spacecat-shared-data-access` | Bump version to recognize the new audit type |
+
+## Deployment Order
+
+1. Merge this PR → semantic-release publishes new `@adobe/spacecat-shared-data-access`
+2. Bump dependency in `spacecat-audit-worker` and `spacecat-api-service`
+3. Register audit: `registerAudit('cwv-trends-audit', false, 'every-sunday', [productCodes])`
diff --git a/packages/spacecat-shared-data-access/CHANGELOG.md b/packages/spacecat-shared-data-access/CHANGELOG.md
@@ -1,3 +1,15 @@
+## [@adobe/spacecat-shared-data-access-v3.31.0](https://github.com/adobe/spacecat-shared/compare/@adobe/spacecat-shared-data-access-v3.30.0...@adobe/spacecat-shared-data-access-v3.31.0) (2026-03-25)
+
+### Features
+
+* Added cwv-trends-audit import type ([#1434](https://github.com/adobe/spacecat-shared/issues/1434)) ([eab9653](https://github.com/adobe/spacecat-shared/commit/eab9653a367208f0cf9691fbf186ffabb9307fea))
+
+## [@adobe/spacecat-shared-data-access-v3.30.0](https://github.com/adobe/spacecat-shared/compare/@adobe/spacecat-shared-data-access-v3.29.0...@adobe/spacecat-shared-data-access-v3.30.0) (2026-03-25)
+
+### Features
+
+* **data-access:** add allByEnrollmentProductCode to SiteCollection ([#1455](https://github.com/adobe/spacecat-shared/issues/1455)) ([0225791](https://github.com/adobe/spacecat-shared/commit/02257915bbf5aa2e15e1320bbcdfa27b236c44b8))
+
 ## [@adobe/spacecat-shared-data-access-v3.29.0](https://github.com/adobe/spacecat-shared/compare/@adobe/spacecat-shared-data-access-v3.28.0...@adobe/spacecat-shared-data-access-v3.29.0) (2026-03-23)
 
 ### Features
diff --git a/packages/spacecat-shared-data-access/package.json b/packages/spacecat-shared-data-access/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@adobe/spacecat-shared-data-access",
-  "version": "3.29.0",
+  "version": "3.31.0",
   "description": "Shared modules of the Spacecat Services - Data Access",
   "type": "module",
   "engines": {
diff --git a/packages/spacecat-shared-data-access/src/models/audit/audit.model.js b/packages/spacecat-shared-data-access/src/models/audit/audit.model.js
@@ -91,6 +91,7 @@ class Audit extends BaseModel {
     COMMERCE_PRODUCT_ENRICHMENTS_YEARLY: 'commerce-product-enrichments-yearly',
     COMMERCE_PRODUCT_PAGE_ENRICHMENT: 'commerce-product-page-enrichment',
     COMMERCE_PRODUCT_CATALOG_ENRICHMENT: 'commerce-product-catalog-enrichment',
+    CWV_TRENDS_AUDIT: 'cwv-trends-audit',
     OFFSITE_BRAND_PRESENCE: 'offsite-brand-presence',
   };
 
diff --git a/packages/spacecat-shared-data-access/src/models/site-enrollment/site-enrollment.collection.js b/packages/spacecat-shared-data-access/src/models/site-enrollment/site-enrollment.collection.js
@@ -11,6 +11,7 @@
  */
 
 import BaseCollection from '../base/base.collection.js';
+import DataAccessError from '../../errors/data-access.error.js';
 
 /**
  * SiteEnrollmentCollection - A class representing a collection of SiteEnrollment entities.
@@ -22,6 +23,30 @@ import BaseCollection from '../base/base.collection.js';
 class SiteEnrollmentCollection extends BaseCollection {
   static COLLECTION_NAME = 'SiteEnrollmentCollection';
 
+  /**
+   * Returns all site IDs enrolled in a given product code in a single JOIN query.
+   *
+   * @param {string} productCode - Product code to filter by (e.g. 'LLMO').
+   * @returns {Promise<string[]>} Array of siteId strings.
+   */
+  async allSiteIdsByProductCode(productCode) {
+    if (!productCode) {
+      throw new DataAccessError('productCode is required', { entityName: 'SiteEnrollment', tableName: 'site_enrollments' });
+    }
+
+    const { data, error } = await this.postgrestService
+      .from(this.tableName)
+      .select('site_id, entitlements!inner(product_code)')
+      .eq('entitlements.product_code', productCode);
+
+    if (error) {
+      this.log.error(`[SiteEnrollmentCollection] Failed to query site_enrollments by productCode - ${error.message}`, error);
+      throw new DataAccessError('Failed to query site_enrollments by productCode', { entityName: 'SiteEnrollment', tableName: 'site_enrollments' }, error);
+    }
+
+    return (data || []).map((row) => row.site_id);
+  }
+
   async create(item, options = {}) {
     if (item?.siteId && item?.entitlementId) {
       const existing = await this.findByIndexKeys({
diff --git a/packages/spacecat-shared-data-access/src/models/site/site.collection.js b/packages/spacecat-shared-data-access/src/models/site/site.collection.js
@@ -145,6 +145,35 @@ class SiteCollection extends BaseCollection {
     return this.allByProjectId(projectId);
   }
 
+  /**
+   * Returns all sites enrolled in a given product (e.g. 'LLMO', 'ASO').
+   * Uses entityRegistry to chain through EntitlementCollection and SiteEnrollmentCollection,
+   * then batch-fetches full Site objects.
+   *
+   * @param {string} productCode - Product code to filter by (e.g. 'LLMO').
+   * @returns {Promise<Site[]>}
+   */
+  async allByEnrollmentProductCode(productCode, options = {}) {
+    if (!hasText(productCode)) {
+      throw new DataAccessError('productCode is required', this);
+    }
+
+    const siteEnrollmentCollection = this.entityRegistry.getCollection('SiteEnrollmentCollection');
+
+    // Query 1: get all site IDs enrolled in the given product (single JOIN query)
+    const siteIds = await siteEnrollmentCollection.allSiteIdsByProductCode(productCode);
+    if (siteIds.length === 0) {
+      return [];
+    }
+
+    // Query 2: batch-fetch Site objects (caller controls which fields to fetch)
+    const { data: sites } = await this.batchGetByKeys(
+      siteIds.map((siteId) => ({ siteId })),
+      options,
+    );
+    return sites;
+  }
+
   async allByOrganizationIdAndProjectName(organizationId, projectName) {
     if (!hasText(organizationId)) {
       throw new DataAccessError('organizationId is required', this);
diff --git a/packages/spacecat-shared-data-access/test/unit/models/audit/audit.model.test.js b/packages/spacecat-shared-data-access/test/unit/models/audit/audit.model.test.js
@@ -218,6 +218,7 @@ describe('AuditModel', () => {
       COMMERCE_PRODUCT_ENRICHMENTS_YEARLY: 'commerce-product-enrichments-yearly',
       COMMERCE_PRODUCT_PAGE_ENRICHMENT: 'commerce-product-page-enrichment',
       COMMERCE_PRODUCT_CATALOG_ENRICHMENT: 'commerce-product-catalog-enrichment',
+      CWV_TRENDS_AUDIT: 'cwv-trends-audit',
       OFFSITE_BRAND_PRESENCE: 'offsite-brand-presence',
     };
 
diff --git a/packages/spacecat-shared-data-access/test/unit/models/site-enrollment/site-enrollment.collection.test.js b/packages/spacecat-shared-data-access/test/unit/models/site-enrollment/site-enrollment.collection.test.js
@@ -95,4 +95,73 @@ describe('SiteEnrollmentCollection', () => {
       expect(superCreateStub).to.have.been.calledOnceWithExactly(mockRecord, { upsert: true });
     });
   });
+
+  describe('allSiteIdsByProductCode', () => {
+    let fromStub;
+    let selectStub;
+    let eqStub;
+
+    beforeEach(() => {
+      eqStub = sinon.stub();
+      selectStub = sinon.stub().returns({ eq: eqStub });
+      fromStub = sinon.stub().returns({ select: selectStub });
+      instance.postgrestService.from = fromStub;
+    });
+
+    afterEach(() => {
+      sinon.restore();
+    });
+
+    it('throws DataAccessError when productCode is falsy', async () => {
+      await expect(instance.allSiteIdsByProductCode(null)).to.be.rejectedWith('productCode is required');
+      await expect(instance.allSiteIdsByProductCode(undefined)).to.be.rejectedWith('productCode is required');
+      await expect(instance.allSiteIdsByProductCode('')).to.be.rejectedWith('productCode is required');
+    });
+
+    it('returns array of site IDs for a matching product code', async () => {
+      eqStub.resolves({
+        data: [
+          { site_id: 'cfa88998-a0a0-4136-b21d-0ff2aa127443' },
+          { site_id: 'd1e2f3a4-b5c6-7890-abcd-ef1234567890' },
+        ],
+        error: null,
+      });
+
+      const result = await instance.allSiteIdsByProductCode('LLMO');
+
+      expect(result).to.deep.equal([
+        'cfa88998-a0a0-4136-b21d-0ff2aa127443',
+        'd1e2f3a4-b5c6-7890-abcd-ef1234567890',
+      ]);
+      expect(fromStub).to.have.been.calledOnceWithExactly('site_enrollments');
+      expect(selectStub).to.have.been.calledOnceWithExactly('site_id, entitlements!inner(product_code)');
+      expect(eqStub).to.have.been.calledOnceWithExactly('entitlements.product_code', 'LLMO');
+    });
+
+    it('returns empty array when no enrollments match', async () => {
+      eqStub.resolves({ data: [], error: null });
+
+      const result = await instance.allSiteIdsByProductCode('LLMO');
+
+      expect(result).to.deep.equal([]);
+    });
+
+    it('returns empty array when data is null', async () => {
+      eqStub.resolves({ data: null, error: null });
+
+      const result = await instance.allSiteIdsByProductCode('LLMO');
+
+      expect(result).to.deep.equal([]);
+    });
+
+    it('logs error and throws DataAccessError when query fails', async () => {
+      const dbError = new Error('DB connection failed');
+      eqStub.resolves({ data: null, error: dbError });
+
+      await expect(instance.allSiteIdsByProductCode('LLMO'))
+        .to.be.rejectedWith('Failed to query site_enrollments by productCode');
+
+      expect(mockLogger.error).to.have.been.called;
+    });
+  });
 });
diff --git a/packages/spacecat-shared-data-access/test/unit/models/site/site.collection.test.js b/packages/spacecat-shared-data-access/test/unit/models/site/site.collection.test.js
@@ -393,4 +393,68 @@ describe('SiteCollection', () => {
       });
     });
   });
+
+  describe('allByEnrollmentProductCode', () => {
+    let mockSiteEnrollmentCollection;
+
+    beforeEach(() => {
+      mockSiteEnrollmentCollection = {
+        allSiteIdsByProductCode: stub(),
+      };
+      mockEntityRegistry.getCollection = stub()
+        .withArgs('SiteEnrollmentCollection')
+        .returns(mockSiteEnrollmentCollection);
+    });
+
+    it('throws DataAccessError when productCode is falsy', async () => {
+      await expect(instance.allByEnrollmentProductCode('')).to.be.rejectedWith('productCode is required');
+      await expect(instance.allByEnrollmentProductCode(null)).to.be.rejectedWith('productCode is required');
+      await expect(instance.allByEnrollmentProductCode(undefined)).to.be.rejectedWith('productCode is required');
+    });
+
+    it('returns empty array and does not call batchGetByKeys when no site IDs found', async () => {
+      mockSiteEnrollmentCollection.allSiteIdsByProductCode.resolves([]);
+      instance.batchGetByKeys = stub();
+
+      const result = await instance.allByEnrollmentProductCode('LLMO');
+
+      expect(result).to.deep.equal([]);
+      expect(mockSiteEnrollmentCollection.allSiteIdsByProductCode).to.have.been.calledOnceWithExactly('LLMO');
+      expect(instance.batchGetByKeys).to.not.have.been.called;
+    });
+
+    it('returns sites fetched by batchGetByKeys with default empty options', async () => {
+      const siteIds = ['cfa88998-a0a0-4136-b21d-0ff2aa127443', 'd1e2f3a4-b5c6-7890-abcd-ef1234567890'];
+      const mockSites = [{ getId: () => siteIds[0] }, { getId: () => siteIds[1] }];
+      mockSiteEnrollmentCollection.allSiteIdsByProductCode.resolves(siteIds);
+      instance.batchGetByKeys = stub().resolves({ data: mockSites });
+
+      const result = await instance.allByEnrollmentProductCode('LLMO');
+
+      expect(result).to.deep.equal(mockSites);
+      expect(instance.batchGetByKeys).to.have.been.calledOnceWithExactly(
+        [
+          { siteId: 'cfa88998-a0a0-4136-b21d-0ff2aa127443' },
+          { siteId: 'd1e2f3a4-b5c6-7890-abcd-ef1234567890' },
+        ],
+        {},
+      );
+    });
+
+    it('passes caller-supplied options through to batchGetByKeys', async () => {
+      const siteIds = ['cfa88998-a0a0-4136-b21d-0ff2aa127443'];
+      const mockSites = [{ getId: () => siteIds[0] }];
+      const options = { attributes: ['siteId', 'baseURL', 'config'] };
+      mockSiteEnrollmentCollection.allSiteIdsByProductCode.resolves(siteIds);
+      instance.batchGetByKeys = stub().resolves({ data: mockSites });
+
+      const result = await instance.allByEnrollmentProductCode('LLMO', options);
+
+      expect(result).to.deep.equal(mockSites);
+      expect(instance.batchGetByKeys).to.have.been.calledOnceWithExactly(
+        [{ siteId: 'cfa88998-a0a0-4136-b21d-0ff2aa127443' }],
+        options,
+      );
+    });
+  });
 });
diff --git a/packages/spacecat-shared-tokowaka-client/CHANGELOG.md b/packages/spacecat-shared-tokowaka-client/CHANGELOG.md
@@ -1,3 +1,9 @@
+## [@adobe/spacecat-shared-tokowaka-client-v1.12.2](https://github.com/adobe/spacecat-shared/compare/@adobe/spacecat-shared-tokowaka-client-v1.12.1...@adobe/spacecat-shared-tokowaka-client-v1.12.2) (2026-03-25)
+
+### Bug Fixes
+
+* optimize preview api ([#1412](https://github.com/adobe/spacecat-shared/issues/1412)) ([3efb9de](https://github.com/adobe/spacecat-shared/commit/3efb9deb1ee6ad962b5288ef124f96fbfbb6e4ae))
+
 ## [@adobe/spacecat-shared-tokowaka-client-v1.12.1](https://github.com/adobe/spacecat-shared/compare/@adobe/spacecat-shared-tokowaka-client-v1.12.0...@adobe/spacecat-shared-tokowaka-client-v1.12.1) (2026-03-21)
 
 ### Bug Fixes
diff --git a/packages/spacecat-shared-tokowaka-client/package.json b/packages/spacecat-shared-tokowaka-client/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@adobe/spacecat-shared-tokowaka-client",
-  "version": "1.12.1",
+  "version": "1.12.2",
   "description": "Tokowaka Client for SpaceCat - Edge optimization config management",
   "type": "module",
   "engines": {
diff --git a/packages/spacecat-shared-tokowaka-client/src/index.js b/packages/spacecat-shared-tokowaka-client/src/index.js
@@ -991,6 +991,19 @@ class TokowakaClient {
 
     const forwardedHost = calculateForwardedHost(previewUrl, this.log);
 
+    const originalHtmlPromise = fetchHtmlWithWarmup(
+      previewUrl,
+      apiKey,
+      forwardedHost,
+      edgeUrl,
+      this.log,
+      false,
+      options,
+    ).catch((err) => {
+      this.log.error(`Failed to fetch original HTML: ${err.message}`);
+      return null;
+    });
+
     // Generate configuration with eligible preview suggestions
     this.log.info(`Generating preview Tokowaka config for opportunity ${opportunity.getId()}`);
     const newConfig = this.generateConfig(previewUrl, opportunity, eligibleSuggestions);
@@ -1047,38 +1060,33 @@ class TokowakaClient {
     let cdnInvalidationResults = null;
 
     try {
-      const fetchAndInvalidateStartTime = Date.now();
-      // Fetch original HTML and invalidate CDN cache in parallel to save time
-      [originalHtml, cdnInvalidationResults] = await Promise.all([
+      // Invalidate CDN so edge serves fresh content for optimized fetch
+      cdnInvalidationResults = await this.invalidateCdnCache({
+        urls: [previewUrl],
+        isPreview: true,
+      });
+
+      // Await original HTML (started earlier) and fetch optimized HTML in parallel
+      const fetchStartTime = Date.now();
+      [originalHtml, optimizedHtml] = await Promise.all([
+        originalHtmlPromise,
         fetchHtmlWithWarmup(
           previewUrl,
           apiKey,
           forwardedHost,
           edgeUrl,
           this.log,
-          false,
+          true,
           options,
         ),
-        this.invalidateCdnCache({
-          urls: [previewUrl],
-          isPreview: true,
-        }),
       ]);
-      this.log.info('Successfully fetched original HTML and invalidated CDN cache'
-        + ` in ${Date.now() - fetchAndInvalidateStartTime}ms`);
-
-      // Step 2: Fetch optimized HTML after CDN invalidation and original fetch complete
-      this.log.info('Fetching optimized HTML...');
-      optimizedHtml = await fetchHtmlWithWarmup(
-        previewUrl,
-        apiKey,
-        forwardedHost,
-        edgeUrl,
-        this.log,
-        true,
-        options,
-      );
-      this.log.info('Successfully fetched optimized HTML');
+      /* c8 ignore start */
+      if (!originalHtml || !optimizedHtml) {
+        throw this.#createError('Failed to fetch original or optimized HTML', HTTP_INTERNAL_SERVER_ERROR);
+      }
+      /* c8 ignore stop */
+      this.log.info('Successfully fetched original and optimized HTML'
+        + ` in ${Date.now() - fetchStartTime}ms`);
     } catch (error) {
       this.log.error(`Failed to fetch HTML for preview: ${error.message}`);
       throw this.#createError(
diff --git a/packages/spacecat-shared-tokowaka-client/src/utils/custom-html-utils.js b/packages/spacecat-shared-tokowaka-client/src/utils/custom-html-utils.js
diff --git a/packages/spacecat-shared-tokowaka-client/test/index.test.js b/packages/spacecat-shared-tokowaka-client/test/index.test.js
diff --git a/packages/spacecat-shared-tokowaka-client/test/utils/html-utils.test.js b/packages/spacecat-shared-tokowaka-client/test/utils/html-utils.test.js

Original file line number	Diff line number	Diff line change
`@@ -1,6 +1,6 @@`
`1`	`1`	`{`
`2`	`2`	`"name": "@adobe/spacecat-shared-data-access",`
`3`		`- "version": "3.29.0",`
	`3`	`+ "version": "3.31.0",`
`4`	`4`	`"description": "Shared modules of the Spacecat Services - Data Access",`
`5`	`5`	`"type": "module",`
`6`	`6`	`"engines": {`