@adobe/spacecat-shared-data-access 1.0.2 → 1.1.0

package/CHANGELOG.md

@@ -1,3 +1,10 @@
+# [@adobe/spacecat-shared-data-access-v1.1.0](https://github.com/adobe-rnd/spacecat-shared/compare/@adobe/spacecat-shared-data-access-v1.0.2...@adobe/spacecat-shared-data-access-v1.1.0) (2023-12-02)
+
+
+### Features
+
+* allow configuration from ctx / add missing fields ([#24](https://github.com/adobe-rnd/spacecat-shared/issues/24)) ([6959f89](https://github.com/adobe-rnd/spacecat-shared/commit/6959f895ed9b167f421b201f856ef871bd2a335c))
+
 # [@adobe/spacecat-shared-data-access-v1.0.2](https://github.com/adobe-rnd/spacecat-shared/compare/@adobe/spacecat-shared-data-access-v1.0.1...@adobe/spacecat-shared-data-access-v1.0.2) (2023-12-02)
 
 

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@adobe/spacecat-shared-data-access",
-  "version": "1.0.2",
+  "version": "1.1.0",
   "description": "Shared modules of the Spacecat Services - Data Access",
   "type": "module",
   "main": "src/service/index.js",
@@ -29,7 +29,7 @@
     "access": "public"
   },
   "dependencies": {
-    "@adobe/spacecat-shared-dynamo": "1.1.4",
+    "@adobe/spacecat-shared-dynamo": "1.2.3",
     "@adobe/spacecat-shared-utils": "1.2.0",
     "@aws-sdk/client-dynamodb": "3.465.0",
     "@aws-sdk/lib-dynamodb": "3.465.0",

package/src/dto/audit.js

@@ -44,6 +44,7 @@ export const AuditDto = {
       auditType: audit.getAuditType(),
       expiresAt: convertDateToEpochSeconds(audit.getExpiresAt()),
       fullAuditRef: audit.getFullAuditRef(),
+      isLive: audit.isLive(),
       SK: `${audit.getAuditType()}#${audit.getAuditedAt()}`,
       ...latestAuditProps,
     };
@@ -62,6 +63,7 @@ export const AuditDto = {
       auditType: dynamoItem.auditType,
       expiresAt: parseEpochToDate(dynamoItem.expiresAt),
       fullAuditRef: dynamoItem.fullAuditRef,
+      isLive: dynamoItem.isLive,
     };
 
     return createAudit(auditData);

package/src/dto/site.js

@@ -24,7 +24,9 @@ export const SiteDto = {
   toDynamoItem: (site) => ({
     id: site.getId(),
     baseURL: site.getBaseURL(),
+    gitHubURL: site.getGitHubURL(),
     imsOrgId: site.getImsOrgId(),
+    isLive: site.isLive(),
     createdAt: site.getCreatedAt(),
     updatedAt: site.getUpdatedAt(),
     GSI1PK: 'ALL_SITES',
@@ -39,7 +41,9 @@ export const SiteDto = {
     const siteData = {
       id: dynamoItem.id,
       baseURL: dynamoItem.baseURL,
+      gitHubURL: dynamoItem.gitHubURL,
       imsOrgId: dynamoItem.imsOrgId,
+      isLive: dynamoItem.isLive,
       createdAt: dynamoItem.createdAt,
       updatedAt: dynamoItem.updatedAt,
     };

package/src/index.d.ts

@@ -19,18 +19,22 @@ export interface Audit {
   getAuditType: () => object;
   getExpiresAt: () => Date;
   getFullAuditRef: () => string;
+  isLive: () => boolean;
   getScores: () => object;
 }
 
 export interface Site {
   getId: () => string;
   getBaseURL: () => string;
+  getGitHubURL: () => string;
   getImsOrgId: () => string;
   getCreatedAt: () => string;
   getUpdatedAt: () => string;
   getAudits: () => Audit[];
-  updateImsOrgId: (imsOrgId: string) => Site;
+  isLive: () => boolean;
   setAudits: (audits: Audit[]) => Site;
+  toggleLive: () => Site;
+  updateImsOrgId: (imsOrgId: string) => Site;
 }
 
 export interface DataAccess {
@@ -49,6 +53,12 @@ export interface DataAccess {
   getLatestAuditsForSite: (
     siteId: string,
   ) => Promise<Audit[]>;
+  addAudit: (
+    auditData: object,
+  ) => Promise<Audit>;
+  removeAuditsForSite: (
+    siteId: string,
+  ) => Promise<void>;
   getSites: () => Promise<Site[]>;
   getSitesToAudit: () => Promise<string[]>;
   getSitesWithLatestAudit: (
@@ -82,6 +92,17 @@ export interface DataAccess {
   ) => Promise<void>;
 }
 
+interface DataAccessConfig {
+  tableNameAudits: string;
+  tableNameLatestAudits: string;
+  tableNameSites: string;
+  indexNameAllSites: string;
+  indexNameAllLatestAuditScores: string;
+  pkAllSites: string;
+  pkAllLatestAudits: string;
+}
+
 export function createDataAccess(
+  config: DataAccessConfig,
   logger: object,
 ): DataAccess;

package/src/index.js

@@ -12,11 +12,38 @@
 
 import { createDataAccess } from './service/index.js';
 
+const TABLE_NAME_AUDITS = 'spacecat-services-audits';
+const TABLE_NAME_LATEST_AUDITS = 'spacecat-services-latest-audits';
+const TABLE_NAME_SITES = 'spacecat-services-sites';
+
+const INDEX_NAME_ALL_SITES = 'spacecat-services-all-sites';
+const INDEX_NAME_ALL_LATEST_AUDIT_SCORES = 'spacecat-services-all-latest-audit-scores';
+
+const PK_ALL_SITES = 'ALL_SITES';
+const PK_ALL_LATEST_AUDITS = 'ALL_LATEST_AUDITS';
+
 export default function dataAccessWrapper(fn) {
   return async (request, context) => {
     if (!context.dataAccess) {
       const { log } = context;
-      context.dataAccess = createDataAccess(log);
+
+      const {
+        DYNAMO_TABLE_NAME_AUDITS = TABLE_NAME_AUDITS,
+        DYNAMO_TABLE_NAME_LATEST_AUDITS = TABLE_NAME_LATEST_AUDITS,
+        DYNAMO_TABLE_NAME_SITES = TABLE_NAME_SITES,
+        DYNAMO_INDEX_NAME_ALL_SITES = INDEX_NAME_ALL_SITES,
+        DYNAMO_INDEX_NAME_ALL_LATEST_AUDIT_SCORES = INDEX_NAME_ALL_LATEST_AUDIT_SCORES,
+      } = context.env;
+
+      context.dataAccess = createDataAccess({
+        tableNameAudits: DYNAMO_TABLE_NAME_AUDITS,
+        tableNameLatestAudits: DYNAMO_TABLE_NAME_LATEST_AUDITS,
+        tableNameSites: DYNAMO_TABLE_NAME_SITES,
+        indexNameAllSites: DYNAMO_INDEX_NAME_ALL_SITES,
+        indexNameAllLatestAuditScores: DYNAMO_INDEX_NAME_ALL_LATEST_AUDIT_SCORES,
+        pkAllSites: PK_ALL_SITES,
+        pkAllLatestAudits: PK_ALL_LATEST_AUDITS,
+      }, log);
     }
 
     return fn(request, context);

package/src/models/audit.js

@@ -58,6 +58,7 @@ const Audit = (data = {}) => {
   self.getAuditType = () => self.state.auditType.toLowerCase();
   self.getExpiresAt = () => self.state.expiresAt;
   self.getFullAuditRef = () => self.state.fullAuditRef;
+  self.isLive = () => self.state.isLive;
   self.getScores = () => self.getAuditResult();
 
   return Object.freeze(self);
@@ -99,5 +100,9 @@ export const createAudit = (data) => {
     newState.expiresAt.setDate(newState.expiresAt.getDate() + EXPIRES_IN_DAYS);
   }
 
+  if (!Object.prototype.hasOwnProperty.call(newState, 'isLive')) {
+    newState.isLive = false;
+  }
+
   return Audit(newState);
 };

package/src/models/site.js

@@ -24,7 +24,9 @@ const Site = (data = {}) => {
 
   self.getAudits = () => self.state.audits;
   self.getBaseURL = () => self.state.baseURL;
+  self.getGitHubURL = () => self.state.gitHubURL;
   self.getImsOrgId = () => self.state.imsOrgId;
+  self.isLive = () => self.state.isLive;
 
   // TODO: updating the baseURL is not supported yet, it will require a transact write
   //  on dynamodb (put then delete) since baseURL is part of the primary key, something like:
@@ -79,6 +81,11 @@ const Site = (data = {}) => {
     return self;
   };
 
+  self.toggleLive = () => {
+    self.state.isLive = !self.state.isLive;
+    return self;
+  };
+
   return Object.freeze(self);
 };
 
@@ -95,6 +102,10 @@ export const createSite = (data) => {
     throw new Error('Base URL must be a valid URL');
   }
 
+  if (!Object.prototype.hasOwnProperty.call(newState, 'isLive')) {
+    newState.isLive = false;
+  }
+
   if (!Array.isArray(newState.audits)) {
     newState.audits = [];
   }

package/src/service/audits/accessPatterns.js

@@ -15,25 +15,21 @@ import { isObject } from '@adobe/spacecat-shared-utils';
 import { AuditDto } from '../../dto/audit.js';
 import { createAudit } from '../../models/audit.js';
 
-const TABLE_NAME_AUDITS = 'audits';
-const TABLE_NAME_LATEST_AUDITS = 'latest_audits';
-const INDEX_NAME_ALL_LATEST_AUDIT_SCORES = 'all_latest_audit_scores';
-const PK_ALL_LATEST_AUDITS = 'ALL_LATEST_AUDITS';
-
 /**
  * Retrieves audits for a specified site. If an audit type is provided,
  * it returns only audits of that type.
  *
  * @param {DynamoDbClient} dynamoClient - The DynamoDB client.
+ * @param {DataAccessConfig} config - The data access config.
  * @param {Logger} log - The logger.
  * @param {string} siteId - The ID of the site for which audits are being retrieved.
  * @param {string} [auditType] - Optional. The type of audits to retrieve.
  * @returns {Promise<Readonly<Audit>[]>} A promise that resolves to an array of audits
  * for the specified site.
  */
-export const getAuditsForSite = async (dynamoClient, log, siteId, auditType) => {
+export const getAuditsForSite = async (dynamoClient, config, log, siteId, auditType) => {
   const queryParams = {
-    TableName: TABLE_NAME_AUDITS,
+    TableName: config.tableNameAudits,
     KeyConditionExpression: 'siteId = :siteId',
     ExpressionAttributeValues: {
       ':siteId': siteId,
@@ -54,6 +50,7 @@ export const getAuditsForSite = async (dynamoClient, log, siteId, auditType) =>
  * Retrieves a specific audit for a specified site.
  *
  * @param {DynamoDbClient} dynamoClient - The DynamoDB client.
+ * @param {DataAccessConfig} config - The data access config.
  * @param {Logger} log - The logger.
  * @param {string} siteId - The ID of the site for which to retrieve the audit.
  * @param {string} auditType - The type of audit to retrieve.
@@ -62,13 +59,14 @@ export const getAuditsForSite = async (dynamoClient, log, siteId, auditType) =>
  */
 export const getAuditForSite = async (
   dynamoClient,
+  config,
   log,
   siteId,
   auditType,
   auditedAt,
 ) => {
   const audit = await dynamoClient.query({
-    TableName: TABLE_NAME_AUDITS,
+    TableName: config.tableNameAudits,
     KeyConditionExpression: 'siteId = :siteId AND SK = :sk',
     ExpressionAttributeValues: {
       ':siteId': siteId,
@@ -84,6 +82,7 @@ export const getAuditForSite = async (
  * Retrieves the latest audits of a specific type across all sites.
  *
  * @param {DynamoDbClient} dynamoClient - The DynamoDB client.
+ * @param {DataAccessConfig} config - The data access config.
  * @param {Logger} log - The logger.
  * @param {string} auditType - The type of audits to retrieve.
  * @param {boolean} ascending - Determines if the audits should be sorted ascending
@@ -93,16 +92,17 @@ export const getAuditForSite = async (
  */
 export const getLatestAudits = async (
   dynamoClient,
+  config,
   log,
   auditType,
   ascending = true,
 ) => {
   const dynamoItems = await dynamoClient.query({
-    TableName: TABLE_NAME_LATEST_AUDITS,
-    IndexName: INDEX_NAME_ALL_LATEST_AUDIT_SCORES,
+    TableName: config.tableNameLatestAudits,
+    IndexName: config.indexNameAllLatestAuditScores,
     KeyConditionExpression: 'GSI1PK = :gsi1pk AND begins_with(GSI1SK, :auditType)',
     ExpressionAttributeValues: {
-      ':gsi1pk': PK_ALL_LATEST_AUDITS,
+      ':gsi1pk': config.pkAllLatestAudits,
       ':auditType': `${auditType}#`,
     },
     ScanIndexForward: ascending, // Sorts ascending if true, descending if false
@@ -115,14 +115,20 @@ export const getLatestAudits = async (
  * Retrieves latest audits for a specified site.
  *
  * @param {DynamoDbClient} dynamoClient - The DynamoDB client.
+ * @param {DataAccessConfig} config - The data access config.
  * @param {Logger} log - The logger.
  * @param {string} siteId - The ID of the site for which audits are being retrieved.
  * @returns {Promise<Readonly<Audit>[]>} A promise that resolves to an array of latest audits
  * for the specified site.
  */
-export const getLatestAuditsForSite = async (dynamoClient, log, siteId) => {
+export const getLatestAuditsForSite = async (
+  dynamoClient,
+  config,
+  log,
+  siteId,
+) => {
   const queryParams = {
-    TableName: TABLE_NAME_LATEST_AUDITS,
+    TableName: config.tableNameLatestAudits,
     KeyConditionExpression: 'siteId = :siteId',
     ExpressionAttributeValues: { ':siteId': siteId },
   };
@@ -136,6 +142,7 @@ export const getLatestAuditsForSite = async (dynamoClient, log, siteId) => {
  * Retrieves the latest audit for a specified site and audit type.
  *
  * @param {DynamoDbClient} dynamoClient - The DynamoDB client.
+ * @param {DataAccessConfig} config - The data access config.
  * @param {Logger} log - The logger.
  * @param {string} siteId - The ID of the site for which the latest audit is being retrieved.
  * @param {string} auditType - The type of audit to retrieve the latest instance of.
@@ -144,12 +151,13 @@ export const getLatestAuditsForSite = async (dynamoClient, log, siteId) => {
  */
 export const getLatestAuditForSite = async (
   dynamoClient,
+  config,
   log,
   siteId,
   auditType,
 ) => {
   const latestAudit = await dynamoClient.query({
-    TableName: TABLE_NAME_LATEST_AUDITS,
+    TableName: config.tableNameLatestAudits,
     KeyConditionExpression: 'siteId = :siteId AND begins_with(SK, :auditType)',
     ExpressionAttributeValues: {
       ':siteId': siteId,
@@ -165,14 +173,21 @@ export const getLatestAuditForSite = async (
  * Adds an audit.
  *
  * @param {DynamoDbClient} dynamoClient - The DynamoDB client.
+ * @param {DataAccessConfig} config - The data access config.
  * @param {Logger} log - The logger.
  * @param {object} auditData - The audit data.
  * @returns {Promise<Readonly<Audit>>}
  */
-export const addAudit = async (dynamoClient, log, auditData) => {
+export const addAudit = async (
+  dynamoClient,
+  config,
+  log,
+  auditData,
+) => {
   const audit = createAudit(auditData);
   const existingAudit = await getAuditForSite(
     dynamoClient,
+    config,
     log,
     audit.getSiteId(),
     audit.getAuditType(),
@@ -184,8 +199,8 @@ export const addAudit = async (dynamoClient, log, auditData) => {
   }
 
   // TODO: Add transaction support
-  await dynamoClient.putItem('audits', AuditDto.toDynamoItem(audit));
-  await dynamoClient.putItem('latest_audits', AuditDto.toDynamoItem(audit, true));
+  await dynamoClient.putItem(config.tableNameAudits, AuditDto.toDynamoItem(audit));
+  await dynamoClient.putItem(config.tableNameLatestAudits, AuditDto.toDynamoItem(audit, true));
 
   return audit;
 };
@@ -193,18 +208,26 @@ export const addAudit = async (dynamoClient, log, auditData) => {
 /**
  * Removes audits from the database.
  * @param {DynamoDbClient} dynamoClient - The DynamoDB client.
- * @param {Logger} log - The logger.
+ * @param {DataAccessConfig} config - The data access config.
  * @param audits
  * @param latest
  * @returns {Promise<void>}
  */
-async function removeAudits(dynamoClient, audits, latest = false) {
-  const tableName = latest ? TABLE_NAME_LATEST_AUDITS : TABLE_NAME_AUDITS;
+async function removeAudits(
+  dynamoClient,
+  config,
+  audits,
+  latest = false,
+) {
+  const tableName = latest ? config.tableNameLatestAudits : config.tableNameAudits;
   // TODO: use batch-remove (needs dynamo client update)
-  const removeAuditPromises = audits.map((audit) => dynamoClient.removeItem(tableName, {
-    siteId: audit.getSiteId(),
-    SK: `${audit.getAuditType()}#${audit.getAuditedAt()}`,
-  }));
+  const removeAuditPromises = audits.map((audit) => dynamoClient.removeItem(
+    tableName,
+    {
+      siteId: audit.getSiteId(),
+      SK: `${audit.getAuditType()}#${audit.getAuditedAt()}`,
+    },
+  ));
 
   await Promise.all(removeAuditPromises);
 }
@@ -213,17 +236,23 @@ async function removeAudits(dynamoClient, audits, latest = false) {
  * Removes all audits for a specified site and the latest audit entry.
  *
  * @param {DynamoDbClient} dynamoClient - The DynamoDB client.
+ * @param {DataAccessConfig} config - The data access config.
  * @param {Logger} log - The logger.
  * @param {string} siteId - The ID of the site for which audits are being removed.
  * @returns {Promise<void>}
  */
-export const removeAuditsForSite = async (dynamoClient, log, siteId) => {
+export const removeAuditsForSite = async (
+  dynamoClient,
+  config,
+  log,
+  siteId,
+) => {
   try {
-    const audits = await getAuditsForSite(dynamoClient, log, siteId);
-    const latestAudits = await getLatestAuditsForSite(dynamoClient, log, siteId);
+    const audits = await getAuditsForSite(dynamoClient, config, log, siteId);
+    const latestAudits = await getLatestAuditsForSite(dynamoClient, config, log, siteId);
 
-    await removeAudits(dynamoClient, audits);
-    await removeAudits(dynamoClient, latestAudits, true);
+    await removeAudits(dynamoClient, config, audits);
+    await removeAudits(dynamoClient, config, latestAudits, true);
   } catch (error) {
     log.error(`Error removing audits for site ${siteId}: ${error.message}`);
     throw error;

package/src/service/audits/index.js

@@ -18,9 +18,10 @@ import {
   removeAuditsForSite,
 } from './accessPatterns.js';
 
-export const auditFunctions = (dynamoClient, log) => ({
+export const auditFunctions = (dynamoClient, config, log) => ({
   getAuditForSite: (siteId, auditType, auditedAt) => getAuditForSite(
     dynamoClient,
+    config,
     log,
     siteId,
     auditType,
@@ -28,29 +29,34 @@ export const auditFunctions = (dynamoClient, log) => ({
   ),
   getAuditsForSite: (siteId, auditType) => getAuditsForSite(
     dynamoClient,
+    config,
     log,
     siteId,
     auditType,
   ),
   getLatestAudits: (auditType, ascending) => getLatestAudits(
     dynamoClient,
+    config,
     log,
     auditType,
     ascending,
   ),
   getLatestAuditForSite: (siteId, auditType) => getLatestAuditForSite(
     dynamoClient,
+    config,
     log,
     siteId,
     auditType,
   ),
   addAudit: (auditData) => addAudit(
     dynamoClient,
+    config,
     log,
     auditData,
   ),
   removeAuditsForSite: (siteId) => removeAuditsForSite(
     dynamoClient,
+    config,
     log,
     siteId,
   ),

package/src/service/index.js

@@ -17,14 +17,15 @@ import { siteFunctions } from './sites/index.js';
 /**
  * Creates a data access object.
  *
+ * @param {DataAccessConfig} config configuration
  * @param {Logger} log logger
  * @returns {object} data access object
  */
-export const createDataAccess = (log = console) => {
+export const createDataAccess = (config, log = console) => {
   const dynamoClient = createClient(log);
 
-  const auditFuncs = auditFunctions(dynamoClient, log);
-  const siteFuncs = siteFunctions(dynamoClient, log);
+  const auditFuncs = auditFunctions(dynamoClient, config, log);
+  const siteFuncs = siteFunctions(dynamoClient, config, log);
 
   return {
     ...auditFuncs,

package/src/service/sites/accessPatterns.js

@@ -21,23 +21,20 @@ import {
 import { createSite } from '../../models/site.js';
 import { SiteDto } from '../../dto/site.js';
 
-const INDEX_NAME_ALL_SITES = 'all_sites';
-const PK_ALL_SITES = 'ALL_SITES';
-const TABLE_NAME_SITES = 'sites';
-
 /**
  * Retrieves all sites.
  *
  * @param {DynamoDbClient} dynamoClient - The DynamoDB client.
+ * @param {DataAccessConfig} config - The data access config.
  * @returns {Promise<Readonly<Site>[]>} A promise that resolves to an array of all sites.
  */
-export const getSites = async (dynamoClient) => {
+export const getSites = async (dynamoClient, config) => {
   const dynamoItems = await dynamoClient.query({
-    TableName: TABLE_NAME_SITES,
-    IndexName: INDEX_NAME_ALL_SITES, // GSI name
+    TableName: config.tableNameSites,
+    IndexName: config.indexNameAllSites,
     KeyConditionExpression: 'GSI1PK = :gsi1pk',
     ExpressionAttributeValues: {
-      ':gsi1pk': PK_ALL_SITES,
+      ':gsi1pk': config.pkAllSites,
     },
   });
 
@@ -48,10 +45,11 @@ export const getSites = async (dynamoClient) => {
  * Retrieves a list of base URLs for all sites.
  *
  * @param {DynamoDbClient} dynamoClient - The DynamoDB client.
+ * @param {DataAccessConfig} config - The data access config.
  * @returns {Promise<Array<string>>} A promise that resolves to an array of base URLs for all sites.
  */
-export const getSitesToAudit = async (dynamoClient) => {
-  const sites = await getSites(dynamoClient);
+export const getSitesToAudit = async (dynamoClient, config) => {
+  const sites = await getSites(dynamoClient, config);
 
   return sites.map((site) => site.getBaseURL());
 };
@@ -60,6 +58,7 @@ export const getSitesToAudit = async (dynamoClient) => {
  * Retrieves sites with their latest audit of a specified type.
  *
  * @param {DynamoDbClient} dynamoClient - The DynamoDB client.
+ * @param {DataAccessConfig} config - The data access config.
  * @param {Logger} log - The logger.
  * @param {string} auditType - The type of the latest audits to retrieve for each site.
  * @param {boolean} [sortAuditsAscending] - Optional. Determines if the audits
@@ -69,13 +68,14 @@ export const getSitesToAudit = async (dynamoClient) => {
  */
 export const getSitesWithLatestAudit = async (
   dynamoClient,
+  config,
   log,
   auditType,
   sortAuditsAscending = true,
 ) => {
   const [sites, latestAudits] = await Promise.all([
-    getSites(dynamoClient),
-    getLatestAudits(dynamoClient, log, auditType, sortAuditsAscending),
+    getSites(dynamoClient, config),
+    getLatestAudits(dynamoClient, config, log, auditType, sortAuditsAscending),
   ]);
 
   const sitesMap = new Map(sites.map((site) => [site.getId(), site]));
@@ -94,6 +94,7 @@ export const getSitesWithLatestAudit = async (
  * Retrieves a site by its base URL.
  *
  * @param {DynamoDbClient} dynamoClient - The DynamoDB client.
+ * @param {DataAccessConfig} config - The data access config.
  * @param {Logger} log - The logger.
  * @param {string} baseURL - The base URL of the site to retrieve.
  * @returns {Promise<Readonly<Site>|null>} A promise that resolves to the site object if found,
@@ -101,15 +102,16 @@ export const getSitesWithLatestAudit = async (
  */
 export const getSiteByBaseURL = async (
   dynamoClient,
+  config,
   log,
   baseURL,
 ) => {
   const dynamoItems = await dynamoClient.query({
-    TableName: TABLE_NAME_SITES,
-    IndexName: INDEX_NAME_ALL_SITES,
+    TableName: config.tableNameSites,
+    IndexName: config.indexNameAllSites,
     KeyConditionExpression: 'GSI1PK = :gsi1pk AND baseURL = :baseURL',
     ExpressionAttributeValues: {
-      ':gsi1pk': PK_ALL_SITES,
+      ':gsi1pk': config.pkAllSites,
       ':baseURL': baseURL,
     },
     Limit: 1,
@@ -126,6 +128,7 @@ export const getSiteByBaseURL = async (
  * Retrieves a site by its base URL, along with associated audit information.
  *
  * @param {DynamoDbClient} dynamoClient - The DynamoDB client.
+ * @param {DataAccessConfig} config - The data access config.
  * @param {Logger} log - The logger.
  * @param {string} baseUrl - The base URL of the site to retrieve.
  * @param {string} auditType - The type of audits to retrieve for the site.
@@ -135,12 +138,13 @@ export const getSiteByBaseURL = async (
  */
 export const getSiteByBaseURLWithAuditInfo = async (
   dynamoClient,
+  config,
   log,
   baseUrl,
   auditType,
   latestOnly = false,
 ) => {
-  const site = await getSiteByBaseURL(dynamoClient, log, baseUrl);
+  const site = await getSiteByBaseURL(dynamoClient, config, log, baseUrl);
 
   if (!isObject(site)) {
     return null;
@@ -149,12 +153,14 @@ export const getSiteByBaseURLWithAuditInfo = async (
   const audits = latestOnly
     ? [await getLatestAuditForSite(
       dynamoClient,
+      config,
       log,
       site.getId(),
       auditType,
     )].filter((audit) => audit != null)
     : await getAuditsForSite(
       dynamoClient,
+      config,
       log,
       site.getId(),
       auditType,
@@ -169,6 +175,7 @@ export const getSiteByBaseURLWithAuditInfo = async (
  * Retrieves a site by its base URL, including all its audits.
  *
  * @param {DynamoDbClient} dynamoClient - The DynamoDB client.
+ * @param {DataAccessConfig} config - The data access config.
  * @param {Logger} log - The logger.
  * @param {string} baseUrl - The base URL of the site to retrieve.
  * @param {string} auditType - The type of audits to retrieve for the site.
@@ -177,15 +184,17 @@ export const getSiteByBaseURLWithAuditInfo = async (
  */
 export const getSiteByBaseURLWithAudits = async (
   dynamoClient,
+  config,
   log,
   baseUrl,
   auditType,
-) => getSiteByBaseURLWithAuditInfo(dynamoClient, log, baseUrl, auditType, false);
+) => getSiteByBaseURLWithAuditInfo(dynamoClient, config, log, baseUrl, auditType, false);
 
 /**
  * Retrieves a site by its base URL, including only its latest audit.
  *
  * @param {DynamoDbClient} dynamoClient - The DynamoDB client.
+ * @param {DataAccessConfig} config - The data access config.
  * @param {Logger} log - The logger.
  * @param {string} baseUrl - The base URL of the site to retrieve.
  * @param {string} auditType - The type of the latest audit to retrieve for the site.
@@ -194,23 +203,31 @@ export const getSiteByBaseURLWithAudits = async (
  */
 export const getSiteByBaseURLWithLatestAudit = async (
   dynamoClient,
+  config,
   log,
   baseUrl,
   auditType,
-) => getSiteByBaseURLWithAuditInfo(dynamoClient, log, baseUrl, auditType, true);
+) => getSiteByBaseURLWithAuditInfo(dynamoClient, config, log, baseUrl, auditType, true);
 
 /**
  * Adds a site.
  *
  * @param {DynamoDbClient} dynamoClient - The DynamoDB client.
+ * @param {DataAccessConfig} config - The data access config.
  * @param {Logger} log - The logger.
  * @param {object} siteData - The site data.
  * @returns {Promise<Readonly<Site>>}
  */
-export const addSite = async (dynamoClient, log, siteData) => {
+export const addSite = async (
+  dynamoClient,
+  config,
+  log,
+  siteData,
+) => {
   const site = createSite(siteData);
   const existingSite = await getSiteByBaseURL(
     dynamoClient,
+    config,
     log,
     site.getBaseURL(),
   );
@@ -219,7 +236,7 @@ export const addSite = async (dynamoClient, log, siteData) => {
     throw new Error('Site already exists');
   }
 
-  await dynamoClient.putItem(TABLE_NAME_SITES, SiteDto.toDynamoItem(site));
+  await dynamoClient.putItem(config.tableNameSites, SiteDto.toDynamoItem(site));
 
   return site;
 };
@@ -228,18 +245,24 @@ export const addSite = async (dynamoClient, log, siteData) => {
  * Updates a site.
  *
  * @param {DynamoDbClient} dynamoClient - The DynamoDB client.
+ * @param {DataAccessConfig} config - The data access config.
  * @param {Logger} log - The logger.
  * @param {Site} site - The site.
  * @returns {Promise<Readonly<Site>>} - The updated site.
  */
-export const updateSite = async (dynamoClient, log, site) => {
-  const existingSite = await getSiteByBaseURL(dynamoClient, log, site.getBaseURL());
+export const updateSite = async (
+  dynamoClient,
+  config,
+  log,
+  site,
+) => {
+  const existingSite = await getSiteByBaseURL(dynamoClient, config, log, site.getBaseURL());
 
   if (!isObject(existingSite)) {
     throw new Error('Site not found');
   }
 
-  await dynamoClient.putItem(TABLE_NAME_SITES, SiteDto.toDynamoItem(site));
+  await dynamoClient.putItem(config.tableNameSites, SiteDto.toDynamoItem(site));
 
   return site;
 };
@@ -248,16 +271,22 @@ export const updateSite = async (dynamoClient, log, site) => {
  * Removes a site and its related audits.
  *
  * @param {DynamoDbClient} dynamoClient - The DynamoDB client.
+ * @param {DataAccessConfig} config - The data access config.
  * @param {Logger} log - The logger.
  * @param {string} siteId - The ID of the site to remove.
  * @returns {Promise<void>}
  */
-export const removeSite = async (dynamoClient, log, siteId) => {
+export const removeSite = async (
+  dynamoClient,
+  config,
+  log,
+  siteId,
+) => {
   try {
     // TODO: Add transaction support
-    await removeAuditsForSite(dynamoClient, log, siteId);
+    await removeAuditsForSite(dynamoClient, config, log, siteId);
 
-    await dynamoClient.removeItem(TABLE_NAME_SITES, { id: siteId });
+    await dynamoClient.removeItem(config.tableNameSites, { id: siteId });
   } catch (error) {
     log.error(`Error removing site: ${error.message}`);
     throw error;

package/src/service/sites/index.js

@@ -22,26 +22,31 @@ import {
   updateSite,
 } from './accessPatterns.js';
 
-export const siteFunctions = (dynamoClient, log) => ({
+export const siteFunctions = (dynamoClient, config, log) => ({
   getSites: () => getSites(
     dynamoClient,
+    config,
   ),
   getSitesToAudit: () => getSitesToAudit(
     dynamoClient,
+    config,
   ),
   getSitesWithLatestAudit: (auditType, sortAuditsAscending) => getSitesWithLatestAudit(
     dynamoClient,
+    config,
     log,
     auditType,
     sortAuditsAscending,
   ),
   getSiteByBaseURL: (baseUrl) => getSiteByBaseURL(
     dynamoClient,
+    config,
     log,
     baseUrl,
   ),
   getSiteByBaseURLWithAuditInfo: (baseUrl, auditType, latestOnly) => getSiteByBaseURLWithAuditInfo(
     dynamoClient,
+    config,
     log,
     baseUrl,
     auditType,
@@ -49,17 +54,19 @@ export const siteFunctions = (dynamoClient, log) => ({
   ),
   getSiteByBaseURLWithAudits: (baseUrl, auditType) => getSiteByBaseURLWithAudits(
     dynamoClient,
+    config,
     log,
     baseUrl,
     auditType,
   ),
   getSiteByBaseURLWithLatestAudit: (baseUrl, auditType) => getSiteByBaseURLWithLatestAudit(
     dynamoClient,
+    config,
     log,
     baseUrl,
     auditType,
   ),
-  addSite: (siteData) => addSite(dynamoClient, log, siteData),
-  updateSite: (site) => updateSite(dynamoClient, log, site),
-  removeSite: (siteId) => removeSite(dynamoClient, log, siteId),
+  addSite: (siteData) => addSite(dynamoClient, config, log, siteData),
+  updateSite: (site) => updateSite(dynamoClient, config, log, site),
+  removeSite: (siteId) => removeSite(dynamoClient, config, log, siteId),
 });