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

package/CHANGELOG.md

@@ -1,3 +1,15 @@
+## [@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
+
+* **data-access:** guidance + feedback_subject_id + code-patch export gate for feedback ([#1809](https://github.com/adobe/spacecat-shared/issues/1809)) ([941b9f9](https://github.com/adobe/spacecat-shared/commit/941b9f92621df09a9ce887b70307f4c1261bfd37))
+
 ## [@adobe/spacecat-shared-data-access-v4.8.0](https://github.com/adobe/spacecat-shared/compare/@adobe/spacecat-shared-data-access-v4.7.0...@adobe/spacecat-shared-data-access-v4.8.0) (2026-07-14)
 
 ### Features

package/package.json

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

package/src/models/feedback-event/feedback-event.constants.js

@@ -79,16 +79,19 @@ export const EXPORT_EXCLUDED_REJECTION_CATEGORIES = Object.freeze([
 ]);
 
 /**
- * Customer-derived fields stripped from the JSONL export for organizations with
- * `training_opt_in = false`. Verdict / signal / category / identity metadata
- * still ship. snake_case to match the JSONL row shape (and the feedback_event
- * DB columns) — {@link toJsonlRow} uses this list to do the stripping, so the
- * opt-out boundary is single-sourced here.
+ * HUMAN-authored fields stripped from the JSONL export for organizations with
+ * `training_opt_in = false`: the reviewer's written feedback (`detail_markdown`)
+ * and their hand-corrected patch (`edited_fix`). The AI-generated fields — the
+ * issue context (`guidance_markdown`) and the generated patch (`previous_fix`) —
+ * are ALWAYS exported (the Learning Agent needs the issue + generated patch to
+ * map a verdict to what was generated), as are verdict / signal / category /
+ * identity metadata. snake_case to match the JSONL row shape (and the
+ * feedback_event DB columns) — {@link toJsonlRow} uses this list to do the
+ * stripping, so the opt-out boundary is single-sourced here (SITES-43974).
  */
 export const OPT_OUT_STRIPPED_FIELDS = Object.freeze([
-  'previous_fix',
-  'edited_fix',
   'detail_markdown',
+  'edited_fix',
 ]);
 
 /**
@@ -163,11 +166,17 @@ export function toReviewView(row, { includePatches = false } = {}) {
     rejectionCategory: row.rejection_category ?? null,
     stateTransition: row.state_transition ?? null,
     tier: row.tier,
+    // Sub-item id (e.g. a CWV issue) this review is about; the Backoffice groups
+    // its per-issue "previous feedback" table on it. Always in the base view (the
+    // UI filters on it) — not gated behind includePatches. Null for
+    // whole-suggestion reviews.
+    feedbackSubjectId: row.feedback_subject_id ?? null,
   };
 
   if (includePatches) {
     view.previousFix = row.previous_fix ?? null;
     view.editedFix = row.edited_fix ?? null;
+    view.guidanceMarkdown = row.guidance_markdown ?? null;
   }
 
   return view;
@@ -175,14 +184,21 @@ export function toReviewView(row, { includePatches = false } = {}) {
 
 /**
  * Whether a raw `feedback_event` row should be exported to the Learning Agent
- * corpus. `product_bug` rejections are excluded (routed to Jira); NULL-category
- * rows ARE exported. See {@link EXPORT_EXCLUDED_REJECTION_CATEGORIES}.
+ * corpus. Two gates (SITES-43974):
+ *   1. It must carry a generated code patch (`previous_fix`). The corpus is
+ *      code-patch feedback; text-guidance-only reviews (no patch) are retained
+ *      in Postgres but NOT exported — reserved for a future text-guidance corpus.
+ *   2. `product_bug` rejections are excluded (routed to Jira). NULL-category rows
+ *      (approvals / uncategorised) ARE exported. See
+ *      {@link EXPORT_EXCLUDED_REJECTION_CATEGORIES}.
  *
  * @param {object} row - a raw feedback_event row from PostgREST.
  * @returns {boolean} true if the row should be exported.
  */
 export function shouldExport(row) {
-  return !EXPORT_EXCLUDED_REJECTION_CATEGORIES.includes(row.rejection_category);
+  const hasCodePatch = row.previous_fix != null;
+  return hasCodePatch
+    && !EXPORT_EXCLUDED_REJECTION_CATEGORIES.includes(row.rejection_category);
 }
 
 /**
@@ -190,8 +206,10 @@ export function shouldExport(row) {
  * object — the canonical Learning Agent export contract. The row mirrors the
  * feedback_event columns (snake_case), stamped with {@link SCHEMA_VERSION} and
  * the derived `verdict`. For organizations that have NOT opted into training,
- * the customer-derived fields in {@link OPT_OUT_STRIPPED_FIELDS} are nulled;
- * verdict / signal / category / identity metadata still ship (§10.5.7).
+ * the HUMAN-authored fields in {@link OPT_OUT_STRIPPED_FIELDS} are nulled; the
+ * AI-generated issue context (`guidance_markdown`) + generated patch
+ * (`previous_fix`) and the verdict / signal / category / identity metadata still
+ * ship (§10.5.7).
  *
  * This is the single source of truth for the JSONL row shape — the exporter
  * (spacecat-jobs-dispatcher) calls it rather than re-deriving the contract.
@@ -218,6 +236,7 @@ export function toJsonlRow(row, { optedIn = false } = {}) {
     state_transition: row.state_transition ?? null,
     tier: row.tier,
     detail_markdown: row.detail_markdown ?? null,
+    guidance_markdown: row.guidance_markdown ?? null,
     previous_fix: row.previous_fix ?? null,
     edited_fix: row.edited_fix ?? null,
   };

package/src/models/feedback-event/index.d.ts

@@ -53,8 +53,10 @@ export interface ReviewView {
   rejectionCategory: string | null;
   stateTransition: string | null;
   tier: string;
+  feedbackSubjectId: string | null;
   previousFix?: unknown;
   editedFix?: unknown;
+  guidanceMarkdown?: string | null;
 }
 
 /**

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({