@etainabl/nodejs-sdk 1.3.125 → 1.3.127

package/dist/index.d.cts

@@ -623,6 +623,7 @@ interface HandleErrorParams {
     lambdaSource: string;
     error: Error;
     accountId?: string;
+    automation: Automation<string>;
 }
 declare const collectionTypes: readonly ["readings", "consumptions", "invoices"];
 declare const errorCodes: readonly ["ACCOUNT_NOT_FOUND", "INVALID_DATE_FORMAT", "INVALID_TIME_FORMAT", "COLUMN_LIMIT_EXCEEDED", "INVALID_TIMESTAMP", "MISSING_DEVICE_ID", "UNSUPPORTED_UTILITY_TYPE", "VALIDATION_ERROR", "METER_READS_ZERO"];
@@ -638,7 +639,7 @@ interface UploadCsv {
 declare function sendEmail(lambdaSource: string, context: Context, error: Error, destinations: string[]): Promise<_aws_sdk_client_ses.SendEmailCommandOutput>;
 declare function createCsv(data: (FormattedConsumption | FormattedReading | FormattedInvoice)[]): string;
 declare function uploadCsv({ csvContent, automationRun, s3Client, orgFilename, collectionType }: UploadCsv): Promise<string>;
-declare function handleError({ etnApi, automationRun, error, lambdaSource, accountId }: HandleErrorParams): Promise<void>;
+declare function handleError({ etnApi, automationRun, error, lambdaSource, accountId, automation }: HandleErrorParams): Promise<void>;
 declare function deleteMessage(queueUrl: string, receiptHandle: string, sqsClient?: SQSClient): Promise<void>;
 
 type integrations_CollectionType = CollectionType;
@@ -670,6 +671,7 @@ interface AutomationRunLog<DateType = Date | string> {
 interface AccountResult<IDType = ObjectId | string, DateType = Date | string> {
     accountId: IDType;
     mpan: string;
+    name: string;
     deviceId?: string;
     status: 'success' | 'warning' | 'error' | 'running';
     rowsProcessed?: number;
@@ -731,7 +733,6 @@ interface AutomationRun<IDType = ObjectId | string, DateType = Date | string> {
     _id: IDType;
     automationId: IDType;
     companyId: IDType;
-    description: string;
     active: boolean;
     category: 'dataFetcher' | 'dataExtractor';
     status: 'running' | 'success' | 'failed' | 'completedWithWarnings';
@@ -793,7 +794,7 @@ interface InvoiceValidationInvoice {
     endPage: number;
     supplyAddress: string;
     utilityType: string;
-    meterIndex: number;
+    meterId: string;
     accountId?: string;
     supplierId?: string;
 }
@@ -815,8 +816,7 @@ interface InvoiceValidationResults<IDType = ObjectId | string> {
     comment: string;
     status: 'passed' | 'warning' | 'failed' | 'error';
     originalStatus: 'passed' | 'warning' | 'failed' | 'error';
-    invoiceIndex?: number;
-    meterIndex?: number;
+    meterId?: string;
     checkedAt: Date;
 }
 interface InvoiceValidation<IDType = ObjectId | string> {

package/dist/index.d.ts

@@ -623,6 +623,7 @@ interface HandleErrorParams {
     lambdaSource: string;
     error: Error;
     accountId?: string;
+    automation: Automation<string>;
 }
 declare const collectionTypes: readonly ["readings", "consumptions", "invoices"];
 declare const errorCodes: readonly ["ACCOUNT_NOT_FOUND", "INVALID_DATE_FORMAT", "INVALID_TIME_FORMAT", "COLUMN_LIMIT_EXCEEDED", "INVALID_TIMESTAMP", "MISSING_DEVICE_ID", "UNSUPPORTED_UTILITY_TYPE", "VALIDATION_ERROR", "METER_READS_ZERO"];
@@ -638,7 +639,7 @@ interface UploadCsv {
 declare function sendEmail(lambdaSource: string, context: Context, error: Error, destinations: string[]): Promise<_aws_sdk_client_ses.SendEmailCommandOutput>;
 declare function createCsv(data: (FormattedConsumption | FormattedReading | FormattedInvoice)[]): string;
 declare function uploadCsv({ csvContent, automationRun, s3Client, orgFilename, collectionType }: UploadCsv): Promise<string>;
-declare function handleError({ etnApi, automationRun, error, lambdaSource, accountId }: HandleErrorParams): Promise<void>;
+declare function handleError({ etnApi, automationRun, error, lambdaSource, accountId, automation }: HandleErrorParams): Promise<void>;
 declare function deleteMessage(queueUrl: string, receiptHandle: string, sqsClient?: SQSClient): Promise<void>;
 
 type integrations_CollectionType = CollectionType;
@@ -670,6 +671,7 @@ interface AutomationRunLog<DateType = Date | string> {
 interface AccountResult<IDType = ObjectId | string, DateType = Date | string> {
     accountId: IDType;
     mpan: string;
+    name: string;
     deviceId?: string;
     status: 'success' | 'warning' | 'error' | 'running';
     rowsProcessed?: number;
@@ -731,7 +733,6 @@ interface AutomationRun<IDType = ObjectId | string, DateType = Date | string> {
     _id: IDType;
     automationId: IDType;
     companyId: IDType;
-    description: string;
     active: boolean;
     category: 'dataFetcher' | 'dataExtractor';
     status: 'running' | 'success' | 'failed' | 'completedWithWarnings';
@@ -793,7 +794,7 @@ interface InvoiceValidationInvoice {
     endPage: number;
     supplyAddress: string;
     utilityType: string;
-    meterIndex: number;
+    meterId: string;
     accountId?: string;
     supplierId?: string;
 }
@@ -815,8 +816,7 @@ interface InvoiceValidationResults<IDType = ObjectId | string> {
     comment: string;
     status: 'passed' | 'warning' | 'failed' | 'error';
     originalStatus: 'passed' | 'warning' | 'failed' | 'error';
-    invoiceIndex?: number;
-    meterIndex?: number;
+    meterId?: string;
     checkedAt: Date;
 }
 interface InvoiceValidation<IDType = ObjectId | string> {

package/dist/index.js

@@ -21654,8 +21654,8 @@ var dataFetchersIds = ["bacnet", "solis", "solarman", "gridfetch", "smartflow",
 function sendEmail(lambdaSource, context, error, destinations) {
   const sesClient = new import_client_ses.SESClient({ region: "eu-west-1" });
   const template = emailTemplate_default({
-    title: `WARNING: ${lambdaSource} Lambda Failed`,
-    alertLevel: "warning",
+    title: `CRITICAL: ${lambdaSource} Lambda Failed`,
+    alertLevel: "critical",
     message: `Error: ${error.message}. AWS Log Stream: ${context.logStreamName}, AWS Request ID: ${context.awsRequestId}`
   });
   const emailCommand = new import_client_ses.SendEmailCommand({
@@ -21664,7 +21664,7 @@ function sendEmail(lambdaSource, context, error, destinations) {
       ToAddresses: destinations
     },
     Message: {
-      Subject: { Data: `WARNING: New Alert for the ${lambdaSource}` },
+      Subject: { Data: `CRITICAL: New Alert for the ${lambdaSource}` },
       Body: {
         Html: { Data: template }
       }
@@ -21752,27 +21752,28 @@ async function uploadCsv({ csvContent, automationRun, s3Client, orgFilename, col
     throw new Error(error);
   }
 }
-async function handleError({ etnApi, automationRun, error, lambdaSource, accountId }) {
+async function handleError({ etnApi, automationRun, error, lambdaSource, accountId, automation }) {
   await etnApi.createAutomationRunLog(automationRun._id, {
     message: error.message,
     status: "error",
     lambdaSource
   });
-  const message = automationRun.source?.fileName ? `Automation "${automationRun.description}" FAILED while processing file: ${automationRun.source.fileName}` : `Automation "${automationRun.description}" FAILED.`;
+  const { description, service } = automation;
+  const message = automationRun.source?.fileName ? `Automation "${description || service}" FAILED while processing file: ${automationRun.source.fileName}` : `Automation "${description}" FAILED.`;
   await etnApi.createLog({
     message,
     context: {
       status: "error",
       error: error.message,
       automationId: automationRun.automationId,
-      automationDescription: automationRun.description,
+      automationDescription: description,
       automationRunId: automationRun._id
     },
     type: "automation-ingest",
     userSub: lambdaSource,
     companyId: automationRun.companyId
   });
-  if (accountId) {
+  if (automationRun.category === "dataFetcher" && accountId) {
     await etnApi.updateAccountStatusForAutomation(automationRun.automationId, accountId, { status: "error" });
   }
 }