address review comments

Author: tkotthakota-adobe

package-lock.json

@@ -76,7 +76,7 @@
     "@adobe/helix-status": "10.1.5",
     "@adobe/helix-universal": "5.4.0",
     "@adobe/helix-universal-logger": "3.0.28",
-    "@adobe/spacecat-shared-data-access": "https://gist.github.com/tkotthakota-adobe/c18a23bd0566c296ad75701b84ffbef5/raw/dd0062c172263f60f98c8dee6f7a608c7dffabf0/adobe-spacecat-shared-data-access-3.32.1.tgz",
+    "@adobe/spacecat-shared-data-access": "https://gist.github.com/tkotthakota-adobe/ab119c43b3a874bcda91240f5a458179/raw/eddd18886cbf1d4285418e1f60d987ebd29dc333/adobe-spacecat-shared-data-access-3.32.1.tgz",
     "@adobe/spacecat-shared-data-access-v2": "npm:@adobe/spacecat-shared-data-access@2.109.0",
     "@adobe/spacecat-shared-google-client": "1.5.8",
     "@adobe/spacecat-shared-gpt-client": "1.6.20",
@@ -85,7 +85,7 @@
     "@adobe/spacecat-shared-rum-api-client": "2.40.10",
     "@adobe/spacecat-shared-scrape-client": "2.5.4",
     "@adobe/spacecat-shared-slack-client": "1.6.4",
-    "@adobe/spacecat-shared-utils": "https://gist.github.com/tkotthakota-adobe/3e5c80c528d7b3d17d1e3d08d708573b/raw/33821e8f69e83f13d40f39f192d383e32276f58f/adobe-spacecat-shared-utils-1.106.1.tgz",
+    "@adobe/spacecat-shared-utils": "https://gist.github.com/tkotthakota-adobe/24594fa3013e22c6183dacebe2293b42/raw/114b0fba15511512ecfa441dfd91a4a163d029ab/adobe-spacecat-shared-utils-1.106.1.tgz",
     "@aws-sdk/client-lambda": "3.1019.0",
     "@aws-sdk/client-sqs": "3.1019.0",
     "@aws-sdk/client-s3": "3.1019.0",

package.json

@@ -20,6 +20,7 @@ import {
   getOpportunityTitle,
   OPPORTUNITY_DEPENDENCY_MAP,
   getOpportunitiesForAudit,
+  computeAuditCompletion,
 } from '@adobe/spacecat-shared-utils';
 import { getAuditStatus } from '../../utils/cloudwatch-utils.js';
 import { checkAndAlertBotProtection } from '../../utils/bot-detection.js';
@@ -217,54 +218,6 @@ async function isScrapingAvailable(baseUrl, context, onboardStartTime) {
   }
 }
 
-/**
- * Checks which audit types have completed since onboardStartTime by querying the database.
- * An audit is considered completed if a record exists with auditedAt >= onboardStartTime.
- * Falls back conservatively (all pending) if the DB query fails.
- *
- * @param {string} siteId - The site ID
- * @param {Array<string>} auditTypes - Audit types expected for this onboard session
- * @param {number} onboardStartTime - Onboarding start timestamp in ms
- * @param {object} dataAccess - Data access object
- * @param {object} log - Logger
- * @returns {Promise<{pendingAuditTypes: Array<string>, completedAuditTypes: Array<string>}>}
- */
-async function checkAuditCompletionFromDB(siteId, auditTypes, onboardStartTime, dataAccess, log) {
-  const pendingAuditTypes = [];
-  const completedAuditTypes = [];
-  try {
-    const { Audit } = dataAccess;
-    const latestAudits = await Audit.allLatestForSite(siteId);
-    const auditsByType = {};
-    if (latestAudits) {
-      for (const audit of latestAudits) {
-        auditsByType[audit.getAuditType()] = audit;
-      }
-    }
-    for (const auditType of auditTypes) {
-      const audit = auditsByType[auditType];
-      if (!audit) {
-        pendingAuditTypes.push(auditType);
-      } else {
-        const auditedAt = new Date(audit.getAuditedAt()).getTime();
-        if (Number.isNaN(auditedAt) || auditedAt < onboardStartTime) {
-          // Unparseable timestamp or audit predates this onboard session — treat as pending
-          pendingAuditTypes.push(auditType);
-        } else {
-          completedAuditTypes.push(auditType);
-        }
-      }
-    }
-  } catch (error) {
-    log.warn(`Could not check audit completion from DB for site ${siteId}: ${error.message}`);
-    // Conservative fallback: mark all as pending so disclaimer is always shown on error
-    // Reset first to avoid duplicates if some types were already pushed before the error
-    pendingAuditTypes.length = 0;
-    pendingAuditTypes.push(...auditTypes.filter((t) => !completedAuditTypes.includes(t)));
-  }
-  return { pendingAuditTypes, completedAuditTypes };
-}
-
 /**
  * Analyzes missing opportunities and determines the root cause
  * @param {Array<string>} missingOpportunities - Array of missing opportunity types
@@ -582,8 +535,16 @@ export async function runOpportunityStatusProcessor(message, context) {
     // Only meaningful when we have an onboardStartTime anchor to compare against.
     let pendingAuditTypes = [];
     if (auditTypes && auditTypes.length > 0 && onboardStartTime) {
-      // eslint-disable-next-line max-len
-      ({ pendingAuditTypes } = await checkAuditCompletionFromDB(siteId, auditTypes, onboardStartTime, dataAccess, log));
+      try {
+        const { Audit } = dataAccess;
+        const latestAudits = await Audit.allLatestForSite(siteId);
+        const completion = computeAuditCompletion(auditTypes, onboardStartTime, latestAudits);
+        pendingAuditTypes = completion.pendingAuditTypes;
+      } catch (auditErr) {
+        log.warn(`Could not check audit completion from DB for site ${siteId}: ${auditErr.message}`);
+        // Conservative fallback: mark all as pending so disclaimer is always shown on error
+        pendingAuditTypes = [...auditTypes];
+      }
     }
 
     // Process opportunities by type to avoid duplicates