@adobe/spacecat-shared-data-access 4.9.0 → 4.10.0

package/CHANGELOG.md

@@ -1,3 +1,9 @@
+## [@adobe/spacecat-shared-data-access-v4.10.0](https://github.com/adobe/spacecat-shared/compare/@adobe/spacecat-shared-data-access-v4.9.0...@adobe/spacecat-shared-data-access-v4.10.0) (2026-07-20)
+
+### Features
+
+* Add allSiteIdsByTier and allByEnrollmentAndTier collection meth… ([#1569](https://github.com/adobe/spacecat-shared/issues/1569)) ([3ac585b](https://github.com/adobe/spacecat-shared/commit/3ac585bd1b3fe93d32b8d0ad027af81cf6e37830))
+
 ## [@adobe/spacecat-shared-data-access-v4.9.0](https://github.com/adobe/spacecat-shared/compare/@adobe/spacecat-shared-data-access-v4.8.0...@adobe/spacecat-shared-data-access-v4.9.0) (2026-07-15)
 
 ### Features

package/package.json

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

package/src/models/site/config.js

@@ -477,6 +477,16 @@ export const configSchema = Joi.object({
       storeCode: Joi.string().required(),
       storeViewCode: Joi.string().required(),
       hostName: Joi.string().optional(),
+      catalogFieldConfig: Joi.object({
+        name: Joi.object({
+          enabled: Joi.boolean().required(),
+          maxLength: Joi.number().integer().min(0).optional(),
+        }).optional(),
+        description: Joi.object({
+          enabled: Joi.boolean().required(),
+          maxLength: Joi.number().integer().min(0).optional(),
+        }).optional(),
+      }).optional(),
     }).options({ stripUnknown: true }),
   ).optional(),
   contentAiConfig: Joi.object({

package/src/models/site/index.d.ts

@@ -409,6 +409,8 @@ export interface SiteCollection extends BaseCollection<Site> {
   allByProjectName(projectName: string): Promise<Site[]>;
   allByOrganizationIdAndProjectId(organizationId: string, projectId: string): Promise<Site[]>;
   allByOrganizationIdAndProjectName(organizationId: string, projectName: string): Promise<Site[]>;
+  allByEnrollmentProductCode(productCode: string, options?: object): Promise<Site[]>;
+  allByEnrollmentAndTier(tier: string, productCode?: string, options?: object): Promise<Site[]>;
   allSitesToAudit(): Promise<string[]>;
   allWithLatestAudit(auditType: string, order?: string, deliveryType?: string): Promise<Site[]>;
   findByBaseURL(baseURL: string): Promise<Site | null>;

package/src/models/site/site.collection.js

@@ -174,6 +174,38 @@ class SiteCollection extends BaseCollection {
     return sites;
   }
 
+  /**
+   * Returns all sites enrolled at a given entitlement tier (e.g. 'PAID',
+   * 'FREE_TRIAL', 'PLG'). Optionally narrows the result to a single product
+   * code (e.g. 'LLMO').
+   *
+   * Uses entityRegistry to chain through SiteEnrollmentCollection, then
+   * batch-fetches full Site objects.
+   *
+   * @param {string} tier - Entitlement tier to filter by.
+   * @param {string} [productCode] - Optional product code to further filter by.
+   * @param {object} [options] - batchGetByKeys options (e.g. attribute projection).
+   * @returns {Promise<Site[]>}
+   */
+  async allByEnrollmentAndTier(tier, productCode, options = {}) {
+    if (!hasText(tier)) {
+      throw new DataAccessError('tier is required', this);
+    }
+
+    const siteEnrollmentCollection = this.entityRegistry.getCollection('SiteEnrollmentCollection');
+
+    const siteIds = await siteEnrollmentCollection.allSiteIdsByTier(tier, productCode);
+    if (siteIds.length === 0) {
+      return [];
+    }
+
+    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);

package/src/models/site-enrollment/index.d.ts

@@ -27,6 +27,8 @@ export interface SiteEnrollmentCollection extends
     BaseCollection<SiteEnrollment> {
   allBySiteId(siteId: string): Promise<SiteEnrollment[]>;
   allByEntitlementId(entitlementId: string): Promise<SiteEnrollment[]>;
+  allSiteIdsByProductCode(productCode: string): Promise<string[]>;
+  allSiteIdsByTier(tier: string, productCode?: string): Promise<string[]>;
 
   findBySiteId(siteId: string): Promise<SiteEnrollment | null>;
   findByEntitlementId(entitlementId: string): Promise<SiteEnrollment | null>;

package/src/models/site-enrollment/site-enrollment.collection.js

@@ -10,6 +10,7 @@
  * governing permissions and limitations under the License.
  */
 
+import { hasText } from '@adobe/spacecat-shared-utils';
 import BaseCollection from '../base/base.collection.js';
 import DataAccessError from '../../errors/data-access.error.js';
 
@@ -47,6 +48,39 @@ class SiteEnrollmentCollection extends BaseCollection {
     return (data || []).map((row) => row.site_id);
   }
 
+  /**
+   * Returns all site IDs enrolled at a given entitlement tier (e.g. 'PAID',
+   * 'FREE_TRIAL', 'PLG') in a single JOIN query. Optionally narrows the tier
+   * match to a single product code.
+   *
+   * @param {string} tier - Entitlement tier to filter by.
+   * @param {string} [productCode] - Optional product code to further filter by.
+   * @returns {Promise<string[]>} Array of siteId strings.
+   */
+  async allSiteIdsByTier(tier, productCode) {
+    if (!hasText(tier)) {
+      throw new DataAccessError('tier is required', { entityName: 'SiteEnrollment', tableName: 'site_enrollments' });
+    }
+
+    let query = this.postgrestService
+      .from(this.tableName)
+      .select('site_id, entitlements!inner(tier, product_code)')
+      .eq('entitlements.tier', tier);
+
+    if (productCode) {
+      query = query.eq('entitlements.product_code', productCode);
+    }
+
+    const { data, error } = await query;
+
+    if (error) {
+      this.log.error(`[SiteEnrollmentCollection] Failed to query site_enrollments by tier - ${error.message}`, error);
+      throw new DataAccessError('Failed to query site_enrollments by tier', { entityName: 'SiteEnrollment', tableName: 'site_enrollments' }, error);
+    }
+
+    return [...new Set((data || []).map((row) => row.site_id))];
+  }
+
   async create(item, options = {}) {
     if (item?.siteId && item?.entitlementId) {
       const existing = await this.findByIndexKeys({