@felloh-org/lambda-wrapper 1.11.85 → 1.11.87

package/cli/seed/create-schema.js

@@ -28,8 +28,6 @@ const run = async () => {
     await queryRunner.createSchema('acquirer', true);
     await queryRunner.createSchema('operations', true);
     await queryRunner.createSchema('basis_theory', true);
-    await queryRunner.createSchema('hubspot', true);
-    await queryRunner.createSchema('helpscout', true);
     await queryRunner.createSchema('aisp', true);
   } catch (error) {
     console.log(error);

package/dist/entity/aisp/gocardless-requisition/index.js

@@ -13,7 +13,7 @@ var _user = _interopRequireDefault(require("../../user/user"));
 
 var _gocardlessAgreement = _interopRequireDefault(require("../gocardless-agreement"));
 
-var _dec, _dec2, _dec3, _dec4, _dec5, _dec6, _dec7, _dec8, _dec9, _dec10, _dec11, _dec12, _class, _class2, _descriptor, _descriptor2, _descriptor3, _descriptor4, _descriptor5, _descriptor6, _descriptor7, _descriptor8;
+var _dec, _dec2, _dec3, _dec4, _dec5, _dec6, _dec7, _dec8, _dec9, _dec10, _dec11, _dec12, _dec13, _class, _class2, _descriptor, _descriptor2, _descriptor3, _descriptor4, _descriptor5, _descriptor6, _descriptor7, _descriptor8, _descriptor9;
 
 function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }
 
