@skillswaveca/nova-shared-libraries 4.26.0 → 4.27.0

package/docs-base/package-info.js

@@ -1,31 +1,31 @@
 export const packageInfo = [
   {
     "name": "@skillswaveca/nova-utils",
-    "version": "4.25.0",
+    "version": "4.26.0",
     "description": "A collection of random utils used in nova repos",
     "docsPath": "./nova-utils/index.html"
   },
   {
     "name": "@skillswaveca/nova-router",
-    "version": "4.25.0",
+    "version": "4.26.0",
     "description": "An extended Koa router that enables better validation",
     "docsPath": "./nova-router/index.html"
   },
   {
     "name": "@skillswaveca/nova-model",
-    "version": "4.25.0",
+    "version": "4.26.0",
     "description": "Nova model stuff",
     "docsPath": "./nova-model/index.html"
   },
   {
     "name": "@skillswaveca/nova-middleware",
-    "version": "4.25.0",
+    "version": "4.26.0",
     "description": "A collection of middleware used by nova projects",
     "docsPath": "./nova-middleware/index.html"
   },
   {
     "name": "@skillswaveca/nova-drivers",
-    "version": "4.25.0",
+    "version": "4.26.0",
     "description": "Some helper drivers for AWS services",
     "docsPath": "./drivers/index.html"
   }

package/package.json

@@ -3,7 +3,7 @@
   "name": "@skillswaveca/nova-shared-libraries",
   "description": "A monorepo of shared libraries for Nova projects.",
   "repository": "https://github.com/SkillsWave/nova-shared-libraries",
-  "version": "4.26.0",
+  "version": "4.27.0",
   "main": "index.js",
   "license": "MIT",
   "keywords": [],

package/packages/drivers/package.json

@@ -3,7 +3,7 @@
   "name": "@skillswaveca/nova-drivers",
   "description": "Some helper drivers for AWS services",
   "repository": "https://github.com/SkillsWave/nova-shared-libraries",
-  "version": "4.26.0",
+  "version": "4.27.0",
   "main": "index.js",
   "scripts": {
     "pre-release": "pnpm run create-index",

package/packages/drivers/src/hubspot.js

@@ -113,8 +113,8 @@ export class HubSpotDriver extends NovaDriver {
 
     /**
      * Updates a HubSpot deal with the given properties.
-     * @param {string} dealId 
-     * @param {object} properties 
+     * @param {string} dealId
+     * @param {object} properties
      * @returns The updated deal object.
      */
     async updateDeal(dealId, properties) {
@@ -123,7 +123,7 @@ export class HubSpotDriver extends NovaDriver {
 
     /**
      * Looks up a HubSpot contact ID for a given user. May return multiple IDs.
-     * @param {Object} user 
+     * @param {Object} user
      * @returns {Promise<string[]|null>} An array of HubSpot contact IDs or null if no contact is found.
      */
     async lookupUserContactId(user) {
@@ -152,7 +152,7 @@ export class HubSpotDriver extends NovaDriver {
 
     /**
      * Creates or updates a HubSpot contact. If the provided user has a `hubSpotContactId`, it will update the existing contact; otherwise, it will create a new one.
-     * @param {object} user 
+     * @param {object} user
      * @returns {object} The created/updated HubSpot user.
      */
     async upsertUser(user) {
@@ -169,7 +169,7 @@ export class HubSpotDriver extends NovaDriver {
 
     /**
      * Deletes a HubSpot user.
-     * @param {object} user 
+     * @param {object} user
      * @returns {Promise<void>}
      */
     async deleteUser(user) {
@@ -184,7 +184,7 @@ export class HubSpotDriver extends NovaDriver {
     /**
      * Sends a custom event to HubSpot using the event definitions.
      * This method validates the event data against the predefined schema before sending.
-     * 
+     *
      * @param {string} eventName - The name of the event to send
      * @param {object} eventData - The event data to send
      * @returns {Promise<object>} The response from HubSpot API
@@ -192,6 +192,7 @@ export class HubSpotDriver extends NovaDriver {
      */
     async sendEvent(eventName, eventData) {
         try {
+            log.error({ eventName, eventData }, 'Sending event to HubSpot');
             // Validate the event exists and get its definition
             const eventDefinition = getEventDefinition(eventName);
             if (!eventDefinition) {
@@ -204,7 +205,7 @@ export class HubSpotDriver extends NovaDriver {
             const eventMetadata = await getEventMetadata(eventName, validatedData);
 
             const response = await this._callHubSpot('events.send.basicApi.send', {
-                eventName: `pe${this.accountId}_${eventName}`,
+                eventName: `pe${this.accountId}_${eventDefinition.name}`,
                 properties: validatedData,
                 occurredAt: new Date(),
                 ...eventMetadata,
@@ -213,14 +214,14 @@ export class HubSpotDriver extends NovaDriver {
             log.debug({ eventName, response }, 'Event sent to HubSpot successfully');
             return response;
         } catch (error) {
-            log.error({ 
-                eventName, 
-                eventData, 
+            log.error({
+                eventName,
+                eventData,
                 error: error.message,
-                stack: error.stack 
+                stack: error.stack
             }, 'Unexpected error while sending event');
-            
+
             throw error;
         }
     }
-}
+}

package/packages/nova-middleware/package.json

@@ -3,7 +3,7 @@
   "name": "@skillswaveca/nova-middleware",
   "description": "A collection of middleware used by nova projects",
   "repository": "https://github.com/SkillsWave/nova-shared-libraries",
-  "version": "4.26.0",
+  "version": "4.27.0",
   "main": "index.js",
   "scripts": {
     "pre-release": "pnpm run create-index",

package/packages/nova-model/package.json

@@ -3,7 +3,7 @@
   "name": "@skillswaveca/nova-model",
   "description": "Nova model stuff",
   "repository": "https://github.com/SkillsWave/nova-shared-libraries",
-  "version": "4.26.0",
+  "version": "4.27.0",
   "main": "index.js",
   "scripts": {
     "pre-release": "pnpm run create-index",

package/packages/nova-router/package.json

@@ -3,7 +3,7 @@
   "name": "@skillswaveca/nova-router",
   "description": "An extended Koa router that enables better validation",
   "repository": "https://github.com/SkillsWave/nova-shared-libraries",
-  "version": "4.26.0",
+  "version": "4.27.0",
   "main": "index.js",
   "scripts": {
     "pre-release": "pnpm run create-index",

package/packages/nova-utils/package.json

@@ -3,7 +3,7 @@
   "name": "@skillswaveca/nova-utils",
   "description": "A collection of random utils used in nova repos",
   "repository": "https://github.com/SkillsWave/nova-shared-libraries",
-  "version": "4.26.0",
+  "version": "4.27.0",
   "main": "index.js",
   "scripts": {
     "pre-release": "pnpm run create-index",

package/packages/nova-utils/src/event-definitions.js

@@ -11,151 +11,146 @@ import * as yup from 'yup';
  * - validator: Yup validation schema for the event data
  */
 
+const TENANT_PROPERTIES = {
+  tenant_id: {
+    type: 'string',
+    required: true,
+    description: 'The ID of the tenant',
+  },
+  tenant_name: {
+    type: 'string',
+    required: true,
+    description: 'The name of the tenant',
+  },
+};
+
+const TENANT_PROPERTIES_VALIDATOR = {
+  tenant_id: yup.string().required('Tenant ID is required'),
+  tenant_name: yup.string().required('Tenant name is required'),
+};
+
+const TENANT_METADATA_PROPERTIES = data => {
+  return {
+    tenant_id: data.tenant_id,
+    tenant_name: data.tenant_name,
+  };
+};
+
 const clientOnboardingCompletedEventDefinition = {
+  key: 'clientOnboardingCompleted',
   name: 'client_onboarding_completed',
   description: 'Client has finished PLG onboarding and pressed "create workspace."',
   properties: {
+    ...TENANT_PROPERTIES,
     email: {
       type: 'string',
       required: true,
       description: 'Email address of the user',
     },
-    tenant_id: {
-      type: 'string',
-      required: true,
-      description: 'The ID of the tenant that was created',
-    },
-    tenant_name: {
-      type: 'string',
-      required: true,
-      description: 'The name of the tenant that was created',
-    },
   },
   validator: yup.object({
+    ...TENANT_PROPERTIES_VALIDATOR,
     email: yup.string().email('Must be a valid email').required('Email is required'),
   }),
   getMetadata: eventData => {
     return {
+      ...TENANT_METADATA_PROPERTIES(eventData),
       email: eventData.email,
     };
   },
 };
 
 const usersInvitedEventDefinition = {
+  key: 'usersInvited',
   name: 'users_invited',
   description: 'PLG Admin has invited one or more users to their workspace.',
   properties: {
+    ...TENANT_PROPERTIES,
     email: {
       type: 'string',
       required: true,
       description: 'Email address of the user',
     },
-    tenant_id: {
-      type: 'string',
-      required: true,
-      description: 'The ID of the tenant that was created',
-    },
-    tenant_name: {
-      type: 'string',
-      required: true,
-      description: 'The name of the tenant that was created',
-    },
   },
   validator: yup.object({
+    ...TENANT_PROPERTIES_VALIDATOR,
     email: yup.string().email('Must be a valid email').required('Email is required'),
   }),
   getMetadata: eventData => {
     return {
+      ...TENANT_METADATA_PROPERTIES(eventData),
       email: eventData.email,
     };
   },
 };
 
 const creditCardEventDefinition = {
+  key: 'creditCardAdded',
   name: 'credit_card_added',
   description: 'PLG Admin added a credit card in Stripe.',
   properties: {
+    ...TENANT_PROPERTIES,
     email: {
       type: 'string',
       required: true,
       description: 'Email address of the user',
     },
-    tenant_id: {
-      type: 'string',
-      required: true,
-      description: 'The ID of the tenant that was created',
-    },
-    tenant_name: {
-      type: 'string',
-      required: true,
-      description: 'The name of the tenant that was created',
-    },
   },
   validator: yup.object({
+    ...TENANT_PROPERTIES_VALIDATOR,
     email: yup.string().email('Must be a valid email').required('Email is required'),
   }),
   getMetadata: eventData => {
     return {
+      ...TENANT_METADATA_PROPERTIES(eventData),
       email: eventData.email,
     };
   },
 };
 
 const firstRequestSubmittedEventDefinition = {
+  key: 'firstRequestSubmitted',
   name: 'first_request_submitted',
   description: 'A user in the PLG workspace has submitted the first request.',
   properties: {
+    ...TENANT_PROPERTIES,
     email: {
       type: 'string',
       required: true,
       description: 'Email address of the user',
     },
-    tenant_id: {
-      type: 'string',
-      required: true,
-      description: 'The ID of the tenant that was created',
-    },
-    tenant_name: {
-      type: 'string',
-      required: true,
-      description: 'The name of the tenant that was created',
-    },
   },
   validator: yup.object({
+    ...TENANT_PROPERTIES_VALIDATOR,
     email: yup.string().email('Must be a valid email').required('Email is required'),
   }),
   getMetadata: eventData => {
     return {
+      ...TENANT_METADATA_PROPERTIES(eventData),
       email: eventData.email,
     };
   },
 };
 
 const transactionsThresholdMetEventDefinition = {
+  key: 'transactionsThresholdMet',
   name: 'transactions_threshold_met',
   description: 'The PLG tenant has completed a specified number of transactions.',
   properties: {
+    ...TENANT_PROPERTIES,
     email: {
       type: 'string',
       required: true,
       description: 'Email address of the user',
     },
-    tenant_id: {
-      type: 'string',
-      required: true,
-      description: 'The ID of the tenant that was created',
-    },
-    tenant_name: {
-      type: 'string',
-      required: true,
-      description: 'The name of the tenant that was created',
-    },
   },
   validator: yup.object({
+    ...TENANT_PROPERTIES_VALIDATOR,
     email: yup.string().email('Must be a valid email').required('Email is required'),
   }),
   getMetadata: eventData => {
     return {
+      ...TENANT_METADATA_PROPERTIES(eventData),
       email: eventData.email,
     };
   },
@@ -166,11 +161,11 @@ const transactionsThresholdMetEventDefinition = {
  * Key: event name, Value: event definition object
  */
 export const eventDefinitions = {
-  [clientOnboardingCompletedEventDefinition.name]: clientOnboardingCompletedEventDefinition,
-  [usersInvitedEventDefinition.name]: usersInvitedEventDefinition,
-  [creditCardEventDefinition.name]: creditCardEventDefinition,
-  [firstRequestSubmittedEventDefinition.name]: firstRequestSubmittedEventDefinition,
-  [transactionsThresholdMetEventDefinition.name]: transactionsThresholdMetEventDefinition,
+  [clientOnboardingCompletedEventDefinition.key]: clientOnboardingCompletedEventDefinition,
+  [usersInvitedEventDefinition.key]: usersInvitedEventDefinition,
+  [creditCardEventDefinition.key]: creditCardEventDefinition,
+  [firstRequestSubmittedEventDefinition.key]: firstRequestSubmittedEventDefinition,
+  [transactionsThresholdMetEventDefinition.key]: transactionsThresholdMetEventDefinition,
 };
 /**
  * Get event definition by name