@felloh-org/lambda-wrapper 1.1.37 → 1.1.40

package/.concourse/pipeline.yml

@@ -167,3 +167,43 @@ jobs:
       params:
         alert_type: 'failed'
         message: Migrations deployment failed
+
+  - name: 'migrations.pr'
+    serial: true
+    plan:
+      - in_parallel:
+          - get: lambda-wrapper
+            passed: ['migrations.staging']
+            trigger: true
+          - get: concourse-scripts
+      - task: 'schema.create'
+        file: concourse-scripts/scripts/pulumi_npm_run/npm_run.yml
+        input_mapping:
+          repository: lambda-wrapper
+        params:
+          NPM_COMMAND: 'orm:schema:create'
+          AWS_ACCESS_KEY_ID: ((aws.keys.access))
+          AWS_SECRET_ACCESS_KEY: ((aws.keys.secret))
+          AWS_REGION: ((aws.region.primary))
+          WAREHOUSE_ARN: ((aws.rds.warehouse_arn.pr))
+          WAREHOUSE_SECRET_ARN: ((aws.secret_manager.warehouse_secret_arn.pr))
+          WAREHOUSE_DATABASE: 'felloh'
+          WAREHOUSE_SCHEMA: 'user'
+      - task: 'migrations.run'
+        file: concourse-scripts/scripts/pulumi_npm_run/npm_run.yml
+        input_mapping:
+          repository: lambda-wrapper
+        params:
+          NPM_COMMAND: 'orm:migration:run'
+          AWS_ACCESS_KEY_ID: ((aws.keys.access))
+          AWS_SECRET_ACCESS_KEY: ((aws.keys.secret))
+          AWS_REGION: ((aws.region.primary))
+          WAREHOUSE_ARN: ((aws.rds.warehouse_arn.pr))
+          WAREHOUSE_SECRET_ARN: ((aws.secret_manager.warehouse_secret_arn.pr))
+          WAREHOUSE_DATABASE: 'felloh'
+          WAREHOUSE_SCHEMA: 'user'
+    on_failure:
+      put: slack-alert-deploy
+      params:
+        alert_type: 'failed'
+        message: Migrations deployment failed

package/cli/seed/create-schema.js

@@ -5,22 +5,29 @@ import Warehouse from '@/src/service/warehouse';
 DotEnv.config();
 
 const run = async () => {
-  const warehouse = new Warehouse();
-
-  const connection = await warehouse.connect();
-
-  const queryRunner = await connection.createQueryRunner();
-  await queryRunner.createDatabase('felloh', true);
-
-  await queryRunner.createSchema('trust_payments', true);
-  await queryRunner.createSchema('nuapay', true);
-  await queryRunner.createSchema('agent_data', true);
-  await queryRunner.createSchema('payment', true);
-  await queryRunner.createSchema('bank', true);
-  await queryRunner.createSchema('user', true);
-  await queryRunner.createSchema('total_processing', true);
-  await queryRunner.createSchema('token', true);
-  await queryRunner.createSchema('scratch', true);
+  try {
+    const warehouse = new Warehouse();
+
+    const connection = await warehouse.connect();
+
+    const queryRunner = await connection.createQueryRunner();
+    await queryRunner.createDatabase('felloh', true);
+
+    await queryRunner.createSchema('trust_payments', true);
+    await queryRunner.createSchema('nuapay', true);
+    await queryRunner.createSchema('agent_data', true);
+    await queryRunner.createSchema('payment', true);
+    await queryRunner.createSchema('bank', true);
+    await queryRunner.createSchema('user', true);
+    await queryRunner.createSchema('total_processing', true);
+    await queryRunner.createSchema('token', true);
+    await queryRunner.createSchema('scratch', true);
+    await queryRunner.createSchema('nuvei', true);
+  } catch (error) {
+    console.log(error);
+
+    process.exit(1);
+  }
 };
 
 run();

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

@@ -11,11 +11,13 @@ var _organisation = _interopRequireDefault(require("../../user/organisation"));
 
 var _disbursal = _interopRequireDefault(require("../disbursal"));
 
