@felloh-org/lambda-wrapper 1.1.29 → 1.1.32

package/.concourse/pipeline.yml

@@ -127,3 +127,43 @@ jobs:
       params:
         alert_type: 'failed'
         message: Migrations deployment failed
+
+  - name: 'migrations.sandbox'
+    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.sandbox))
+          WAREHOUSE_SECRET_ARN: ((aws.secret_manager.warehouse_secret_arn.sandbox))
+          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.sandbox))
+          WAREHOUSE_SECRET_ARN: ((aws.secret_manager.warehouse_secret_arn.sandbox))
+          WAREHOUSE_DATABASE: 'felloh'
+          WAREHOUSE_SCHEMA: 'user'
+    on_failure:
+      put: slack-alert-deploy
+      params:
+        alert_type: 'failed'
+        message: Migrations deployment failed

package/dist/entity/payment/organisation-payment-provider/index.js

@@ -15,7 +15,7 @@ var _paymentProvider = _interopRequireDefault(require("../payment-provider"));
 
 var _transactionMethod = _interopRequireDefault(require("../transaction-method"));
 
-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 }; }
 
@@ -51,12 +51,15 @@ let OrganisationPaymentProvider = (_dec = (0, _typeorm.Entity)({
   type: "varchar",
   length: "150"
 }), _dec10 = (0, _typeorm.Column)({
+  type: "json",
+  nullable: true
+}), _dec11 = (0, _typeorm.Column)({
   type: "varchar",
   length: "512"
-}), _dec11 = (0, _typeorm.Column)({
+}), _dec12 = (0, _typeorm.Column)({
   type: "varchar",
   length: "4"
-}), _dec12 = (0, _typeorm.CreateDateColumn)(), _dec(_class = (_class2 = class OrganisationPaymentProvider {
+}), _dec13 = (0, _typeorm.CreateDateColumn)(), _dec(_class = (_class2 = class OrganisationPaymentProvider {
   constructor() {
     _initializerDefineProperty(this, "id", _descriptor, this);
 
@@ -68,11 +71,13 @@ let OrganisationPaymentProvider = (_dec = (0, _typeorm.Entity)({
 
     _initializerDefineProperty(this, "public_key", _descriptor5, this);
 
-    _initializerDefineProperty(this, "secret_key", _descriptor6, this);
+    _initializerDefineProperty(this, "public_creds", _descriptor6, this);
 
-    _initializerDefineProperty(this, "secret_key_last_four", _descriptor7, this);
+    _initializerDefineProperty(this, "secret_key", _descriptor7, this);
 
-    _initializerDefineProperty(this, "created_at", _descriptor8, this);
+    _initializerDefineProperty(this, "secret_key_last_four", _descriptor8, this);
+
+    _initializerDefineProperty(this, "created_at", _descriptor9, this);
   }
 
 }, (_descriptor = _applyDecoratedDescriptor(_class2.prototype, "id", [_dec2], {
@@ -108,21 +113,26 @@ let OrganisationPaymentProvider = (_dec = (0, _typeorm.Entity)({
   initializer: function () {
     return "";
   }
-}), _descriptor6 = _applyDecoratedDescriptor(_class2.prototype, "secret_key", [_dec10], {
+}), _descriptor6 = _applyDecoratedDescriptor(_class2.prototype, "public_creds", [_dec10], {
+  configurable: true,
+  enumerable: true,
+  writable: true,
+  initializer: null
+}), _descriptor7 = _applyDecoratedDescriptor(_class2.prototype, "secret_key", [_dec11], {
   configurable: true,
   enumerable: true,
   writable: true,
   initializer: function () {
     return "";
   }
-}), _descriptor7 = _applyDecoratedDescriptor(_class2.prototype, "secret_key_last_four", [_dec11], {
+}), _descriptor8 = _applyDecoratedDescriptor(_class2.prototype, "secret_key_last_four", [_dec12], {
   configurable: true,
   enumerable: true,
   writable: true,
   initializer: function () {
     return "";
   }
-}), _descriptor8 = _applyDecoratedDescriptor(_class2.prototype, "created_at", [_dec12], {
+}), _descriptor9 = _applyDecoratedDescriptor(_class2.prototype, "created_at", [_dec13], {
   configurable: true,
   enumerable: true,
   writable: true,

package/dist/entity/payment/payment-link/index.js

@@ -146,7 +146,7 @@ let PaymentLink = (_dec = (0, _typeorm.Entity)({
       }
     };
 
-    if (this.booking !== null) {
+    if (this.booking !== null && typeof this.booking.id !== 'undefined') {
       response.booking = this.booking.getPublicData();
     }
 
@@ -154,7 +154,7 @@ let PaymentLink = (_dec = (0, _typeorm.Entity)({
       response.transactions = this.transactions.map(transaction => transaction.getPublicCompactData());
     }
 
-    if (this.user !== null) {
+    if (this.user !== null && typeof this.user.id !== 'undefined') {
       response.user = this.user.getPublicCompactData();
     }
 

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

@@ -143,10 +143,18 @@ let Transaction = (_dec = (0, _typeorm.Entity)({
       completed_at: this.completed_at
     };
 
-    if (this.booking !== null) {
+    if (this.booking !== null && typeof this.booking.id !== 'undefined') {
       response.booking = this.booking.getPublicData();
     }
 
+    if (this.payment_link !== null && typeof this.payment_link !== 'undefined') {
+      response.payment_link = this.payment_link.getPublicData();
+    }
+
+    if (this.metadata !== null) {
+      response.metadata = this.metadata;
+    }
+
     if (this.organisation !== null && typeof this.organisation.id !== 'undefined') {
       response.organisation = this.organisation.getPublicCompactData();
     }

package/dist/migration/payment/1657616863683-payment-provider-public-creds.js

@@ -0,0 +1,13 @@
+const { MigrationInterface, QueryRunner } = require("typeorm");
+
+module.exports = class paymentProviderPublicCreds1657616863683 {
+    name = 'paymentProviderPublicCreds1657616863683'
+
+    async up(queryRunner) {
+        await queryRunner.query(`ALTER TABLE "payment"."organisation_payment_provider" ADD "public_creds" json`);
+    }
+
+    async down(queryRunner) {
+        await queryRunner.query(`ALTER TABLE "user"."user_organisation" DROP CONSTRAINT "FK_81c4608739c8cf71fa1f96e11ae"`);
+    }
+}

package/package.json

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