@felloh-org/lambda-wrapper 1.11.96 → 1.11.98

package/cli/seed/create-schema.js

@@ -29,6 +29,8 @@ const run = async () => {
     await queryRunner.createSchema('operations', true);
     await queryRunner.createSchema('basis_theory', true);
     await queryRunner.createSchema('aisp', true);
+
+    process.exit(0);
   } catch (error) {
     console.log(error);
 

package/dist/config/dependencies.js

@@ -19,6 +19,8 @@ var _paymentInitiationObject = _interopRequireDefault(require("../service/paymen
 
 var _request = _interopRequireDefault(require("../service/request"));
 
+var _secrets = _interopRequireDefault(require("../service/secrets"));
+
 var _user = _interopRequireDefault(require("../service/user"));
 
 var _warehouse = _interopRequireDefault(require("../service/warehouse"));
@@ -34,7 +36,8 @@ const DEFINITIONS = exports.DEFINITIONS = {
   PAYMENT_INITIATION_OBJECT: 'PAYMENT_INITIATION_OBJECT',
   REQUEST: 'REQUEST',
   USER: 'USER',
-  WAREHOUSE: 'WAREHOUSE'
+  WAREHOUSE: 'WAREHOUSE',
+  SECRETS: 'SECRETS'
 };
 const Dependencies = exports.Dependencies = {
   [DEFINITIONS.AUDIT_LOGGER]: _auditLogger.default,
@@ -45,7 +48,8 @@ const Dependencies = exports.Dependencies = {
   [DEFINITIONS.REQUEST]: _request.default,
   [DEFINITIONS.WAREHOUSE]: _warehouse.default,
   [DEFINITIONS.AUTHENTICATION]: _authentication.default,
-  [DEFINITIONS.USER]: _user.default
+  [DEFINITIONS.USER]: _user.default,
+  [DEFINITIONS.SECRETS]: _secrets.default
 };
 
 var _default = exports.default = {

package/dist/entity/bank/adjustment/index.js

@@ -96,6 +96,18 @@ let Adjustment = exports.default = (_dec = (0, _typeorm.Entity)({
     return response;
   }
 
+  getPublicCompactData() {
+    return {
+      id: this.id,
+      amount: this.amount,
+      vendor_reference: this.vendor_reference,
+      description: this.description,
+      created_at: this.created_at,
+      updated_at: this.updated_at,
+      currency: this.currency
+    };
+  }
+
 }, (_descriptor = _applyDecoratedDescriptor(_class2.prototype, "id", [_dec2], {
   configurable: true,
   enumerable: true,

package/dist/entity/bank/disbursal/index.js

@@ -13,11 +13,13 @@ var _account = _interopRequireDefault(require("../account"));
 
 var _transactionBatch = _interopRequireDefault(require("../transaction-batch"));
 
+var _adjustmentBatch = _interopRequireDefault(require("../adjustment-batch"));
+
 var _currency = require("../currency");
 
 var _transaction = _interopRequireDefault(require("../../saltedge/transaction"));
 
-var _dec, _dec2, _dec3, _dec4, _dec5, _dec6, _dec7, _dec8, _dec9, _dec10, _dec11, _dec12, _dec13, _dec14, _dec15, _dec16, _class, _class2, _descriptor, _descriptor2, _descriptor3, _descriptor4, _descriptor5, _descriptor6, _descriptor7, _descriptor8, _descriptor9, _descriptor10, _descriptor11, _descriptor12, _descriptor13;
+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, _descriptor12, _descriptor13, _descriptor14;
 
 function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }
 
@@ -43,24 +45,24 @@ let Disbursal = exports.default = (_dec = (0, _typeorm.Entity)({
 }), _dec8 = (0, _typeorm.Column)({
   type: "varchar",
   length: "50"
-}), _dec9 = (0, _typeorm.CreateDateColumn)(), _dec10 = (0, _typeorm.OneToMany)(() => _transactionBatch.default, transactionBatch => transactionBatch.disbursal), _dec11 = (0, _typeorm.Column)({
+}), _dec9 = (0, _typeorm.CreateDateColumn)(), _dec10 = (0, _typeorm.OneToMany)(() => _transactionBatch.default, transactionBatch => transactionBatch.disbursal), _dec11 = (0, _typeorm.OneToMany)(() => _adjustmentBatch.default, adjustmentBatch => adjustmentBatch.disbursal), _dec12 = (0, _typeorm.Column)({
   type: "varchar",
   length: "3",
   default: _currency.DEFAULT_CURRENCY
-}), _dec12 = (0, _typeorm.Column)({
+}), _dec13 = (0, _typeorm.Column)({
   type: "varchar",
   length: "250",
   nullable: true
-}), _dec13 = (0, _typeorm.Column)({
+}), _dec14 = (0, _typeorm.Column)({
   type: "boolean",
   default: true
-}), _dec14 = (0, _typeorm.Column)({
+}), _dec15 = (0, _typeorm.Column)({
   type: "boolean",
   default: false
-}), _dec15 = (0, _typeorm.Column)({
+}), _dec16 = (0, _typeorm.Column)({
   type: "boolean",
   default: false
-}), _dec16 = (0, _typeorm.OneToOne)(() => _transaction.default, transaction => transaction.disbursal), _dec(_class = (_class2 = class Disbursal {
+}), _dec17 = (0, _typeorm.OneToOne)(() => _transaction.default, transaction => transaction.disbursal), _dec(_class = (_class2 = class Disbursal {
   constructor() {
     _initializerDefineProperty(this, "id", _descriptor, this);
 
@@ -76,17 +78,19 @@ let Disbursal = exports.default = (_dec = (0, _typeorm.Entity)({
 
     _initializerDefineProperty(this, "batch", _descriptor7, this);
 
-    _initializerDefineProperty(this, "currency", _descriptor8, this);
+    _initializerDefineProperty(this, "adjustment_batch", _descriptor8, this);
 
-    _initializerDefineProperty(this, "provider_reference", _descriptor9, this);
+    _initializerDefineProperty(this, "currency", _descriptor9, this);
 
-    _initializerDefineProperty(this, "is_ledgered", _descriptor10, this);
+    _initializerDefineProperty(this, "provider_reference", _descriptor10, this);
 
-    _initializerDefineProperty(this, "is_manual_review", _descriptor11, this);
+    _initializerDefineProperty(this, "is_ledgered", _descriptor11, this);
 
-    _initializerDefineProperty(this, "updated_legacy_system", _descriptor12, this);
+    _initializerDefineProperty(this, "is_manual_review", _descriptor12, this);
 
-    _initializerDefineProperty(this, "bank_transaction", _descriptor13, this);
+    _initializerDefineProperty(this, "updated_legacy_system", _descriptor13, this);
+
+    _initializerDefineProperty(this, "bank_transaction", _descriptor14, this);
   }
 
   getPublicData() {
@@ -108,6 +112,10 @@ let Disbursal = exports.default = (_dec = (0, _typeorm.Entity)({
       data.transactions = this.batch.map(batch => batch.transaction.getPublicCompactData());
     }
 
+    if (this.adjustment && this.adjustment.length >= 1) {
+      data.adjustments = this.adjustment.map(batch => batch.adjustment.getPublicCompactData());
+    }
+
     return data;
   }
 
@@ -152,42 +160,47 @@ let Disbursal = exports.default = (_dec = (0, _typeorm.Entity)({
   enumerable: true,
   writable: true,
   initializer: null
-}), _descriptor8 = _applyDecoratedDescriptor(_class2.prototype, "currency", [_dec11], {
+}), _descriptor8 = _applyDecoratedDescriptor(_class2.prototype, "adjustment_batch", [_dec11], {
+  configurable: true,
+  enumerable: true,
+  writable: true,
+  initializer: null
+}), _descriptor9 = _applyDecoratedDescriptor(_class2.prototype, "currency", [_dec12], {
   configurable: true,
   enumerable: true,
   writable: true,
   initializer: function () {
     return _currency.DEFAULT_CURRENCY;
   }
-}), _descriptor9 = _applyDecoratedDescriptor(_class2.prototype, "provider_reference", [_dec12], {
+}), _descriptor10 = _applyDecoratedDescriptor(_class2.prototype, "provider_reference", [_dec13], {
   configurable: true,
   enumerable: true,
   writable: true,
   initializer: function () {
     return "";
   }
-}), _descriptor10 = _applyDecoratedDescriptor(_class2.prototype, "is_ledgered", [_dec13], {
+}), _descriptor11 = _applyDecoratedDescriptor(_class2.prototype, "is_ledgered", [_dec14], {
   configurable: true,
   enumerable: true,
   writable: true,
   initializer: function () {
     return true;
   }
-}), _descriptor11 = _applyDecoratedDescriptor(_class2.prototype, "is_manual_review", [_dec14], {
+}), _descriptor12 = _applyDecoratedDescriptor(_class2.prototype, "is_manual_review", [_dec15], {
   configurable: true,
   enumerable: true,
   writable: true,
   initializer: function () {
     return false;
   }
-}), _descriptor12 = _applyDecoratedDescriptor(_class2.prototype, "updated_legacy_system", [_dec15], {
+}), _descriptor13 = _applyDecoratedDescriptor(_class2.prototype, "updated_legacy_system", [_dec16], {
   configurable: true,
   enumerable: true,
   writable: true,
   initializer: function () {
     return false;
   }
-}), _descriptor13 = _applyDecoratedDescriptor(_class2.prototype, "bank_transaction", [_dec16], {
+}), _descriptor14 = _applyDecoratedDescriptor(_class2.prototype, "bank_transaction", [_dec17], {
   configurable: true,
   enumerable: true,
   writable: true,

package/dist/service/authentication.js

@@ -41,6 +41,12 @@ class AuthenticationService extends _dependencyAware.default {
       }
     };
   }
+
+  async init() {
+    await this.initialise();
+    this.initialised = true;
+    return this;
+  }
   /**
    * Fetch a users organisations
    * @param user

package/dist/service/secrets.js

@@ -0,0 +1,44 @@
+"use strict";
+
+Object.defineProperty(exports, "__esModule", {
+  value: true
+});
+exports.default = void 0;
+
+var _clientSecretsManager = require("@aws-sdk/client-secrets-manager");
+
+var _dependencyAware = _interopRequireDefault(require("../dependency-injection/dependency-aware"));
+
+function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }
+
+const client = new _clientSecretsManager.SecretsManagerClient({
+  region: process.env.REGION
+});
+const cache = {};
+/**
+ * Event Bridge Service
+ */
+
+class Secrets extends _dependencyAware.default {
+  constructor() {
+    super();
+    this.initalised = false;
+  }
+
+  async get(arn) {
+    this.initalised = true;
+
+    if (cache[arn]) {
+      return cache[arn];
+    }
+
+    const response = await client.send(new _clientSecretsManager.GetSecretValueCommand({
+      SecretId: arn
+    }));
+    cache[arn] = JSON.parse(response.SecretString);
+    return cache[arn];
+  }
+
+}
+
+exports.default = Secrets;

package/dist/service/warehouse.js

@@ -9,6 +9,8 @@ var _typeorm = require("typeorm");
 
 var _typeormAuroraDataApiDriver = _interopRequireDefault(require("typeorm-aurora-data-api-driver"));
 
+var _dependencies = require("../config/dependencies");
+
 var _dependencyAware = _interopRequireDefault(require("../dependency-injection/dependency-aware"));
 
 var _entity = _interopRequireDefault(require("../entity"));
@@ -24,8 +26,8 @@ class Warehouse extends _dependencyAware.default {
   /**
    * Warehouse Constructor
    */
-  constructor() {
-    super();
+  constructor(di) {
+    super(di);
     this.connection = null;
   }
   /**
@@ -47,22 +49,33 @@ class Warehouse extends _dependencyAware.default {
       const connectionParams = {
         entities: _entity.default,
         schema: process.env.WAREHOUSE_SCHEMA,
-        database: database || process.env.WAREHOUSE_DATABASE,
         logging: process.env.DB_LOGGING !== 'undefined' && process.env.DB_LOGGING === 'true'
       };
 
-      if (process.env.WAREHOUSE_TYPE === 'postgres') {
+      if (process.env.WAREHOUSE_TYPE === 'postgres-ssm') {
+        const secretsManager = this.di.get(_dependencies.DEFINITIONS.SECRETS);
+        const credentials = await secretsManager.get(process.env.DB_CREDS_ARN);
+        connectionParams.type = credentials.engine;
+        connectionParams.host = credentials.host;
+        connectionParams.port = credentials.port;
+        connectionParams.username = credentials.username;
+        connectionParams.password = credentials.password;
+        connectionParams.database = database || credentials.dbname;
+        connectionParams.ssl = true;
+      } else if (process.env.WAREHOUSE_TYPE === 'postgres') {
         connectionParams.type = 'postgres';
         connectionParams.host = process.env.WAREHOUSE_HOST;
         connectionParams.port = 5432;
         connectionParams.username = process.env.WAREHOUSE_USERNAME;
         connectionParams.password = process.env.WAREHOUSE_PASSWORD;
+        connectionParams.database = database || process.env.WAREHOUSE_DATABASE;
         connectionParams.ssl = true;
       } else {
         connectionParams.type = 'aurora-data-api-pg';
         connectionParams.secretArn = process.env.WAREHOUSE_SECRET_ARN;
         connectionParams.resourceArn = process.env.WAREHOUSE_ARN;
         connectionParams.region = process.env.REGION;
+        connectionParams.database = database || process.env.WAREHOUSE_DATABASE;
       }
 
       this.connection = await (0, _typeorm.createConnection)(connectionParams);

package/ormconfig.js

@@ -3,7 +3,7 @@ const DotEnv = require('dotenv');
 DotEnv.config();
 
 const connectionParams = {
-  database: 'felloh',
+  database: process.env.WAREHOUSE_DATABASE,
   entities: [
     `${__dirname}/dist/entity/**/*.ts`,
     `${__dirname}/dist/entity/**/*.js`,

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@felloh-org/lambda-wrapper",
-  "version": "1.11.96",
+  "version": "1.11.98",
   "description": "Lambda wrapper for all Felloh Serverless Projects",
   "main": "dist/index.js",
   "engines": {
@@ -55,12 +55,14 @@
     "aws-sdk": ">=2.831.0"
   },
   "dependencies": {
+    "@aws-sdk/client-secrets-manager": "^3.574.0",
     "@baselime/lambda-logger": "^0.2.2",
     "alai": "^1.0.3",
     "async": "^3.2.3",
     "axios": "^0.26.1",
     "dotenv": "^16.0.0",
     "epsagon": "^1.121.3",
+    "execution-time": "^1.4.1",
     "geojson": "^0.5.0",
     "moment": "^2.29.3",
     "pg": "^8.11.3",

package/dist/migration/view/1693832604328-plecom.js

@@ -1,60 +0,0 @@
-const { MigrationInterface, QueryRunner } = require("typeorm");
-
-module.exports = class initial1641774481300 {
-    name = 'plecom1693832604328'
-
-    async up(queryRunner) {
-        await queryRunner.query(`
-            CREATE OR REPLACE VIEW plecom_union AS
-            select
-                amount,
-                description,
-                expires_at,
-                user_id,
-                organisation_id,
-                id,
-                booking_id,
-                customer_name,
-                open_banking_enabled,
-                card_enabled,
-                moto,
-                status,
-                created_at,
-                updated_at,
-                email,
-                currency,
-                deleted_at,
-                pre_authorized,
-                customer_id
-            from "payment"."payment_Link"
-            union
-            select
-                amount,
-                '' as description,
-                expires_at,
-                user_id,
-                organisation_id,
-                id,
-                booking_id,
-                customer_name,
-                open_banking_enabled,
-                card_enabled,
-                moto,
-                status,
-                created_at,
-                updated_at,
-                email,
-                currency,
-                deleted_at,
-                pre_authorized,
-                customer_id
-            from "payment".ecommerce   
-        `);
-    }
-
-    async down(queryRunner) {
-        await queryRunner.query(`
-            DROP VIEW IF EXISTS plecom_union;
-        `);
-    }
-}

package/dist/migration/view/1693832604329-plecom.js

@@ -1,105 +0,0 @@
-const { MigrationInterface, QueryRunner } = require("typeorm");
-
-module.exports = class initial1641774481300 {
-    name = 'plecom1693832604329'
-
-    async up(queryRunner) {
-        await queryRunner.query(`
-            CREATE OR REPLACE VIEW plecom_union AS
-            select
-                amount,
-                description,
-                expires_at,
-                user_id,
-                organisation_id,
-                id,
-                booking_id,
-                customer_name,
-                open_banking_enabled,
-                card_enabled,
-                moto,
-                status,
-                created_at,
-                updated_at,
-                email,
-                currency,
-                deleted_at,
-                pre_authorized,
-                customer_id,
-                cast(coalesce(metadata, '{}') as jsonb) as metadata
-            from "payment"."payment_Link"
-            union
-            select
-                amount,
-                '' as description,
-                expires_at,
-                user_id,
-                organisation_id,
-                id,
-                booking_id,
-                customer_name,
-                open_banking_enabled,
-                card_enabled,
-                moto,
-                status,
-                created_at,
-                updated_at,
-                email,
-                currency,
-                deleted_at,
-                pre_authorized,
-                customer_id,
-                cast('{}' as jsonb) as metadata
-            from "payment".ecommerce  
-        `);
-    }
-
-    async down(queryRunner) {
-        await queryRunner.query(`
-            CREATE OR REPLACE VIEW plecom_union AS
-            select
-                amount,
-                description,
-                expires_at,
-                user_id,
-                organisation_id,
-                id,
-                booking_id,
-                customer_name,
-                open_banking_enabled,
-                card_enabled,
-                moto,
-                status,
-                created_at,
-                updated_at,
-                email,
-                currency,
-                deleted_at,
-                pre_authorized,
-                customer_id
-            from "payment"."payment_Link"
-            union
-            select
-                amount,
-                '' as description,
-                expires_at,
-                user_id,
-                organisation_id,
-                id,
-                booking_id,
-                customer_name,
-                open_banking_enabled,
-                card_enabled,
-                moto,
-                status,
-                created_at,
-                updated_at,
-                email,
-                currency,
-                deleted_at,
-                pre_authorized,
-                customer_id
-            from "payment".ecommerce   
-        `);
-    }
-}