@felloh-org/lambda-wrapper 1.10.8 → 1.10.10

package/dist/dependency-injection/dependency-injection.js

@@ -21,6 +21,7 @@ class DependencyInjection {
   constructor(configuration, event, context) {
     this.event = event;
     this.context = context;
+    this.lumigo = null;
     this.dependencies = {};
     this.configuration = configuration;
 
@@ -129,6 +130,33 @@ class DependencyInjection {
   get definitions() {
     return this.configuration.DEFINITIONS;
   }
+  /**
+   * Set Lumigo
+   * @param lumigo
+   */
+
+
+  setLumigo(lumigo) {
+    this.lumigo = lumigo;
+  }
+  /**
+   * Get Lumigo
+   * @return {null}
+   */
+
+
+  getLumigo() {
+    return this.lumigo;
+  }
+  /**
+   * Check to see whether lumigo is enabled
+   * @return {boolean}
+   */
+
+
+  lumigoIsEnabled() {
+    return this.lumigo !== null;
+  }
 
 }
 

package/dist/entity/saltedge/account/index.js

@@ -15,7 +15,7 @@ var _account = _interopRequireDefault(require("../../bank/account"));
 
 var _lead = _interopRequireDefault(require("../lead"));
 
-var _dec, _dec2, _dec3, _dec4, _dec5, _dec6, _dec7, _dec8, _dec9, _dec10, _dec11, _dec12, _dec13, _dec14, _dec15, _class, _class2, _descriptor, _descriptor2, _descriptor3, _descriptor4, _descriptor5, _descriptor6, _descriptor7, _descriptor8, _descriptor9, _descriptor10;
+var _dec, _dec2, _dec3, _dec4, _dec5, _dec6, _dec7, _dec8, _dec9, _dec10, _dec11, _dec12, _dec13, _dec14, _dec15, _dec16, _dec17, _class, _class2, _descriptor, _descriptor2, _descriptor3, _descriptor4, _descriptor5, _descriptor6, _descriptor7, _descriptor8, _descriptor9, _descriptor10, _descriptor11;
 
 function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }
 
@@ -40,22 +40,35 @@ let Account = (_dec = (0, _typeorm.Entity)({
 }), _dec7 = (0, _typeorm.ManyToOne)(() => _organisation.default), _dec8 = (0, _typeorm.JoinColumn)({
   name: 'organisation_id',
   referencedColumnName: 'id'
-}), _dec9 = (0, _typeorm.ManyToOne)(() => _account.default), _dec10 = (0, _typeorm.JoinColumn)({
+}), _dec9 = (0, _typeorm.ManyToMany)(() => _organisation.default, () => {}, {
+  cascade: true
+}), _dec10 = (0, _typeorm.JoinTable)({
+  name: "account_organisation",
+  schema: "saltedge",
+  joinColumn: {
+    name: "account_id",
+    referencedColumnName: "id"
+  },
+  inverseJoinColumn: {
+    name: "organisation_id",
+    referencedColumnName: "id"
+  }
+}), _dec11 = (0, _typeorm.ManyToOne)(() => _account.default), _dec12 = (0, _typeorm.JoinColumn)({
   name: 'iban',
   referencedColumnName: 'iban',
   nullable: true
-}), _dec11 = (0, _typeorm.Column)({
+}), _dec13 = (0, _typeorm.Column)({
   type: "varchar",
   length: "150",
   nullable: true
-}), _dec12 = (0, _typeorm.CreateDateColumn)({
+}), _dec14 = (0, _typeorm.CreateDateColumn)({
   type: 'timestamp with time zone'
-}), _dec13 = (0, _typeorm.UpdateDateColumn)({
+}), _dec15 = (0, _typeorm.UpdateDateColumn)({
   type: 'timestamp with time zone'
-}), _dec14 = (0, _typeorm.Column)({
+}), _dec16 = (0, _typeorm.Column)({
   type: "int",
   nullable: true
-}), _dec15 = (0, _typeorm.Column)({
+}), _dec17 = (0, _typeorm.Column)({
   type: "varchar",
   length: "5",
   nullable: true
@@ -69,17 +82,19 @@ let Account = (_dec = (0, _typeorm.Entity)({
 
     _initializerDefineProperty(this, "organisation", _descriptor4, this);
 
-    _initializerDefineProperty(this, "iban", _descriptor5, this);
+    _initializerDefineProperty(this, "organisations", _descriptor5, this);
+
+    _initializerDefineProperty(this, "iban", _descriptor6, this);
 
-    _initializerDefineProperty(this, "name", _descriptor6, this);
+    _initializerDefineProperty(this, "name", _descriptor7, this);
 
-    _initializerDefineProperty(this, "created_at", _descriptor7, this);
+    _initializerDefineProperty(this, "created_at", _descriptor8, this);
 
-    _initializerDefineProperty(this, "updated_at", _descriptor8, this);
+    _initializerDefineProperty(this, "updated_at", _descriptor9, this);
 
-    _initializerDefineProperty(this, "balance", _descriptor9, this);
+    _initializerDefineProperty(this, "balance", _descriptor10, this);
 
-    _initializerDefineProperty(this, "currency", _descriptor10, this);
+    _initializerDefineProperty(this, "currency", _descriptor11, this);
   }
 
 }, (_descriptor = _applyDecoratedDescriptor(_class2.prototype, "id", [_dec2], {
@@ -110,36 +125,41 @@ let Account = (_dec = (0, _typeorm.Entity)({
   initializer: function () {
     return _organisation.default;
   }
-}), _descriptor5 = _applyDecoratedDescriptor(_class2.prototype, "iban", [_dec9, _dec10], {
+}), _descriptor5 = _applyDecoratedDescriptor(_class2.prototype, "organisations", [_dec9, _dec10], {
+  configurable: true,
+  enumerable: true,
+  writable: true,
+  initializer: null
+}), _descriptor6 = _applyDecoratedDescriptor(_class2.prototype, "iban", [_dec11, _dec12], {
   configurable: true,
   enumerable: true,
   writable: true,
   initializer: function () {
     return _account.default;
   }
-}), _descriptor6 = _applyDecoratedDescriptor(_class2.prototype, "name", [_dec11], {
+}), _descriptor7 = _applyDecoratedDescriptor(_class2.prototype, "name", [_dec13], {
   configurable: true,
   enumerable: true,
   writable: true,
   initializer: function () {
     return "";
   }
-}), _descriptor7 = _applyDecoratedDescriptor(_class2.prototype, "created_at", [_dec12], {
+}), _descriptor8 = _applyDecoratedDescriptor(_class2.prototype, "created_at", [_dec14], {
   configurable: true,
   enumerable: true,
   writable: true,
   initializer: null
-}), _descriptor8 = _applyDecoratedDescriptor(_class2.prototype, "updated_at", [_dec13], {
+}), _descriptor9 = _applyDecoratedDescriptor(_class2.prototype, "updated_at", [_dec15], {
   configurable: true,
   enumerable: true,
   writable: true,
   initializer: null
-}), _descriptor9 = _applyDecoratedDescriptor(_class2.prototype, "balance", [_dec14], {
+}), _descriptor10 = _applyDecoratedDescriptor(_class2.prototype, "balance", [_dec16], {
   configurable: true,
   enumerable: true,
   writable: true,
   initializer: null
-}), _descriptor10 = _applyDecoratedDescriptor(_class2.prototype, "currency", [_dec15], {
+}), _descriptor11 = _applyDecoratedDescriptor(_class2.prototype, "currency", [_dec17], {
   configurable: true,
   enumerable: true,
   writable: true,

package/dist/migration/saltedge/1686156816151-saltedge_multi_account.js

@@ -0,0 +1,21 @@
+const { MigrationInterface, QueryRunner } = require("typeorm");
+
+module.exports = class saltedgeMultiAccount1686156816151 {
+    name = 'saltedgeMultiAccount1686156816151'
+
+    async up(queryRunner) {
+        await queryRunner.query(`CREATE TABLE "saltedge"."account_organisation" ("organisation_id" character varying(150) NOT NULL, "account_id" character varying(150) NOT NULL, CONSTRAINT "PK_1a2b2a8074c5ea92b737c43968e" PRIMARY KEY ("organisation_id", "account_id"))`);
+        await queryRunner.query(`CREATE INDEX "IDX_397eb56a86a22ebf84f02fdd36" ON "saltedge"."account_organisation" ("organisation_id") `);
+        await queryRunner.query(`CREATE INDEX "IDX_500714c83d3da008280f975581" ON "saltedge"."account_organisation" ("account_id") `);
+        await queryRunner.query(`ALTER TABLE "saltedge"."account_organisation" ADD CONSTRAINT "FK_397eb56a86a22ebf84f02fdd361" FOREIGN KEY ("organisation_id") REFERENCES "saltedge"."account"("id") ON DELETE CASCADE ON UPDATE CASCADE`);
+        await queryRunner.query(`ALTER TABLE "saltedge"."account_organisation" ADD CONSTRAINT "FK_500714c83d3da008280f9755811" FOREIGN KEY ("account_id") REFERENCES "user"."organisation"("id") ON DELETE CASCADE ON UPDATE CASCADE`);
+    }
+
+    async down(queryRunner) {
+        await queryRunner.query(`ALTER TABLE "saltedge"."account_organisation" DROP CONSTRAINT "FK_500714c83d3da008280f9755811"`);
+        await queryRunner.query(`ALTER TABLE "saltedge"."account_organisation" DROP CONSTRAINT "FK_397eb56a86a22ebf84f02fdd361"`);
+        await queryRunner.query(`DROP INDEX "saltedge"."IDX_500714c83d3da008280f975581"`);
+        await queryRunner.query(`DROP INDEX "saltedge"."IDX_397eb56a86a22ebf84f02fdd36"`);
+        await queryRunner.query(`DROP TABLE "saltedge"."account_organisation"`);
+    }
+}

package/dist/migration/saltedge/1686157077928-saltedge_multi_account_fix.js

@@ -0,0 +1,19 @@
+const { MigrationInterface, QueryRunner } = require("typeorm");
+
+module.exports = class saltedgeMultiAccountFix1686157077928 {
+    name = 'saltedgeMultiAccountFix1686157077928'
+
+    async up(queryRunner) {
+        await queryRunner.query(`ALTER TABLE "saltedge"."account_organisation" DROP CONSTRAINT "FK_397eb56a86a22ebf84f02fdd361"`);
+        await queryRunner.query(`ALTER TABLE "saltedge"."account_organisation" DROP CONSTRAINT "FK_500714c83d3da008280f9755811"`);
+        await queryRunner.query(`ALTER TABLE "saltedge"."account_organisation" ADD CONSTRAINT "FK_500714c83d3da008280f9755811" FOREIGN KEY ("account_id") REFERENCES "saltedge"."account"("id") ON DELETE CASCADE ON UPDATE CASCADE`);
+        await queryRunner.query(`ALTER TABLE "saltedge"."account_organisation" ADD CONSTRAINT "FK_397eb56a86a22ebf84f02fdd361" FOREIGN KEY ("organisation_id") REFERENCES "user"."organisation"("id") ON DELETE CASCADE ON UPDATE CASCADE`);
+    }
+
+    async down(queryRunner) {
+        await queryRunner.query(`ALTER TABLE "saltedge"."account_organisation" DROP CONSTRAINT "FK_397eb56a86a22ebf84f02fdd361"`);
+        await queryRunner.query(`ALTER TABLE "saltedge"."account_organisation" DROP CONSTRAINT "FK_500714c83d3da008280f9755811"`);
+        await queryRunner.query(`ALTER TABLE "saltedge"."account_organisation" ADD CONSTRAINT "FK_500714c83d3da008280f9755811" FOREIGN KEY ("account_id") REFERENCES "user"."organisation"("id") ON DELETE CASCADE ON UPDATE CASCADE`);
+        await queryRunner.query(`ALTER TABLE "saltedge"."account_organisation" ADD CONSTRAINT "FK_397eb56a86a22ebf84f02fdd361" FOREIGN KEY ("organisation_id") REFERENCES "saltedge"."account"("id") ON DELETE CASCADE ON UPDATE CASCADE`);
+    }
+}

package/dist/service/logger.js

@@ -5,8 +5,6 @@ Object.defineProperty(exports, "__esModule", {
 });
 exports.default = void 0;
 
-var _epsagon = _interopRequireDefault(require("epsagon"));
-
 var _winston = _interopRequireDefault(require("winston"));
 
 var _dependencyAware = _interopRequireDefault(require("../dependency-injection/dependency-aware"));
@@ -19,6 +17,8 @@ function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { de
 class Logger extends _dependencyAware.default {
   constructor(di) {
     super(di);
+    this.lumigo = di.getLumigo();
+    this.lumigoIsEnabled = di.lumigoIsEnabled();
     this.winston = null;
   }
   /**
@@ -136,8 +136,10 @@ class Logger extends _dependencyAware.default {
 
 
   error(error, message = '') {
-    if (typeof process.env.EPSAGON_TOKEN === 'string' && process.env.EPSAGON_TOKEN !== 'undefined' && typeof process.env.EPSAGON_SERVICE_NAME === 'string' && process.env.EPSAGON_SERVICE_NAME !== 'undefined' && error instanceof Error) {
-      _epsagon.default.setError(error);
+    if (this.lumigoIsEnabled) {
+      this.lumigo.error('error', {
+        err: error
+      });
     }
 
     this.logger.log('error', message, {
@@ -154,6 +156,10 @@ class Logger extends _dependencyAware.default {
 
 
   info(message) {
+    if (this.lumigoIsEnabled) {
+      this.lumigo.info(message);
+    }
+
     this.logger.log('info', this.processMessage(message));
   }
   /**
@@ -172,6 +178,12 @@ class Logger extends _dependencyAware.default {
   warning(error) {
     const softWarningValues = ['true', '1'];
 
+    if (this.lumigoIsEnabled) {
+      this.lumigo.info('warning', {
+        err: error
+      });
+    }
+
     if (softWarningValues.includes(process.env.LOGGER_SOFT_WARNING)) {
       return this.info(error);
     }
@@ -187,8 +199,8 @@ class Logger extends _dependencyAware.default {
 
 
   label(descriptor, silent = false) {
-    if (typeof process.env.EPSAGON_TOKEN === 'string' && process.env.EPSAGON_TOKEN !== 'undefined' && typeof process.env.EPSAGON_SERVICE_NAME === 'string' && process.env.EPSAGON_SERVICE_NAME !== 'undefined') {
-      _epsagon.default.label(descriptor);
+    if (this.lumigoIsEnabled) {
+      this.lumigo.addExecutionTag(descriptor);
     }
 
     if (silent === false) {
@@ -205,8 +217,8 @@ class Logger extends _dependencyAware.default {
 
 
   metric(descriptor, stat, silent = false) {
-    if (typeof process.env.EPSAGON_TOKEN === 'string' && process.env.EPSAGON_TOKEN !== 'undefined' && typeof process.env.EPSAGON_SERVICE_NAME === 'string' && process.env.EPSAGON_SERVICE_NAME !== 'undefined') {
-      _epsagon.default.label(descriptor, stat);
+    if (this.lumigoIsEnabled) {
+      this.lumigo.addExecutionTag(descriptor, stat);
     }
 
     if (silent === false) {

package/dist/wrapper/index.js

@@ -5,7 +5,7 @@ Object.defineProperty(exports, "__esModule", {
 });
 exports.handleSuccess = exports.handleError = exports.default = void 0;
 
-var _epsagon = _interopRequireDefault(require("epsagon"));
+var _tracer = _interopRequireDefault(require("@lumigo/tracer"));
 
 var _dependencies = require("../config/dependencies");
 
@@ -38,19 +38,7 @@ const handleSuccess = (di, outcome) => {
   return outcome;
 };
 /**
- * Gracefully handles an error
- * logging in Epsagon and generating
- * a response reflecting the `code`
- * of the error, if defined.
- *
- * Note about Epsagon:
- * Epsagon generates alerts for logs on level ERROR.
- * This means that logger.error will produce an alert.
- * To avoid not meaningful notifications, most likely
- * coming from tests, we log INFO unless either:
- *
- * 1. `error.raiseOnEpsagon` is defined & truthy
- * 2. `error.code` is defined and `error.code >= 500`.
+ * Handle an error
  *
  * @param {DependencyInjection} di
  * @param {Error} error
@@ -97,8 +85,17 @@ const handleError = (di, error) => {
 exports.handleError = handleError;
 
 const wrapper = (configuration, handler, throwError = false) => {
+  let lumigo = null;
+
+  if (typeof process.env.LUMIGO_TOKEN === 'string' && process.env.LUMIGO_TOKEN !== 'undefined') {
+    lumigo = (0, _tracer.default)({
+      token: process.env.LUMIGO_TOKEN
+    });
+  }
+
   let instance = (event, context, callback) => {
     const di = new _dependencyInjection.default(configuration, event, context);
+    di.setLumigo(lumigo);
     const request = di.get(_dependencies.DEFINITIONS.REQUEST);
     const logger = di.get(_dependencies.DEFINITIONS.LOGGER);
     context.callbackWaitsForEmptyEventLoop = false; // If the event is to trigger a warm up, then don't bother returning the function.
@@ -146,16 +143,11 @@ const wrapper = (configuration, handler, throwError = false) => {
     }
 
     return outcome;
-  }; // If the Epsagon token is enabled, then wrap the instance in the Epsagon wrapper
+  }; // If the Lumigo token is enabled, then wrap the instance in the Lumigo wrapper
 
 
-  if (typeof process.env.EPSAGON_TOKEN === 'string' && process.env.EPSAGON_TOKEN !== 'undefined' && typeof process.env.EPSAGON_SERVICE_NAME === 'string' && process.env.EPSAGON_SERVICE_NAME !== 'undefined') {
-    _epsagon.default.init({
-      token: process.env.EPSAGON_TOKEN,
-      appName: process.env.EPSAGON_SERVICE_NAME
-    });
-
-    instance = _epsagon.default.lambdaWrapper(instance);
+  if (lumigo !== null) {
+    instance = lumigo.trace(instance);
   }
 
   return instance;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@felloh-org/lambda-wrapper",
-  "version": "1.10.8",
+  "version": "1.10.10",
   "description": "Lambda wrapper for all Felloh Serverless Projects",
   "main": "dist/index.js",
   "engines": {
@@ -54,6 +54,7 @@
     "aws-sdk": ">=2.831.0"
   },
   "dependencies": {
+    "@lumigo/tracer": "^1.83.0",
     "alai": "^1.0.3",
     "async": "^3.2.3",
     "axios": "^0.26.1",