@@ -39,15 +39,19 @@ let Requisition = exports.default = (_dec = (0, _typeorm.Entity)({
   name: 'agreement_id',
   referencedColumnName: 'id'
 }), _dec9 = (0, _typeorm.Column)({
+  type: "varchar",
+  length: "250",
+  nullable: true
+}), _dec10 = (0, _typeorm.Column)({
   type: "boolean",
   default: false
-}), _dec10 = (0, _typeorm.Column)({
+}), _dec11 = (0, _typeorm.Column)({
   type: "timestamp with time zone",
   nullable: true
-}), _dec11 = (0, _typeorm.Column)({
+}), _dec12 = (0, _typeorm.Column)({
   type: "timestamp with time zone",
   nullable: true
-}), _dec12 = (0, _typeorm.CreateDateColumn)(), _dec(_class = (_class2 = class Requisition {
+}), _dec13 = (0, _typeorm.CreateDateColumn)(), _dec(_class = (_class2 = class Requisition {
   constructor() {
     _initializerDefineProperty(this, "id", _descriptor, this);
 
@@ -57,13 +61,15 @@ let Requisition = exports.default = (_dec = (0, _typeorm.Entity)({
 
     _initializerDefineProperty(this, "Agreement", _descriptor4, this);
 
-    _initializerDefineProperty(this, "is_complete", _descriptor5, this);
+    _initializerDefineProperty(this, "institution_name", _descriptor5, this);
 
-    _initializerDefineProperty(this, "initial_scrape_commenced_at", _descriptor6, this);
+    _initializerDefineProperty(this, "is_complete", _descriptor6, this);
 
-    _initializerDefineProperty(this, "initial_scrape_completed_at", _descriptor7, this);
+    _initializerDefineProperty(this, "initial_scrape_commenced_at", _descriptor7, this);
 
-    _initializerDefineProperty(this, "created_at", _descriptor8, this);
+    _initializerDefineProperty(this, "initial_scrape_completed_at", _descriptor8, this);
+
+    _initializerDefineProperty(this, "created_at", _descriptor9, this);
   }
 
 }, (_descriptor = _applyDecoratedDescriptor(_class2.prototype, "id", [_dec2], {
@@ -94,24 +100,31 @@ let Requisition = exports.default = (_dec = (0, _typeorm.Entity)({
   initializer: function () {
     return _gocardlessAgreement.default;
   }
-}), _descriptor5 = _applyDecoratedDescriptor(_class2.prototype, "is_complete", [_dec9], {
+}), _descriptor5 = _applyDecoratedDescriptor(_class2.prototype, "institution_name", [_dec9], {
+  configurable: true,
+  enumerable: true,
+  writable: true,
+  initializer: function () {
+    return "";
+  }
+}), _descriptor6 = _applyDecoratedDescriptor(_class2.prototype, "is_complete", [_dec10], {
   configurable: true,
   enumerable: true,
   writable: true,
   initializer: function () {
     return false;
   }
-}), _descriptor6 = _applyDecoratedDescriptor(_class2.prototype, "initial_scrape_commenced_at", [_dec10], {
+}), _descriptor7 = _applyDecoratedDescriptor(_class2.prototype, "initial_scrape_commenced_at", [_dec11], {
   configurable: true,
   enumerable: true,
   writable: true,
   initializer: null
-}), _descriptor7 = _applyDecoratedDescriptor(_class2.prototype, "initial_scrape_completed_at", [_dec11], {
+}), _descriptor8 = _applyDecoratedDescriptor(_class2.prototype, "initial_scrape_completed_at", [_dec12], {
   configurable: true,
   enumerable: true,
   writable: true,
   initializer: null
-}), _descriptor8 = _applyDecoratedDescriptor(_class2.prototype, "created_at", [_dec12], {
+}), _descriptor9 = _applyDecoratedDescriptor(_class2.prototype, "created_at", [_dec13], {
   configurable: true,
   enumerable: true,
   writable: true,

package/dist/entity/aisp/transaction/index.js

@@ -15,7 +15,7 @@ var _disbursal = _interopRequireDefault(require("../../bank/disbursal"));
 
 var _booking = _interopRequireDefault(require("../../agent-data/booking"));
 
-var _dec, _dec2, _dec3, _dec4, _dec5, _dec6, _dec7, _dec8, _dec9, _dec10, _dec11, _dec12, _dec13, _dec14, _dec15, _dec16, _dec17, _dec18, _dec19, _dec20, _class, _class2, _descriptor, _descriptor2, _descriptor3, _descriptor4, _descriptor5, _descriptor6, _descriptor7, _descriptor8, _descriptor9, _descriptor10, _descriptor11, _descriptor12, _descriptor13, _descriptor14, _descriptor15;
+var _dec, _dec2, _dec3, _dec4, _dec5, _dec6, _dec7, _dec8, _dec9, _dec10, _dec11, _dec12, _dec13, _dec14, _dec15, _dec16, _dec17, _dec18, _dec19, _dec20, _dec21, _class, _class2, _descriptor, _descriptor2, _descriptor3, _descriptor4, _descriptor5, _descriptor6, _descriptor7, _descriptor8, _descriptor9, _descriptor10, _descriptor11, _descriptor12, _descriptor13, _descriptor14, _descriptor15, _descriptor16;
 
 function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }
 
@@ -64,15 +64,19 @@ let Transaction = exports.default = (_dec = (0, _typeorm.Entity)({
   type: "varchar",
   length: "150",
   nullable: true
-}), _dec15 = (0, _typeorm.CreateDateColumn)({
+}), _dec15 = (0, _typeorm.Column)({
+  type: "varchar",
+  length: "150",
+  nullable: true
+}), _dec16 = (0, _typeorm.CreateDateColumn)({
   type: 'timestamp with time zone'
-}), _dec16 = (0, _typeorm.UpdateDateColumn)({
+}), _dec17 = (0, _typeorm.UpdateDateColumn)({
   type: 'timestamp with time zone'
-}), _dec17 = (0, _typeorm.ManyToOne)(() => _disbursal.default), _dec18 = (0, _typeorm.JoinColumn)({
+}), _dec18 = (0, _typeorm.ManyToOne)(() => _disbursal.default), _dec19 = (0, _typeorm.JoinColumn)({
   name: 'disbursal_id',
   referencedColumnName: 'id',
   nullable: true
-}), _dec19 = (0, _typeorm.ManyToOne)(() => _booking.default), _dec20 = (0, _typeorm.JoinColumn)({
+}), _dec20 = (0, _typeorm.ManyToOne)(() => _booking.default), _dec21 = (0, _typeorm.JoinColumn)({
   name: 'booking_id',
   referencedColumnName: 'id'
 }), _dec(_class = (_class2 = class Transaction {
@@ -99,13 +103,15 @@ let Transaction = exports.default = (_dec = (0, _typeorm.Entity)({
 
     _initializerDefineProperty(this, "type", _descriptor11, this);
 
-    _initializerDefineProperty(this, "created_at", _descriptor12, this);
+    _initializerDefineProperty(this, "type_code", _descriptor12, this);
 
-    _initializerDefineProperty(this, "updated_at", _descriptor13, this);
+    _initializerDefineProperty(this, "created_at", _descriptor13, this);
 
-    _initializerDefineProperty(this, "disbursal", _descriptor14, this);
+    _initializerDefineProperty(this, "updated_at", _descriptor14, this);
 
-    _initializerDefineProperty(this, "booking", _descriptor15, this);
+    _initializerDefineProperty(this, "disbursal", _descriptor15, this);
+
+    _initializerDefineProperty(this, "booking", _descriptor16, this);
   }
 
 }, (_descriptor = _applyDecoratedDescriptor(_class2.prototype, "id", [_dec2], {
@@ -177,24 +183,31 @@ let Transaction = exports.default = (_dec = (0, _typeorm.Entity)({
   initializer: function () {
     return "";
   }
-}), _descriptor12 = _applyDecoratedDescriptor(_class2.prototype, "created_at", [_dec15], {
+}), _descriptor12 = _applyDecoratedDescriptor(_class2.prototype, "type_code", [_dec15], {
+  configurable: true,
+  enumerable: true,
+  writable: true,
+  initializer: function () {
+    return "";
+  }
+}), _descriptor13 = _applyDecoratedDescriptor(_class2.prototype, "created_at", [_dec16], {
   configurable: true,
   enumerable: true,
   writable: true,
   initializer: null
-}), _descriptor13 = _applyDecoratedDescriptor(_class2.prototype, "updated_at", [_dec16], {
+}), _descriptor14 = _applyDecoratedDescriptor(_class2.prototype, "updated_at", [_dec17], {
   configurable: true,
   enumerable: true,
   writable: true,
   initializer: null
-}), _descriptor14 = _applyDecoratedDescriptor(_class2.prototype, "disbursal", [_dec17, _dec18], {
+}), _descriptor15 = _applyDecoratedDescriptor(_class2.prototype, "disbursal", [_dec18, _dec19], {
   configurable: true,
   enumerable: true,
   writable: true,
   initializer: function () {
     return _disbursal.default;
   }
-}), _descriptor15 = _applyDecoratedDescriptor(_class2.prototype, "booking", [_dec19, _dec20], {
+}), _descriptor16 = _applyDecoratedDescriptor(_class2.prototype, "booking", [_dec20, _dec21], {
   configurable: true,
   enumerable: true,
   writable: true,

package/dist/migration/aisp/1710372510335-institution_name.js

@@ -0,0 +1,13 @@
+const { MigrationInterface, QueryRunner } = require("typeorm");
+
+module.exports = class institutionName1710372510335 {
+  name = 'institutionName1710372510335'
+
+  async up(queryRunner) {
+    await queryRunner.query(`ALTER TABLE "aisp"."gocardless_requisition" ADD "institution_name" character varying(250)`);
+  }
+
+  async down(queryRunner) {
+    await queryRunner.query(`ALTER TABLE "aisp"."gocardless_requisition" DROP COLUMN "institution_name"`);
+  }
+}

package/dist/migration/aisp/1712138801073-aisp_type_code.js

@@ -0,0 +1,13 @@
+const { MigrationInterface, QueryRunner } = require("typeorm");
+
+module.exports = class aispTypeCode1712138801073 {
+  name = 'aispTypeCode1712138801073'
+
+  async up(queryRunner) {
+    await queryRunner.query(`ALTER TABLE "aisp"."transaction" ADD "type_code" character varying(150)`);
+  }
+
+  async down(queryRunner) {
+    await queryRunner.query(`ALTER TABLE "aisp"."transaction" DROP COLUMN "type_code"`);
+  }
+}

package/dist/service/warehouse.js

@@ -44,16 +44,28 @@ class Warehouse extends _dependencyAware.default {
     try {
       this.connection = await (0, _typeorm.getConnection)();
     } catch (error) {
-      this.connection = await (0, _typeorm.createConnection)({
-        type: 'aurora-data-api-pg',
-        database: database !== null ? database : process.env.WAREHOUSE_DATABASE,
-        schema: process.env.WAREHOUSE_SCHEMA,
-        secretArn: process.env.WAREHOUSE_SECRET_ARN,
-        resourceArn: process.env.WAREHOUSE_ARN,
-        region: process.env.REGION,
+      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') {
+        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.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;
+      }
+
+      this.connection = await (0, _typeorm.createConnection)(connectionParams);
     }
 
     return this.connection;

package/ormconfig.js

@@ -2,24 +2,36 @@ const DotEnv = require('dotenv');
 
 DotEnv.config();
 
-module.exports = {
-  "type": "aurora-data-api-pg",
-  "database": process.env.WAREHOUSE_DATABASE,
-  "secretArn": process.env.WAREHOUSE_SECRET_ARN,
-  "resourceArn": process.env.WAREHOUSE_ARN,
-  "region": process.env.REGION,
-  "synchronize": true,
-  "logging": false,
-  "schema": 'user',
-  "entities": [
-    __dirname + '/dist/entity/**/*.ts',
-    __dirname + '/dist/entity/**/*.js',
+const connectionParams = {
+  database: 'felloh',
+  entities: [
+    `${__dirname}/dist/entity/**/*.ts`,
+    `${__dirname}/dist/entity/**/*.js`,
   ],
-  "migrations": [
-    __dirname + '/dist/migration/**/*.ts',
-    __dirname + '/dist/migration/**/*.js'
+  migrations: [
+    `${__dirname}/dist/migration/**/*.ts`,
+    `${__dirname}/dist/migration/**/*.js`,
   ],
-  "cli": {
-    "migrationsDir":  __dirname + '/src/migration',
+  cli: {
+    migrationsDir: `${__dirname}/src/migration`,
   },
+  synchronize: true,
+  logging: false,
+  schema: 'user',
 };
+
+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.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;
+}
+
+module.exports = connectionParams;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@felloh-org/lambda-wrapper",
-  "version": "1.11.85",
+  "version": "1.11.87",
   "description": "Lambda wrapper for all Felloh Serverless Projects",
   "main": "dist/index.js",
   "engines": {
@@ -63,6 +63,7 @@
     "epsagon": "^1.121.3",
     "geojson": "^0.5.0",
     "moment": "^2.29.3",
+    "pg": "^8.11.3",
     "typeorm": "^0.2.41",
     "typeorm-aurora-data-api-driver": "^2.4.2",
     "useragent": "^2.3.0",