+var _adjustment = _interopRequireDefault(require("../adjustment"));
+
 var _amendment = _interopRequireDefault(require("../amendment"));
 
 var _transaction = _interopRequireDefault(require("../../payment/transaction"));
 
-var _dec, _dec2, _dec3, _dec4, _dec5, _dec6, _dec7, _dec8, _dec9, _dec10, _dec11, _dec12, _dec13, _dec14, _class, _class2, _descriptor, _descriptor2, _descriptor3, _descriptor4, _descriptor5, _descriptor6, _descriptor7, _descriptor8, _descriptor9;
+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;
 
 function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }
 
@@ -55,9 +57,14 @@ let Ledger = (_dec = (0, _typeorm.Entity)({
 }), _dec12 = (0, _typeorm.JoinColumn)({
   name: 'amendment_id',
   referencedColumnName: 'id'
-}), _dec13 = (0, _typeorm.Column)({
+}), _dec13 = (0, _typeorm.ManyToOne)(() => _adjustment.default, {
+  nullable: true
+}), _dec14 = (0, _typeorm.JoinColumn)({
+  name: 'adjustment_id',
+  referencedColumnName: 'id'
+}), _dec15 = (0, _typeorm.Column)({
   type: "int"
-}), _dec14 = (0, _typeorm.CreateDateColumn)(), _dec(_class = (_class2 = class Ledger {
+}), _dec16 = (0, _typeorm.CreateDateColumn)(), _dec(_class = (_class2 = class Ledger {
   constructor() {
     _initializerDefineProperty(this, "id", _descriptor, this);
 
@@ -73,16 +80,19 @@ let Ledger = (_dec = (0, _typeorm.Entity)({
 
     _initializerDefineProperty(this, "amendment", _descriptor7, this);
 
-    _initializerDefineProperty(this, "amount", _descriptor8, this);
+    _initializerDefineProperty(this, "adjustment", _descriptor8, this);
 
-    _initializerDefineProperty(this, "created_at", _descriptor9, this);
+    _initializerDefineProperty(this, "amount", _descriptor9, this);
+
+    _initializerDefineProperty(this, "created_at", _descriptor10, this);
   }
 
   getSource() {
     if (this.disbursal !== null) return 'disbursal';
     if (this.transaction !== null) return 'settled transaction';
     if (this.amendment !== null) return 'amendment';
-    return 'Unknown';
+    if (this.adjustment !== null) return 'adjustment';
+    return 'unknown';
   }
 
   getPublicData() {
@@ -102,6 +112,10 @@ let Ledger = (_dec = (0, _typeorm.Entity)({
       response.amendment = this.amendment.getPublicData();
     }
 
+    if (typeof this.adjustment !== 'undefined' && this.adjustment !== null) {
+      response.adjustment = this.adjustment.getPublicData();
+    }
+
     if (typeof this.transaction !== 'undefined' && this.transaction !== null) {
       response.transaction = this.transaction.getPublicCompactData();
     }
@@ -158,12 +172,19 @@ let Ledger = (_dec = (0, _typeorm.Entity)({
   initializer: function () {
     return _amendment.default;
   }
-}), _descriptor8 = _applyDecoratedDescriptor(_class2.prototype, "amount", [_dec13], {
+}), _descriptor8 = _applyDecoratedDescriptor(_class2.prototype, "adjustment", [_dec13, _dec14], {
+  configurable: true,
+  enumerable: true,
+  writable: true,
+  initializer: function () {
+    return _adjustment.default;
+  }
+}), _descriptor9 = _applyDecoratedDescriptor(_class2.prototype, "amount", [_dec15], {
   configurable: true,
   enumerable: true,
   writable: true,
   initializer: null
-}), _descriptor9 = _applyDecoratedDescriptor(_class2.prototype, "created_at", [_dec14], {
+}), _descriptor10 = _applyDecoratedDescriptor(_class2.prototype, "created_at", [_dec16], {
   configurable: true,
   enumerable: true,
   writable: true,

package/dist/entity/nuvei/index.js

@@ -0,0 +1,14 @@
+"use strict";
+
+Object.defineProperty(exports, "__esModule", {
+  value: true
+});
+exports.default = void 0;
+
+var _transaction = _interopRequireDefault(require("./transaction"));
+
+function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }
+
+const ENTITIES = [_transaction.default];
+var _default = ENTITIES;
+exports.default = _default;

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

@@ -0,0 +1,216 @@
+"use strict";
+
+Object.defineProperty(exports, "__esModule", {
+  value: true
+});
+exports.default = void 0;
+
+var _typeorm = require("typeorm");
+
+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, _descriptor16, _descriptor17, _descriptor18, _descriptor19;
+
+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 Transaction = (_dec = (0, _typeorm.Entity)({
+  name: 'transaction',
+  schema: 'nuvei'
+}), _dec2 = (0, _typeorm.PrimaryColumn)("varchar"), _dec3 = (0, _typeorm.Column)({
+  type: "varchar",
+  length: 18
+}), _dec4 = (0, _typeorm.Column)({
+  type: "varchar",
+  length: 20
+}), _dec5 = (0, _typeorm.Column)({
+  type: "varchar",
+  length: 20
+}), _dec6 = (0, _typeorm.Column)({
+  type: "varchar",
+  length: 20
+}), _dec7 = (0, _typeorm.Column)({
+  type: "int"
+}), _dec8 = (0, _typeorm.Column)({
+  type: "varchar",
+  length: 5
+}), _dec9 = (0, _typeorm.Column)({
+  type: "varchar",
+  length: 28,
+  nullable: true
+}), _dec10 = (0, _typeorm.Column)({
+  type: "varchar",
+  length: 1,
+  nullable: true
+}), _dec11 = (0, _typeorm.Column)({
+  type: "varchar",
+  length: 36
+}), _dec12 = (0, _typeorm.Column)({
+  type: "varchar",
+  length: 36
+}), _dec13 = (0, _typeorm.Column)({
+  type: "varchar",
+  length: 6
+}), _dec14 = (0, _typeorm.Column)({
+  type: "varchar",
+  length: 6
+}), _dec15 = (0, _typeorm.Column)({
+  type: "int"
+}), _dec16 = (0, _typeorm.Column)({
+  type: "varchar",
+  length: 100
+}), _dec17 = (0, _typeorm.Column)({
+  type: "varchar",
+  length: 50,
+  nullable: true
+}), _dec18 = (0, _typeorm.Column)({
+  type: "timestamp without time zone"
+}), _dec19 = (0, _typeorm.Column)({
+  type: "varchar",
+  length: 50
+}), _dec20 = (0, _typeorm.Column)({
+  type: "varchar",
+  length: 1500
+}), _dec(_class = (_class2 = class Transaction {
+  constructor() {
+    _initializerDefineProperty(this, "order_id", _descriptor, this);
+
+    _initializerDefineProperty(this, "transaction_id", _descriptor2, this);
+
+    _initializerDefineProperty(this, "transaction_type", _descriptor3, this);
+
+    _initializerDefineProperty(this, "transaction_status", _descriptor4, this);
+
+    _initializerDefineProperty(this, "status", _descriptor5, this);
+
+    _initializerDefineProperty(this, "amount", _descriptor6, this);
+
+    _initializerDefineProperty(this, "currency", _descriptor7, this);
+
+    _initializerDefineProperty(this, "unique_cc", _descriptor8, this);
+
+    _initializerDefineProperty(this, "threeds_is_liability_on_issuer", _descriptor9, this);
+
+    _initializerDefineProperty(this, "session_token", _descriptor10, this);
+
+    _initializerDefineProperty(this, "client_unique_id", _descriptor11, this);
+
+    _initializerDefineProperty(this, "auth_code", _descriptor12, this);
+
+    _initializerDefineProperty(this, "merchant_site_id", _descriptor13, this);
+
+    _initializerDefineProperty(this, "err_code", _descriptor14, this);
+
+    _initializerDefineProperty(this, "reason", _descriptor15, this);
+
+    _initializerDefineProperty(this, "entity_id", _descriptor16, this);
+
+    _initializerDefineProperty(this, "processing_time", _descriptor17, this);
+
+    _initializerDefineProperty(this, "merchant_account_id", _descriptor18, this);
+
+    _initializerDefineProperty(this, "merchant_name", _descriptor19, this);
+  }
+
+}, (_descriptor = _applyDecoratedDescriptor(_class2.prototype, "order_id", [_dec2], {
+  configurable: true,
+  enumerable: true,
+  writable: true,
+  initializer: function () {
+    return undefined;
+  }
+}), _descriptor2 = _applyDecoratedDescriptor(_class2.prototype, "transaction_id", [_dec3], {
+  configurable: true,
+  enumerable: true,
+  writable: true,
+  initializer: null
+}), _descriptor3 = _applyDecoratedDescriptor(_class2.prototype, "transaction_type", [_dec4], {
+  configurable: true,
+  enumerable: true,
+  writable: true,
+  initializer: null
+}), _descriptor4 = _applyDecoratedDescriptor(_class2.prototype, "transaction_status", [_dec5], {
+  configurable: true,
+  enumerable: true,
+  writable: true,
+  initializer: null
+}), _descriptor5 = _applyDecoratedDescriptor(_class2.prototype, "status", [_dec6], {
+  configurable: true,
+  enumerable: true,
+  writable: true,
+  initializer: null
+}), _descriptor6 = _applyDecoratedDescriptor(_class2.prototype, "amount", [_dec7], {
+  configurable: true,
+  enumerable: true,
+  writable: true,
+  initializer: null
+}), _descriptor7 = _applyDecoratedDescriptor(_class2.prototype, "currency", [_dec8], {
+  configurable: true,
+  enumerable: true,
+  writable: true,
+  initializer: null
+}), _descriptor8 = _applyDecoratedDescriptor(_class2.prototype, "unique_cc", [_dec9], {
+  configurable: true,
+  enumerable: true,
+  writable: true,
+  initializer: null
+}), _descriptor9 = _applyDecoratedDescriptor(_class2.prototype, "threeds_is_liability_on_issuer", [_dec10], {
+  configurable: true,
+  enumerable: true,
+  writable: true,
+  initializer: null
+}), _descriptor10 = _applyDecoratedDescriptor(_class2.prototype, "session_token", [_dec11], {
+  configurable: true,
+  enumerable: true,
+  writable: true,
+  initializer: null
+}), _descriptor11 = _applyDecoratedDescriptor(_class2.prototype, "client_unique_id", [_dec12], {
+  configurable: true,
+  enumerable: true,
+  writable: true,
+  initializer: null
+}), _descriptor12 = _applyDecoratedDescriptor(_class2.prototype, "auth_code", [_dec13], {
+  configurable: true,
+  enumerable: true,
+  writable: true,
+  initializer: null
+}), _descriptor13 = _applyDecoratedDescriptor(_class2.prototype, "merchant_site_id", [_dec14], {
+  configurable: true,
+  enumerable: true,
+  writable: true,
+  initializer: null
+}), _descriptor14 = _applyDecoratedDescriptor(_class2.prototype, "err_code", [_dec15], {
+  configurable: true,
+  enumerable: true,
+  writable: true,
+  initializer: null
+}), _descriptor15 = _applyDecoratedDescriptor(_class2.prototype, "reason", [_dec16], {
+  configurable: true,
+  enumerable: true,
+  writable: true,
+  initializer: null
+}), _descriptor16 = _applyDecoratedDescriptor(_class2.prototype, "entity_id", [_dec17], {
+  configurable: true,
+  enumerable: true,
+  writable: true,
+  initializer: null
+}), _descriptor17 = _applyDecoratedDescriptor(_class2.prototype, "processing_time", [_dec18], {
+  configurable: true,
+  enumerable: true,
+  writable: true,
+  initializer: function () {
+    return null;
+  }
+}), _descriptor18 = _applyDecoratedDescriptor(_class2.prototype, "merchant_account_id", [_dec19], {
+  configurable: true,
+  enumerable: true,
+  writable: true,
+  initializer: null
+}), _descriptor19 = _applyDecoratedDescriptor(_class2.prototype, "merchant_name", [_dec20], {
+  configurable: true,
+  enumerable: true,
+  writable: true,
+  initializer: null
+})), _class2)) || _class);
+exports.default = Transaction;

package/dist/index.js

@@ -159,6 +159,12 @@ Object.defineProperty(exports, "NuapayTransactionEntity", {
     return _transaction.default;
   }
 });
+Object.defineProperty(exports, "NuveiTransactionEntity", {
+  enumerable: true,
+  get: function () {
+    return _transaction5.default;
+  }
+});
 Object.defineProperty(exports, "OrganisationEntity", {
   enumerable: true,
   get: function () {
@@ -520,6 +526,8 @@ var _organisationFeature = _interopRequireDefault(require("./entity/user/organis
 
 var _loginLink = _interopRequireDefault(require("./entity/user/login-link"));
 
+var _transaction5 = _interopRequireDefault(require("./entity/nuvei/transaction"));
+
 var _registration = _interopRequireDefault(require("./event/user/registration"));
 
 var _changed = _interopRequireDefault(require("./event/user/password/changed"));

package/dist/migration/1657713850640-ledger_adjustment.js

@@ -0,0 +1,15 @@
+const { MigrationInterface, QueryRunner } = require("typeorm");
+
+module.exports = class ledgerAdjustment1657713850640 {
+    name = 'ledgerAdjustment1657713850640'
+
+    async up(queryRunner) {
+        await queryRunner.query(`ALTER TABLE "bank"."ledger" ADD "adjustment_id" character varying`);
+        await queryRunner.query(`ALTER TABLE "bank"."ledger" ADD CONSTRAINT "FK_7563a6252b9059f5098b3f080e8" FOREIGN KEY ("adjustment_id") REFERENCES "bank"."adjustment"("id") ON DELETE NO ACTION ON UPDATE NO ACTION`);
+    }
+
+    async down(queryRunner) {
+        await queryRunner.query(`ALTER TABLE "bank"."ledger" DROP CONSTRAINT "FK_7563a6252b9059f5098b3f080e8"`);
+        await queryRunner.query(`ALTER TABLE "bank"."ledger" DROP COLUMN "adjustment_id"`);
+    }
+}

package/dist/migration/nuvei/1658229415800-nuvei-transaction-schema.js

@@ -0,0 +1,13 @@
+const { MigrationInterface, QueryRunner } = require("typeorm");
+
+module.exports = class nuveiTransactionSchema1658229415800 {
+    name = 'nuveiTransactionSchema1658229415800'
+
+    async up(queryRunner) {
+        await queryRunner.query(`CREATE TABLE "nuvei"."transaction" ("order_id" character varying NOT NULL, "transaction_id" character varying(18) NOT NULL, "transaction_type" character varying(20) NOT NULL, "transaction_status" character varying(20) NOT NULL, "status" character varying(20) NOT NULL, "amount" integer NOT NULL, "currency" character varying(5) NOT NULL, "unique_cc" character varying(28), "threeds_is_liability_on_issuer" character varying(1), "session_token" character varying(36) NOT NULL, "client_unique_id" character varying(36) NOT NULL, "auth_code" character varying(6) NOT NULL, "merchant_site_id" character varying(6) NOT NULL, "err_code" integer NOT NULL, "reason" character varying(100) NOT NULL, "entity_id" character varying(50), "processing_time" TIMESTAMP NOT NULL, "merchant_account_id" character varying(50) NOT NULL, "merchant_name" character varying(1500) NOT NULL, CONSTRAINT "PK_9011283056620f5eaa7ad74cef6" PRIMARY KEY ("order_id"))`);
+    }
+
+    async down(queryRunner) {
+        await queryRunner.query(`DROP TABLE "nuvei"."transaction"`);
+    }
+}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@felloh-org/lambda-wrapper",
-  "version": "1.1.37",
+  "version": "1.1.40",
   "description": "Lambda wrapper for all Felloh Serverless Projects",
   "main": "dist/index.js",
   "scripts": {