@adobe/spacecat-shared-data-access 1.61.0 → 1.61.1

package/CHANGELOG.md

@@ -1,3 +1,10 @@
+# [@adobe/spacecat-shared-data-access-v1.61.1](https://github.com/adobe/spacecat-shared/compare/@adobe/spacecat-shared-data-access-v1.61.0...@adobe/spacecat-shared-data-access-v1.61.1) (2024-12-24)
+
+
+### Bug Fixes
+
+* schema and db init ([#505](https://github.com/adobe/spacecat-shared/issues/505)) ([9b67b9a](https://github.com/adobe/spacecat-shared/commit/9b67b9a9f40f643c648cc5043018bfbc1d2a9c12))
+
 # [@adobe/spacecat-shared-data-access-v1.61.0](https://github.com/adobe/spacecat-shared/compare/@adobe/spacecat-shared-data-access-v1.60.3...@adobe/spacecat-shared-data-access-v1.61.0) (2024-12-23)
 
 

package/package.json

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

package/src/service/index.js

@@ -31,8 +31,8 @@ import { importUrlFunctions } from './import-url/index.js';
 import { experimentFunctions } from './experiments/index.js';
 import { apiKeyFunctions } from './api-key/index.js';
 
-const createRawClient = () => {
-  const dbClient = AWSXray.captureAWSv3Client(new DynamoDB());
+const createRawClient = (client = undefined) => {
+  const dbClient = client || AWSXray.captureAWSv3Client(new DynamoDB());
   return DynamoDBDocument.from(dbClient, {
     marshallOptions: {
       convertEmptyValues: true,
@@ -70,6 +70,7 @@ const createElectroService = (client, config, log) => {
  * tableNameSiteTopPages: string, indexNameAllOrganizations: string,
  * indexNameAllOrganizationsByImsOrgId: string, pkAllOrganizations: string}} config configuration
  * @param {Logger} log log
+ * @param client custom dynamo client
  * @returns {object} data access object
  */
 export const createDataAccess = (config, log = console, client = undefined) => {
@@ -88,7 +89,7 @@ export const createDataAccess = (config, log = console, client = undefined) => {
   const apiKeyFuncs = apiKeyFunctions(dynamoClient, config, log);
 
   // electro-based data access objects
-  const rawClient = createRawClient();
+  const rawClient = createRawClient(client);
   const electroService = createElectroService(rawClient, config, log);
   const entityRegistry = new EntityRegistry(electroService, log);
   const collections = entityRegistry.getCollections();

package/src/v2/models/api-key/api-key.schema.js

@@ -31,9 +31,11 @@ const schema = new SchemaBuilder(ApiKey, ApiKeyCollection)
   })
   .addAttribute('imsUserId', {
     type: 'string',
+    default: 'default',
   })
   .addAttribute('imsOrgId', {
     type: 'string',
+    default: 'default',
   })
   .addAttribute('name', {
     type: 'string',

package/src/v2/models/configuration/configuration.schema.js

@@ -78,9 +78,9 @@ const schema = new SchemaBuilder(Configuration, ConfigurationCollection)
     items: {
       type: 'map',
       properties: {
-        group: { type: ['audits', 'imports', 'reports'] },
+        group: { type: ['audits', 'imports', 'reports', 'scrapes'] },
         type: { type: 'string', required: true },
-        interval: { type: ['daily', 'weekly'] },
+        interval: { type: ['daily', 'weekly', 'every-saturday', 'every-sunday', 'fortnightly', 'monthly'] },
       },
     },
   })

package/src/v2/models/experiment/experiment.schema.js

@@ -12,7 +12,9 @@
 
 /* c8 ignore start */
 
-import { isIsoDate, isNonEmptyObject, isValidUrl } from '@adobe/spacecat-shared-utils';
+import {
+  isIsoDate, isNonEmptyObject, isString, isValidUrl,
+} from '@adobe/spacecat-shared-utils';
 
 import SchemaBuilder from '../base/schema.builder.js';
 import Experiment, { DEFAULT_UPDATED_BY } from './experiment.model.js';
@@ -28,8 +30,12 @@ const schema = new SchemaBuilder(Experiment, ExperimentCollection)
   .addReference('belongs_to', 'Site', ['expId', 'url', 'updatedAt'])
   .addAttribute('conversionEventName', {
     type: 'string',
+    validate: (value) => !value || isString(value),
+  })
+  .addAttribute('conversionEventValue', {
+    type: 'string',
+    validate: (value) => !value || isString(value),
   })
-  .addAttribute('conversionEventValue', { type: 'string' })
   .addAttribute('endDate', {
     type: 'string',
     validate: (value) => !value || isIsoDate(value),
@@ -47,7 +53,10 @@ const schema = new SchemaBuilder(Experiment, ExperimentCollection)
     type: ['ACTIVE', 'INACTIVE'],
     required: true,
   })
-  .addAttribute('type', { type: 'string' })
+  .addAttribute('type', {
+    type: 'string',
+    validate: (value) => !value || isString(value),
+  })
   .addAttribute('url', {
     type: 'string',
     required: true,