@adtrackify/at-service-common 1.1.7 → 1.1.8

package/src/__tests__/helpers/subscription-helper.spec.ts

@@ -1,41 +1,41 @@
-
-/**
- * @group unit
- */
-
-/* eslint-disable */
-
-jest.mock('lambda-log');
-import * as Logger from 'lambda-log';
-import { getPlanDetails } from '../../helpers';
-
-describe('postmark service email test', () => {
-  jest.spyOn(Logger, 'warn').mockImplementation(() => {
-    return new Logger.LogMessage({ level: 'null', msg: 'null' }, {});
-  });
-  jest.spyOn(Logger, 'info').mockImplementation(() => {
-    return new Logger.LogMessage({ level: 'null', msg: 'null' }, {});
-  });
-  jest.spyOn(Logger, 'debug').mockImplementation(() => {
-    return new Logger.LogMessage({ level: 'null', msg: 'null' }, {});
-  });
-  jest.spyOn(Logger, 'error').mockImplementation(() => {
-    return new Logger.LogMessage({ level: 'null', msg: 'null' }, {});
-  });
-
-  beforeEach(async () => {
-
-  });
-
-  afterEach(() => {
-    jest.resetAllMocks();
-  });
-
-
-  it('should call send email message', async () => {
-    const plan = getPlanDetails(2, 'dev');
-    console.log(plan);
-    expect(plan).not.toEqual(null);
-  });
-
+
+/**
+ * @group unit
+ */
+
+/* eslint-disable */
+
+jest.mock('lambda-log');
+import * as Logger from 'lambda-log';
+import { getPlanDetails } from '../../helpers';
+
+describe('postmark service email test', () => {
+  jest.spyOn(Logger, 'warn').mockImplementation(() => {
+    return new Logger.LogMessage({ level: 'null', msg: 'null' }, {});
+  });
+  jest.spyOn(Logger, 'info').mockImplementation(() => {
+    return new Logger.LogMessage({ level: 'null', msg: 'null' }, {});
+  });
+  jest.spyOn(Logger, 'debug').mockImplementation(() => {
+    return new Logger.LogMessage({ level: 'null', msg: 'null' }, {});
+  });
+  jest.spyOn(Logger, 'error').mockImplementation(() => {
+    return new Logger.LogMessage({ level: 'null', msg: 'null' }, {});
+  });
+
+  beforeEach(async () => {
+
+  });
+
+  afterEach(() => {
+    jest.resetAllMocks();
+  });
+
+
+  it('should call send email message', async () => {
+    const plan = getPlanDetails(2, 'dev');
+    console.log(plan);
+    expect(plan).not.toEqual(null);
+  });
+
 });

package/src/clients/generic/axios.d.ts

@@ -1,8 +1,8 @@
-declare module 'axios/lib/adapters/http' {
-  import { AxiosAdapter } from 'axios';
-
-  const httpAdapter: AxiosAdapter;
-  namespace httpAdapter { }
-
-  export = httpAdapter;
+declare module 'axios/lib/adapters/http' {
+  import { AxiosAdapter } from 'axios';
+
+  const httpAdapter: AxiosAdapter;
+  namespace httpAdapter { }
+
+  export = httpAdapter;
 }

package/src/clients/generic/dynamodb-client.ts

@@ -1,114 +1,119 @@
-import AWS from 'aws-sdk';
-import { BatchGetItemInput, QueryOutput } from 'aws-sdk/clients/dynamodb';
-import * as log from 'lambda-log';
-const client = new AWS.DynamoDB.DocumentClient();
-
-export class DynamoDbClient {
-  static safeGet = async (tableName: string, keyName: string, keyValue: any) => {
-    try {
-      const params = {
-        TableName: tableName,
-        Key: {
-          [ keyName ]: keyValue
-        }
-      };
-      const res = await client.get(params).promise();
-      return res?.Item ?? null;
-    } catch (e: any) {
-      log.error(e, { message: 'Dynamo Client Get Failed' });
-      return null;
-    }
-  };
-
-  static safePut = async (tableName: string, data: any) => {
-    try {
-      const params = {
-        TableName: tableName,
-        Item: data
-      };
-      const res = await client.put(params).promise();
-      return res;
-    } catch (e: any) {
-      log.error(e, { message: 'Dynamo failed simplePut' });
-      return null;
-    }
-  };
-
-  static safeDelete = async (tableName: string, keyName: string, keyValue: any) => {
-    try {
-      const params = {
-        TableName: tableName,
-        Key: {
-          [ keyName ]: keyValue
-        }
-      };
-      const res = await client.delete(params).promise();
-      return res;
-    } catch (e: any) {
-      log.error(e, { message: 'Dynamo failed safeDelete' });
-      return null;
-    }
-  };
-
-  static safeQueryByGSI = async (tableName: string, gsiName: string, keyName: string, keyValue: any) => {
-    const query = {
-      TableName: tableName,
-      IndexName: gsiName,
-      KeyConditionExpression: `${keyName} = :value`,
-      ExpressionAttributeValues: {
-        ':value': keyValue
-      }
-    };
-    const results = await DynamoDbClient.queryAll(query);
-    return results;
-  };
-
-  static safeBatchGet = async (tableName: string, keys: any) => {
-    try {
-      const params: BatchGetItemInput = {
-        RequestItems: {}
-      };
-      params.RequestItems[ tableName ] = {
-        Keys: keys
-      };
-      const res = await client.batchGet(params).promise();
-      log.info('batchget res', { batchGetRes: res });
-      if (res?.Responses?.[ tableName ]) {
-        return res?.Responses?.[ tableName ];
-      }
-      return [];
-    } catch (e: any) {
-      log.error(e, { message: 'Dynamo failed safeBatchGet' });
-      return [];
-    }
-  };
-
-  static queryAll = async (params: any) => {
-    try {
-      log.info('Invoke Query All', { params });
-      let currentResult: QueryOutput, exclusiveStartKey;
-      let accumulatedResults: any[] = [];
-      do {
-        params.ExclusiveStartKey = exclusiveStartKey;
-        params.Limit = 200;
-        currentResult = await client.query(params).promise();
-        if (currentResult.Items) {
-          exclusiveStartKey = currentResult.LastEvaluatedKey;
-          accumulatedResults = [ ...accumulatedResults, ...currentResult.Items ];
-        }
-      } while (currentResult.Items && currentResult.Items.length > 0 && currentResult.LastEvaluatedKey);
-      return accumulatedResults;
-    } catch (e: any) {
-      log.error(e, { message: 'Dynamo failed queryAll' });
-      return null;
-    }
-  };
-
-  static batchGet = (params: any) => client.batchGet(params).promise();
-  static get = (params: any) => client.get(params).promise();
-  static put = (params: any) => client.put(params).promise();
-  static query = (params: any) => client.query(params).promise();
-  static scan = (params: any) => client.scan(params).promise();
-  static update = (params: any) => client.update(params).promise();
-  static delete = (params: any) => client.delete(params).promise();
+import { DynamoDBClient, GetItemCommand, GetItemCommandInput, GetItemCommandOutput, PutItemCommand, PutItemCommandInput, PutItemCommandOutput, DeleteItemCommand, DeleteItemCommandInput, DeleteItemCommandOutput, BatchGetItemCommand, BatchGetItemCommandInput, BatchGetItemCommandOutput, QueryCommand, QueryCommandInput, QueryCommandOutput, ScanCommand, UpdateItemCommand } from '@aws-sdk/client-dynamodb';
+import * as log from 'lambda-log';
+const client = new DynamoDBClient({});
+
+export class DynamoDbClient {
+  static safeGet = async (tableName: string, keyName: string, keyValue: any) => {
+    try {
+      const params: GetItemCommandInput = {
+        TableName: tableName,
+        Key: {
+          [ keyName ]: keyValue
+        }
+      };
+      const getItemCommand = new GetItemCommand(params);
+      const res: GetItemCommandOutput = await client.send(getItemCommand);
+      return res?.Item ?? null;
+    } catch (e: any) {
+      log.error(e, { message: 'Dynamo Client Get Failed' });
+      return null;
+    }
+  };
+
+  static safePut = async (tableName: string, data: any) => {
+    try {
+      const params: PutItemCommandInput = {
+        TableName: tableName,
+        Item: data
+      };
+      const putItemCommand = new PutItemCommand(params);
+      const res: PutItemCommandOutput = await client.send(putItemCommand);
+      return res;
+    } catch (e: any) {
+      log.error(e, { message: 'Dynamo failed simplePut' });
+      return null;
+    }
+  };
+
+  static safeDelete = async (tableName: string, keyName: string, keyValue: any) => {
+    try {
+      const params: DeleteItemCommandInput = {
+        TableName: tableName,
+        Key: {
+          [ keyName ]: keyValue
+        }
+      };
+      const deleteItemCommand = new DeleteItemCommand(params);
+      const res: DeleteItemCommandOutput = await client.send(deleteItemCommand);
+      return res;
+    } catch (e: any) {
+      log.error(e, { message: 'Dynamo failed safeDelete' });
+      return null;
+    }
+  };
+
+  static safeQueryByGSI = async (tableName: string, gsiName: string, keyName: string, keyValue: any) => {
+    const query: QueryCommandInput = {
+      TableName: tableName,
+      IndexName: gsiName,
+      KeyConditionExpression: `${keyName} = :value`,
+      ExpressionAttributeValues: {
+        ':value': keyValue
+      }
+    };
+    const results = await DynamoDbClient.queryAll(query);
+    return results;
+  };
+
+  static safeBatchGet = async (tableName: string, keys: any) => {
+    try {
+      const params: BatchGetItemCommandInput = {
+        RequestItems: {
+          [tableName]: {
+            Keys: keys
+          }
+        }
+      };
+      const batchGetItemCommand = new BatchGetItemCommand(params);
+      const res: BatchGetItemCommandOutput = await client.send(batchGetItemCommand);
+      log.info('batchget res', { batchGetRes: res });
+      if (res?.Responses?.[ tableName ]) {
+        return res?.Responses?.[ tableName ];
+      }
+      return [];
+    } catch (e: any) {
+      log.error(e, { message: 'Dynamo failed safeBatchGet' });
+      return [];
+    }
+  };
+
+  static queryAll = async (params: QueryCommandInput) => {
+    try {
+      log.info('Invoke Query All', { params });
+      let currentResult: QueryCommandOutput, exclusiveStartKey;
+      let accumulatedResults: any[] = [];
+      do {
+        params.ExclusiveStartKey = exclusiveStartKey;
+        params.Limit = 200;
+        const queryCommand = new QueryCommand(params);
+        currentResult = await client.send(queryCommand);
+        if (currentResult.Items) {
+          exclusiveStartKey = currentResult.LastEvaluatedKey;
+          accumulatedResults = [ ...accumulatedResults, ...currentResult.Items ];
+        }
+      } while (currentResult.Items && currentResult.Items.length > 0 && currentResult.LastEvaluatedKey);
+      return accumulatedResults;
+    } catch (e: any) {
+      log.error(e, { message: 'Dynamo failed queryAll' });
+      return null;
+    }
+  };
+
+  static batchGet = (params: any) => client.send(new BatchGetItemCommand(params));
+  static get = (params: any) => client.send(new GetItemCommand(params));
+  static put = (params: any) => client.send(new PutItemCommand(params));
+  static query = (params: any) => client.send(new QueryCommand(params));
+  static scan = (params: any) => client.send(new ScanCommand(params));
+  static update = (params: any) => client.send(new UpdateItemCommand(params));
+  static delete = (params: any) => client.send(new DeleteItemCommand(params));
 }

package/src/clients/generic/eventbridge-client.ts

@@ -1,52 +1,53 @@
-import { EventBridge } from 'aws-sdk';
-import { v4 as uuidv4 } from 'uuid';
-import { getCurrentTimestamp } from '../../libs/dates';
-import * as log from 'lambda-log';
-
-export class EventBridgeClient {
-  public eventBridge: EventBridge;
-  public EVENT_BUS_NAME: string;
-
-  constructor (eventBusName: string) {
-    this.eventBridge = new EventBridge();
-    this.EVENT_BUS_NAME = eventBusName;
-  }
-
-  public buildAndSendEvent = async (eventSource: string, eventType: string, eventData: any) => {
-    const event = this.buildEvent(eventType, eventData);
-    return await this.putEvent(eventSource, eventType, event);
-  };
-
-  public buildEvent = (eventType: string, eventData: any, eventId: string = uuidv4(), eventTime: string = getCurrentTimestamp()) => {
-    return {
-      eventId,
-      eventType,
-      eventTime,
-      eventData
-    };
-  };
-
-  public putEvent = async (source: string, detailType: string, data: any, headers: any = null) => {
-    const params = {
-      Entries: [ {
-        Detail: JSON.stringify({ headers, data }),
-        DetailType: detailType,
-        EventBusName: this.EVENT_BUS_NAME,
-        Source: source,
-        Time: new Date(),
-      } ],
-    };
-    const response = await this.eventBridge.putEvents(params).promise();
-    log.debug('EventBus Event Published',
-      {
-        eventBusName: this.EVENT_BUS_NAME,
-        eventSource: source,
-        eventType: detailType,
-        event: data,
-        response
-      });
-    return response;
-  };
-
-}
-
+import { EventBridgeClient as EventBridge, PutEventsCommand, PutEventsCommandInput } from '@aws-sdk/client-eventbridge';
+import { v4 as uuidv4 } from 'uuid';
+import { getCurrentTimestamp } from '../../libs/dates';
+import * as log from 'lambda-log';
+
+export class EventBridgeClient {
+  public eventBridge: EventBridge;
+  public EVENT_BUS_NAME: string;
+
+  constructor (eventBusName: string) {
+    this.eventBridge = new EventBridge({});
+    this.EVENT_BUS_NAME = eventBusName;
+  }
+
+  public buildAndSendEvent = async (eventSource: string, eventType: string, eventData: any) => {
+    const event = this.buildEvent(eventType, eventData);
+    return await this.putEvent(eventSource, eventType, event);
+  };
+
+  public buildEvent = (eventType: string, eventData: any, eventId: string = uuidv4(), eventTime: string = getCurrentTimestamp()) => {
+    return {
+      eventId,
+      eventType,
+      eventTime,
+      eventData
+    };
+  };
+
+  public putEvent = async (source: string, detailType: string, data: any, headers: any = null) => {
+    const params: PutEventsCommandInput = {
+      Entries: [ {
+        Detail: JSON.stringify({ headers, data }),
+        DetailType: detailType,
+        EventBusName: this.EVENT_BUS_NAME,
+        Source: source,
+        Time: new Date(),
+      } ],
+    };
+    const putEventscommand = new PutEventsCommand(params);
+    const response = await this.eventBridge.send(putEventscommand);
+    log.debug('EventBus Event Published',
+      {
+        eventBusName: this.EVENT_BUS_NAME,
+        eventSource: source,
+        eventType: detailType,
+        event: data,
+        response
+      });
+    return response;
+  };
+
+}
+

package/src/clients/internal-api/destinations-client.ts

@@ -1,58 +1,58 @@
-import * as log from 'lambda-log';
-//const log = require('lambda-log');
-import { ApiResponse } from '../../types/api-response';
-import { axiosHttpService } from '../generic/http-client';
-import { Destination } from '@adtrackify/at-tracking-event-types';
-//const BASE_API_URL = process.env.BASE_API_URL;
-//const DESTINATIONS_API_KEY = process.env.DESTINATIONS_API_KEY;
-
-export interface GetDestinationsResponseData {
-  destinations: Destination[];
-  [ key: string ]: any;
-}
-export interface CreateDestinationResponseData {
-  destination: Destination;
-  [ key: string ]: any;
-}
-
-
-export class DestinationsClient {
-
-  public BASE_API_URL: string;
-  public DESTINATIONS_API_KEY: string;
-
-  constructor (baseApiUrl: string, destinationsApiKey: string) {
-    this.BASE_API_URL = baseApiUrl;
-    this.DESTINATIONS_API_KEY = destinationsApiKey;
-  }
-
-  getConfig = () => {
-    const SERVICE_API_ROOT_URL = `${this.BASE_API_URL}/destinations`;
-    return {
-      baseURL: SERVICE_API_ROOT_URL,
-      headers: {
-        common: {
-          'x-api-key': this.DESTINATIONS_API_KEY
-        }
-      }
-    };
-  };
-
-  getClient = async () => {
-    return axiosHttpService(this.getConfig());
-  };
-
-  createDestination = async (createDestinationRequest: any): Promise<ApiResponse<CreateDestinationResponseData>> => {
-    const client = await this.getClient();
-    const response = await client.post('/', createDestinationRequest);
-    log.info('createDestinationResponse', { response });
-    return response as ApiResponse<CreateDestinationResponseData>;
-  };
-
-  getPixelDestinations = async (pixelId: string): Promise<ApiResponse<GetDestinationsResponseData>> => {
-    const client = await this.getClient();
-    const response = await client.get(`/?pixelId=${pixelId}`);
-    log.info('getPixelResponse', { response });
-    return response as ApiResponse<GetDestinationsResponseData>;
-  };
-}
+import * as log from 'lambda-log';
+//const log = require('lambda-log');
+import { ApiResponse } from '../../types/api-response';
+import { axiosHttpService } from '../generic/http-client';
+import { Destination } from '@adtrackify/at-tracking-event-types';
+//const BASE_API_URL = process.env.BASE_API_URL;
+//const DESTINATIONS_API_KEY = process.env.DESTINATIONS_API_KEY;
+
+export interface GetDestinationsResponseData {
+  destinations: Destination[];
+  [ key: string ]: any;
+}
+export interface CreateDestinationResponseData {
+  destination: Destination;
+  [ key: string ]: any;
+}
+
+
+export class DestinationsClient {
+
+  public BASE_API_URL: string;
+  public DESTINATIONS_API_KEY: string;
+
+  constructor (baseApiUrl: string, destinationsApiKey: string) {
+    this.BASE_API_URL = baseApiUrl;
+    this.DESTINATIONS_API_KEY = destinationsApiKey;
+  }
+
+  getConfig = () => {
+    const SERVICE_API_ROOT_URL = `${this.BASE_API_URL}/destinations`;
+    return {
+      baseURL: SERVICE_API_ROOT_URL,
+      headers: {
+        common: {
+          'x-api-key': this.DESTINATIONS_API_KEY
+        }
+      }
+    };
+  };
+
+  getClient = async () => {
+    return axiosHttpService(this.getConfig());
+  };
+
+  createDestination = async (createDestinationRequest: any): Promise<ApiResponse<CreateDestinationResponseData>> => {
+    const client = await this.getClient();
+    const response = await client.post('/', createDestinationRequest);
+    log.info('createDestinationResponse', { response });
+    return response as ApiResponse<CreateDestinationResponseData>;
+  };
+
+  getPixelDestinations = async (pixelId: string): Promise<ApiResponse<GetDestinationsResponseData>> => {
+    const client = await this.getClient();
+    const response = await client.get(`/?pixelId=${pixelId}`);
+    log.info('getPixelResponse', { response });
+    return response as ApiResponse<GetDestinationsResponseData>;
+  };
+}

package/src/clients/internal-api/index.ts

@@ -1,4 +1,4 @@
-export * from './destinations-client';
-export * from './accounts-client';
-export * from './users-auth-client';
-export * from './shopify-app-install-client';
+export * from './destinations-client';
+export * from './accounts-client';
+export * from './users-auth-client';
+export * from './shopify-app-install-client';