@felloh-org/lambda-wrapper 1.1.27 → 1.1.30

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/agent-data/booking-component/index.js

@@ -13,7 +13,9 @@ var _supplier = _interopRequireDefault(require("../supplier"));
 
 var _booking = _interopRequireDefault(require("../booking"));
 
-var _dec, _dec2, _dec3, _dec4, _dec5, _dec6, _dec7, _dec8, _dec9, _dec10, _dec11, _class, _class2, _descriptor, _descriptor2, _descriptor3, _descriptor4, _descriptor5, _descriptor6, _descriptor7, _descriptor8;
+var _organisation = _interopRequireDefault(require("../../user/organisation"));
+
+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 }; }
 
@@ -34,21 +36,24 @@ let BookingComponent = (_dec = (0, _typeorm.Entity)({
 }), _dec6 = (0, _typeorm.JoinColumn)({
   name: 'supplier_id',
   referencedColumnName: 'id'
-}), _dec7 = (0, _typeorm.Column)({
+}), _dec7 = (0, _typeorm.ManyToOne)(() => _organisation.default), _dec8 = (0, _typeorm.JoinColumn)({
+  name: 'organisation_id',
+  referencedColumnName: 'id'
+}), _dec9 = (0, _typeorm.Column)({
   type: "int",
   nullable: true
-}), _dec8 = (0, _typeorm.Column)({
+}), _dec10 = (0, _typeorm.Column)({
   type: "varchar",
   length: "150",
   nullable: true
-}), _dec9 = (0, _typeorm.Column)({
+}), _dec11 = (0, _typeorm.Column)({
   type: "varchar",
   length: "10",
   nullable: true
-}), _dec10 = (0, _typeorm.Column)({
+}), _dec12 = (0, _typeorm.Column)({
   type: "varchar",
   length: "40"
-}), _dec11 = (0, _typeorm.CreateDateColumn)(), _dec(_class = (_class2 = class BookingComponent {
+}), _dec13 = (0, _typeorm.CreateDateColumn)(), _dec(_class = (_class2 = class BookingComponent {
   constructor() {
     _initializerDefineProperty(this, "id", _descriptor, this);
 
@@ -56,25 +61,34 @@ let BookingComponent = (_dec = (0, _typeorm.Entity)({
 
     _initializerDefineProperty(this, "supplier", _descriptor3, this);
 
-    _initializerDefineProperty(this, "amount", _descriptor4, this);
+    _initializerDefineProperty(this, "organisation", _descriptor4, this);
+
+    _initializerDefineProperty(this, "amount", _descriptor5, this);
 
-    _initializerDefineProperty(this, "booking_reference", _descriptor5, this);
+    _initializerDefineProperty(this, "booking_reference", _descriptor6, this);
 
-    _initializerDefineProperty(this, "destination_air", _descriptor6, this);
+    _initializerDefineProperty(this, "destination_air", _descriptor7, this);
 
-    _initializerDefineProperty(this, "type", _descriptor7, this);
+    _initializerDefineProperty(this, "type", _descriptor8, this);
 
-    _initializerDefineProperty(this, "created_at", _descriptor8, this);
+    _initializerDefineProperty(this, "created_at", _descriptor9, this);
   }
 
   getPublicCompactData() {
-    return {
+    const response = {
       id: this.id,
       supplier: this.supplier,
       amount: this.amount,
       booking_reference: this.booking_reference,
-      destination_air: this.destination_air
+      destination_air: this.destination_air,
+      type: this.type
     };
+
+    if (this.organisation !== null && typeof this.organisation.id !== 'undefined') {
+      response.organisation = this.organisation.getPublicCompactData();
+    }
+
+    return response;
   }
 
 }, (_descriptor = _applyDecoratedDescriptor(_class2.prototype, "id", [_dec2], {
@@ -98,33 +112,40 @@ let BookingComponent = (_dec = (0, _typeorm.Entity)({
   initializer: function () {
     return _supplier.default;
   }
-}), _descriptor4 = _applyDecoratedDescriptor(_class2.prototype, "amount", [_dec7], {
+}), _descriptor4 = _applyDecoratedDescriptor(_class2.prototype, "organisation", [_dec7, _dec8], {
+  configurable: true,
+  enumerable: true,
+  writable: true,
+  initializer: function () {
+    return _organisation.default;
+  }
+}), _descriptor5 = _applyDecoratedDescriptor(_class2.prototype, "amount", [_dec9], {
   configurable: true,
   enumerable: true,
   writable: true,
   initializer: null
-}), _descriptor5 = _applyDecoratedDescriptor(_class2.prototype, "booking_reference", [_dec8], {
+}), _descriptor6 = _applyDecoratedDescriptor(_class2.prototype, "booking_reference", [_dec10], {
   configurable: true,
   enumerable: true,
   writable: true,
   initializer: function () {
     return null;
   }
-}), _descriptor6 = _applyDecoratedDescriptor(_class2.prototype, "destination_air", [_dec9], {
+}), _descriptor7 = _applyDecoratedDescriptor(_class2.prototype, "destination_air", [_dec11], {
   configurable: true,
   enumerable: true,
   writable: true,
   initializer: function () {
     return null;
   }
-}), _descriptor7 = _applyDecoratedDescriptor(_class2.prototype, "type", [_dec10], {
+}), _descriptor8 = _applyDecoratedDescriptor(_class2.prototype, "type", [_dec12], {
   configurable: true,
   enumerable: true,
   writable: true,
   initializer: function () {
     return null;
   }
-}), _descriptor8 = _applyDecoratedDescriptor(_class2.prototype, "created_at", [_dec11], {
+}), _descriptor9 = _applyDecoratedDescriptor(_class2.prototype, "created_at", [_dec13], {
   configurable: true,
   enumerable: true,
   writable: true,

package/dist/entity/agent-data/supplier/index.js

@@ -11,7 +11,9 @@ var _organisation = _interopRequireDefault(require("../../user/organisation"));
 
 var _uuid = require("uuid");
 
-var _dec, _dec2, _dec3, _dec4, _dec5, _dec6, _class, _class2, _descriptor, _descriptor2, _descriptor3, _descriptor4;
+var _bookingComponent = _interopRequireDefault(require("../booking-component"));
+
+var _dec, _dec2, _dec3, _dec4, _dec5, _dec6, _dec7, _class, _class2, _descriptor, _descriptor2, _descriptor3, _descriptor4, _descriptor5;
 
 function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }
 
@@ -30,7 +32,7 @@ let Supplier = (_dec = (0, _typeorm.Entity)({
 }), _dec5 = (0, _typeorm.Column)({
   type: "varchar",
   length: "150"
-}), _dec6 = (0, _typeorm.CreateDateColumn)(), _dec(_class = (_class2 = class Supplier {
+}), _dec6 = (0, _typeorm.OneToMany)(() => _bookingComponent.default, bookingComponent => bookingComponent.supplier), _dec7 = (0, _typeorm.CreateDateColumn)(), _dec(_class = (_class2 = class Supplier {
   constructor() {
     _initializerDefineProperty(this, "id", _descriptor, this);
 
@@ -38,7 +40,9 @@ let Supplier = (_dec = (0, _typeorm.Entity)({
 
     _initializerDefineProperty(this, "name", _descriptor3, this);
 
-    _initializerDefineProperty(this, "created_at", _descriptor4, this);
+    _initializerDefineProperty(this, "components", _descriptor4, this);
+
+    _initializerDefineProperty(this, "created_at", _descriptor5, this);
   }
 
   getPublicData() {
@@ -70,7 +74,12 @@ let Supplier = (_dec = (0, _typeorm.Entity)({
   initializer: function () {
     return "";
   }
-}), _descriptor4 = _applyDecoratedDescriptor(_class2.prototype, "created_at", [_dec6], {
+}), _descriptor4 = _applyDecoratedDescriptor(_class2.prototype, "components", [_dec6], {
+  configurable: true,
+  enumerable: true,
+  writable: true,
+  initializer: null
+}), _descriptor5 = _applyDecoratedDescriptor(_class2.prototype, "created_at", [_dec7], {
   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,19 @@ let Transaction = (_dec = (0, _typeorm.Entity)({
       completed_at: this.completed_at
     };
 
-    if (this.booking !== null) {
+    if (this.booking !== null && typeof this.booking.id !== 'undefined') {
+      console.log(this.booking);
       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/agent-data/1656422133900-booking_components_organisation.js

@@ -0,0 +1,15 @@
+const { MigrationInterface, QueryRunner } = require("typeorm");
+
+module.exports = class bookingComponentsOrganisation1656422133900 {
+    name = 'bookingComponentsOrganisation1656422133900'
+
+    async up(queryRunner) {
+        await queryRunner.query(`ALTER TABLE "agent_data"."booking_component" ADD "organisation_id" character varying(150)`);
+        await queryRunner.query(`ALTER TABLE "agent_data"."booking_component" ADD CONSTRAINT "FK_73a6d52c40bb11da01800c5f7ed" FOREIGN KEY ("organisation_id") REFERENCES "user"."organisation"("id") ON DELETE NO ACTION ON UPDATE NO ACTION`);
+    }
+
+    async down(queryRunner) {
+        await queryRunner.query(`ALTER TABLE "agent_data"."booking_component" DROP CONSTRAINT "FK_73a6d52c40bb11da01800c5f7ed"`);
+        await queryRunner.query(`ALTER TABLE "agent_data"."booking_component" DROP COLUMN "organisation_id"`);
+    }
+}

package/dist/service/request.js

@@ -7,6 +7,8 @@ exports.default = exports.REQUEST_TYPES = exports.HTTP_METHODS_WITH_PAYLOADS = e
 
 var _querystring = _interopRequireDefault(require("querystring"));
 
+var _moment = _interopRequireDefault(require("moment"));
+
 var _useragent = _interopRequireDefault(require("useragent"));
 
 var _validate = _interopRequireDefault(require("validate.js/validate"));
@@ -24,6 +26,11 @@ function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { de
 /* eslint-disable class-methods-use-this */
 
 /* eslint-disable sonarjs/no-duplicate-string */
+_validate.default.extend(_validate.default.validators.datetime, {
+  parse: value => +_moment.default.utc(value),
+  format: (value, options) => _moment.default.utc(value).format(options.dateOnly ? 'YYYY-MM-DD' : 'YYYY-MM-DD hh:mm:ss')
+});
+
 const REQUEST_TYPES = {
   DELETE: 'DELETE',
   GET: 'GET',

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@felloh-org/lambda-wrapper",
-  "version": "1.1.27",
+  "version": "1.1.30",
   "description": "Lambda wrapper for all Felloh Serverless Projects",
   "main": "dist/index.js",
   "scripts": {
@@ -56,6 +56,7 @@
     "axios": "^0.26.1",
     "dotenv": "^16.0.0",
     "epsagon": "^1.121.3",
+    "moment": "^2.29.3",
     "typeorm": "^0.2.41",
     "typeorm-aurora-data-api-driver": "^2.4.2",
     "useragent": "^2.3.0",