@felloh-org/lambda-wrapper 1.11.3 → 1.11.5

package/.concourse/pipeline.yml

@@ -145,9 +145,9 @@ jobs:
           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.sandbox))
-          WAREHOUSE_SECRET_ARN: ((aws.secret_manager.warehouse_secret_arn.sandbox))
-          WAREHOUSE_DATABASE: 'felloh'
+          WAREHOUSE_ARN: ((aws.rds.warehouse_arn.staging))
+          WAREHOUSE_SECRET_ARN: ((aws.secret_manager.warehouse_secret_arn.staging))
+          WAREHOUSE_DATABASE: 'sandbox'
           WAREHOUSE_SCHEMA: 'user'
       - task: 'migrations.run'
         file: concourse-scripts/scripts/pulumi_npm_run/npm_run.yml
@@ -158,9 +158,9 @@ jobs:
           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.sandbox))
-          WAREHOUSE_SECRET_ARN: ((aws.secret_manager.warehouse_secret_arn.sandbox))
-          WAREHOUSE_DATABASE: 'felloh'
+          WAREHOUSE_ARN: ((aws.rds.warehouse_arn.staging))
+          WAREHOUSE_SECRET_ARN: ((aws.secret_manager.warehouse_secret_arn.staging))
+          WAREHOUSE_DATABASE: 'sandbox'
           WAREHOUSE_SCHEMA: 'user'
     on_failure:
       put: slack-alert-deploy
@@ -185,9 +185,9 @@ jobs:
           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_ARN: ((aws.rds.warehouse_arn.staging))
+          WAREHOUSE_SECRET_ARN: ((aws.secret_manager.warehouse_secret_arn.staging))
+          WAREHOUSE_DATABASE: 'pr'
           WAREHOUSE_SCHEMA: 'user'
       - task: 'migrations.run'
         file: concourse-scripts/scripts/pulumi_npm_run/npm_run.yml
@@ -198,9 +198,9 @@ jobs:
           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_ARN: ((aws.rds.warehouse_arn.staging))
+          WAREHOUSE_SECRET_ARN: ((aws.secret_manager.warehouse_secret_arn.staging))
+          WAREHOUSE_DATABASE: 'pr'
           WAREHOUSE_SCHEMA: 'user'
     on_failure:
       put: slack-alert-deploy

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

@@ -15,7 +15,9 @@ var _transactionBatch = _interopRequireDefault(require("../transaction-batch"));
 
 var _currency = require("../currency");
 
-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, _descriptor11, _descriptor12;
+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;
 
 function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }
 
@@ -58,7 +60,7 @@ let Disbursal = (_dec = (0, _typeorm.Entity)({
 }), _dec15 = (0, _typeorm.Column)({
   type: "boolean",
   default: false
-}), _dec(_class = (_class2 = class Disbursal {
+}), _dec16 = (0, _typeorm.OneToOne)(() => _transaction.default, transaction => transaction.disbursal), _dec(_class = (_class2 = class Disbursal {
   constructor() {
     _initializerDefineProperty(this, "id", _descriptor, this);
 
@@ -83,6 +85,8 @@ let Disbursal = (_dec = (0, _typeorm.Entity)({
     _initializerDefineProperty(this, "is_manual_review", _descriptor11, this);
 
     _initializerDefineProperty(this, "updated_legacy_system", _descriptor12, this);
+
+    _initializerDefineProperty(this, "bank_transaction", _descriptor13, this);
   }
 
   getPublicData() {
@@ -96,6 +100,10 @@ let Disbursal = (_dec = (0, _typeorm.Entity)({
       provider_reference: this.provider_reference
     };
 
+    if (this.bank_transaction) {
+      data.bank_transaction = this.bank_transaction;
+    }
+
     if (this.batch && this.batch.length >= 1) {
       data.transactions = this.batch.map(batch => batch.transaction.getPublicCompactData());
     }
@@ -179,5 +187,12 @@ let Disbursal = (_dec = (0, _typeorm.Entity)({
   initializer: function () {
     return false;
   }
+}), _descriptor13 = _applyDecoratedDescriptor(_class2.prototype, "bank_transaction", [_dec16], {
+  configurable: true,
+  enumerable: true,
+  writable: true,
+  initializer: function () {
+    return _transaction.default;
+  }
 })), _class2)) || _class);
 exports.default = Disbursal;

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

@@ -13,7 +13,7 @@ var _organisationFeature = _interopRequireDefault(require("../organisation-featu
 
 var _organisationType = _interopRequireDefault(require("../organisation-type"));
 
-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;
+var _dec, _dec2, _dec3, _dec4, _dec5, _dec6, _dec7, _dec8, _dec9, _dec10, _dec11, _dec12, _dec13, _dec14, _dec15, _dec16, _dec17, _dec18, _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 }; }
 
@@ -57,6 +57,9 @@ let Organisation = (_dec = (0, _typeorm.Entity)({
 }), _dec17 = (0, _typeorm.Column)({
   type: "boolean",
   default: false
+}), _dec18 = (0, _typeorm.Column)({
+  type: "boolean",
+  default: false
 }), _dec(_class = _dec2(_class = (_class2 = class Organisation {
   constructor() {
     _initializerDefineProperty(this, "id", _descriptor, this);
@@ -84,6 +87,8 @@ let Organisation = (_dec = (0, _typeorm.Entity)({
     _initializerDefineProperty(this, "organisation_type", _descriptor12, this);
 
     _initializerDefineProperty(this, "unpaid_invoice", _descriptor13, this);
+
+    _initializerDefineProperty(this, "billing_enabled", _descriptor14, this);
   }
 
   propgate(id, name) {
@@ -204,5 +209,12 @@ let Organisation = (_dec = (0, _typeorm.Entity)({
   initializer: function () {
     return false;
   }
+}), _descriptor14 = _applyDecoratedDescriptor(_class2.prototype, "billing_enabled", [_dec18], {
+  configurable: true,
+  enumerable: true,
+  writable: true,
+  initializer: function () {
+    return false;
+  }
 })), _class2)) || _class) || _class);
 exports.default = Organisation;

package/dist/migration/1688040388864-org_billing_enabled.js

@@ -0,0 +1,13 @@
+const { MigrationInterface, QueryRunner } = require("typeorm");
+
+module.exports = class orgBillingEnabled1688040388864 {
+    name = 'orgBillingEnabled1688040388864'
+
+    async up(queryRunner) {
+        await queryRunner.query(`ALTER TABLE "user"."organisation" ADD "billing_enabled" boolean NOT NULL DEFAULT false`);
+    }
+
+    async down(queryRunner) {
+        await queryRunner.query(`ALTER TABLE "user"."organisation" DROP COLUMN "billing_enabled"`);
+    }
+}

package/package.json

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