@felloh-org/lambda-wrapper 1.10.7 → 1.10.9

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/agent-data/booking/index.js

@@ -136,7 +136,7 @@ let Booking = (_dec = (0, _typeorm.Entity)({
   /**
    * Get Public Data
    * @param showTemporaryFlag
-   * @returns {{components: [], departure_date: string, created_at: Date, organisation: null, booking_reference: string, gross_amount: number, transactions: [], payment_links: [], id: *|string, customer_name: string, user: null, email: string, return_date: string}}
+   * @return {{components: [], departure_date: string, created_at: Date, organisation: null, booking_reference: string, gross_amount: number, transactions: [], payment_links: [], atol_receipt_number: string, currency: string, id: *|string, customer_name: string, user: null, email: string, return_date: string}}
    */
   getPublicData(showTemporaryFlag = false) {
     const response = {

package/dist/entity/user/index.js

@@ -29,8 +29,10 @@ var _organisationPayoutConfig = _interopRequireDefault(require("./organisation-p
 
 var _organisationType = _interopRequireDefault(require("./organisation-type"));
 
+var _organisationPartner = _interopRequireDefault(require("./organisation-partner"));
+
 function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }
 
-const ENTITIES = [_organisation.default, _role.default, _userRole.default, _user.default, _userActivity.default, _feature.default, _organisationFeature.default, _loginLink.default, _webhookTypes.default, _organisationWebhook.default, _organisationPayoutConfig.default, _organisationType.default];
+const ENTITIES = [_organisation.default, _role.default, _userRole.default, _user.default, _userActivity.default, _feature.default, _organisationFeature.default, _loginLink.default, _webhookTypes.default, _organisationWebhook.default, _organisationPayoutConfig.default, _organisationType.default, _organisationPartner.default];
 var _default = ENTITIES;
 exports.default = _default;

package/dist/entity/user/organisation-partner/index.js

@@ -0,0 +1,67 @@
+"use strict";
+
+Object.defineProperty(exports, "__esModule", {
+  value: true
+});
+exports.default = void 0;
+
+var _typeorm = require("typeorm");
+
+var _organisation = _interopRequireDefault(require("../organisation"));
+
+var _dec, _dec2, _dec3, _dec4, _dec5, _dec6, _dec7, _class, _class2, _descriptor, _descriptor2, _descriptor3, _descriptor4;
+
+function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }
+
+function _initializerDefineProperty(target, property, descriptor, context) { if (!descriptor) return; Object.defineProperty(target, property, { enumerable: descriptor.enumerable, configurable: descriptor.configurable, writable: descriptor.writable, value: descriptor.initializer ? descriptor.initializer.call(context) : void 0 }); }
+
+function _applyDecoratedDescriptor(target, property, decorators, descriptor, context) { var desc = {}; Object.keys(descriptor).forEach(function (key) { desc[key] = descriptor[key]; }); desc.enumerable = !!desc.enumerable; desc.configurable = !!desc.configurable; if ('value' in desc || desc.initializer) { desc.writable = true; } desc = decorators.slice().reverse().reduce(function (desc, decorator) { return decorator(target, property, desc) || desc; }, desc); if (context && desc.initializer !== void 0) { desc.value = desc.initializer ? desc.initializer.call(context) : void 0; desc.initializer = undefined; } if (desc.initializer === void 0) { Object.defineProperty(target, property, desc); desc = null; } return desc; }
+
+function _initializerWarningHelper(descriptor, context) { throw new Error('Decorating class property failed. Please ensure that ' + 'proposal-class-properties is enabled and runs after the decorators transform.'); }
+
+let OrganisationPartner = (_dec = (0, _typeorm.Entity)({
+  name: 'organisation_partner',
+  schema: 'user'
+}), _dec2 = (0, _typeorm.PrimaryGeneratedColumn)("uuid"), _dec3 = (0, _typeorm.ManyToOne)(() => _organisation.default), _dec4 = (0, _typeorm.JoinColumn)({
+  name: 'partner_organisation_id',
+  referencedColumnName: 'id'
+}), _dec5 = (0, _typeorm.ManyToOne)(() => _organisation.default), _dec6 = (0, _typeorm.JoinColumn)({
+  name: 'organisation_id',
+  referencedColumnName: 'id'
+}), _dec7 = (0, _typeorm.CreateDateColumn)(), _dec(_class = (_class2 = class OrganisationPartner {
+  constructor() {
+    _initializerDefineProperty(this, "id", _descriptor, this);
+
+    _initializerDefineProperty(this, "partner_organisation", _descriptor2, this);
+
+    _initializerDefineProperty(this, "organisation", _descriptor3, this);
+
+    _initializerDefineProperty(this, "created_at", _descriptor4, this);
+  }
+
+}, (_descriptor = _applyDecoratedDescriptor(_class2.prototype, "id", [_dec2], {
+  configurable: true,
+  enumerable: true,
+  writable: true,
+  initializer: null
+}), _descriptor2 = _applyDecoratedDescriptor(_class2.prototype, "partner_organisation", [_dec3, _dec4], {
+  configurable: true,
+  enumerable: true,
+  writable: true,
+  initializer: function () {
+    return _organisation.default;
+  }
+}), _descriptor3 = _applyDecoratedDescriptor(_class2.prototype, "organisation", [_dec5, _dec6], {
+  configurable: true,
+  enumerable: true,
+  writable: true,
+  initializer: function () {
+    return _organisation.default;
+  }
+}), _descriptor4 = _applyDecoratedDescriptor(_class2.prototype, "created_at", [_dec7], {
+  configurable: true,
+  enumerable: true,
+  writable: true,
+  initializer: null
+})), _class2)) || _class);
+exports.default = OrganisationPartner;

package/dist/index.js

@@ -249,6 +249,12 @@ Object.defineProperty(exports, "OrganisationFeatureEntity", {
     return _organisationFeature.default;
   }
 });
+Object.defineProperty(exports, "OrganisationPartnerEntity", {
+  enumerable: true,
+  get: function () {
+    return _organisationPartner.default;
+  }
+});
 Object.defineProperty(exports, "OrganisationPaymentProviderEntity", {
   enumerable: true,
   get: function () {
@@ -736,6 +742,8 @@ var _organisationWebhook = _interopRequireDefault(require("./entity/user/organis
 
 var _organisationPayoutConfig = _interopRequireDefault(require("./entity/user/organisation-payout-config"));
 
+var _organisationPartner = _interopRequireDefault(require("./entity/user/organisation-partner"));
+
 var _batch2 = _interopRequireDefault(require("./entity/nuvei/batch"));
 
 var _merchant2 = _interopRequireDefault(require("./entity/nuvei/merchant"));

package/dist/migration/1684765687786-org_partner_table.js

@@ -0,0 +1,17 @@
+const { MigrationInterface, QueryRunner } = require("typeorm");
+
+module.exports = class orgPartnerTable1684765687786 {
+    name = 'orgPartnerTable1684765687786'
+
+    async up(queryRunner) {
+        await queryRunner.query(`CREATE TABLE "user"."organisation_partner" ("id" uuid NOT NULL DEFAULT uuid_generate_v4(), "created_at" TIMESTAMP NOT NULL DEFAULT now(), "partner_organisation_id" character varying(150), "organisation_id" character varying(150), CONSTRAINT "PK_0a648f4b349e30778c0cf423396" PRIMARY KEY ("id"))`);
+        await queryRunner.query(`ALTER TABLE "user"."organisation_partner" ADD CONSTRAINT "FK_5e3d4cbb29e29ecb143e6a6b355" FOREIGN KEY ("partner_organisation_id") REFERENCES "user"."organisation"("id") ON DELETE NO ACTION ON UPDATE NO ACTION`);
+        await queryRunner.query(`ALTER TABLE "user"."organisation_partner" ADD CONSTRAINT "FK_061ace0a686facc89cdbe4500b1" FOREIGN KEY ("organisation_id") REFERENCES "user"."organisation"("id") ON DELETE NO ACTION ON UPDATE NO ACTION`);
+    }
+
+    async down(queryRunner) {
+        await queryRunner.query(`ALTER TABLE "user"."organisation_partner" DROP CONSTRAINT "FK_061ace0a686facc89cdbe4500b1"`);
+        await queryRunner.query(`ALTER TABLE "user"."organisation_partner" DROP CONSTRAINT "FK_5e3d4cbb29e29ecb143e6a6b355"`);
+        await queryRunner.query(`DROP TABLE "user"."organisation_partner"`);
+    }
+}

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.7",
+  "version": "1.10.9",
   "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",