@felloh-org/lambda-wrapper 1.1.12 → 1.1.15

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

@@ -97,10 +97,14 @@ let Booking = (_dec = (0, _typeorm.Entity)({
       response.transactions = this.transactions.map(transaction => transaction.getPublicCompactData());
     }
 
-    if (typeof this.user.id !== 'undefined') {
+    if (this.user !== null && typeof this.user.id !== 'undefined') {
       response.user = this.user.getPublicCompactData();
     }
 
+    if (this.organisation !== null && typeof this.organisation.id !== 'undefined') {
+      response.organisation = this.organisation.getPublicCompactData();
+    }
+
     return response;
   }
 
@@ -172,4 +176,5 @@ let Booking = (_dec = (0, _typeorm.Entity)({
   writable: true,
   initializer: null
 })), _class2)) || _class);
-exports.default = Booking;
+exports.default = Booking;
+``;

package/dist/entity/payment/index.js

@@ -21,6 +21,8 @@ var _transactionStatus = _interopRequireDefault(require("./transaction-status"))
 
 var _transactionType = _interopRequireDefault(require("./transaction-type"));
 
+var _transactionSource = _interopRequireDefault(require("./transaction-source"));
+
 var _transactionMetadata = _interopRequireDefault(require("./transaction-metadata"));
 
 var _organisationPaymentProvider = _interopRequireDefault(require("./organisation-payment-provider"));
@@ -29,6 +31,6 @@ var _paymentProvider = _interopRequireDefault(require("./payment-provider"));
 
 function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }
 
-const ENTITIES = [_chargeback.default, _organisationPaymentProvider.default, _paymentLink.default, _paymentProvider.default, _transaction.default, _transactionEvent.default, _transactionEventType.default, _transactionMethod.default, _transactionStatus.default, _transactionType.default, _transactionMetadata.default];
+const ENTITIES = [_chargeback.default, _organisationPaymentProvider.default, _paymentLink.default, _paymentProvider.default, _transaction.default, _transactionEvent.default, _transactionEventType.default, _transactionMethod.default, _transactionStatus.default, _transactionSource.default, _transactionType.default, _transactionMetadata.default];
 var _default = ENTITIES;
 exports.default = _default;

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

@@ -150,6 +150,10 @@ let PaymentLink = (_dec = (0, _typeorm.Entity)({
       response.user = this.user.getPublicCompactData();
     }
 
+    if (this.organisation !== null && typeof this.organisation.id !== 'undefined') {
+      response.organisation = this.organisation.getPublicCompactData();
+    }
+
     return response;
   }
 

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

@@ -27,7 +27,9 @@ var _organisationPaymentProvider = _interopRequireDefault(require("../organisati
 
 var _transactionBatch = _interopRequireDefault(require("../../bank/transaction-batch"));
 
-var _dec, _dec2, _dec3, _dec4, _dec5, _dec6, _dec7, _dec8, _dec9, _dec10, _dec11, _dec12, _dec13, _dec14, _dec15, _dec16, _dec17, _dec18, _dec19, _dec20, _dec21, _dec22, _dec23, _dec24, _dec25, _dec26, _class, _class2, _descriptor, _descriptor2, _descriptor3, _descriptor4, _descriptor5, _descriptor6, _descriptor7, _descriptor8, _descriptor9, _descriptor10, _descriptor11, _descriptor12, _descriptor13, _descriptor14, _descriptor15, _descriptor16, _descriptor17;
+var _transactionSource = _interopRequireDefault(require("../transaction-source"));
+
+var _dec, _dec2, _dec3, _dec4, _dec5, _dec6, _dec7, _dec8, _dec9, _dec10, _dec11, _dec12, _dec13, _dec14, _dec15, _dec16, _dec17, _dec18, _dec19, _dec20, _dec21, _dec22, _dec23, _dec24, _dec25, _dec26, _dec27, _dec28, _class, _class2, _descriptor, _descriptor2, _descriptor3, _descriptor4, _descriptor5, _descriptor6, _descriptor7, _descriptor8, _descriptor9, _descriptor10, _descriptor11, _descriptor12, _descriptor13, _descriptor14, _descriptor15, _descriptor16, _descriptor17, _descriptor18;
 
 function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }
 
@@ -59,34 +61,39 @@ let Transaction = (_dec = (0, _typeorm.Entity)({
 }), _dec12 = (0, _typeorm.ManyToOne)(() => _transactionType.default), _dec13 = (0, _typeorm.JoinColumn)({
   name: 'type_id',
   referencedColumnName: 'id'
-}), _dec14 = (0, _typeorm.ManyToOne)(() => _paymentLink.default, {
+}), _dec14 = (0, _typeorm.ManyToOne)(() => _transactionSource.default, {
   nullable: true
 }), _dec15 = (0, _typeorm.JoinColumn)({
+  name: 'source_id',
+  referencedColumnName: 'id'
+}), _dec16 = (0, _typeorm.ManyToOne)(() => _paymentLink.default, {
+  nullable: true
+}), _dec17 = (0, _typeorm.JoinColumn)({
   name: 'payment_link_id',
   referencedColumnName: 'id'
-}), _dec16 = (0, _typeorm.OneToOne)(() => _transactionMetadata.default, transactionMetadata => transactionMetadata.transaction), _dec17 = (0, _typeorm.ManyToOne)(() => _paymentProvider.default), _dec18 = (0, _typeorm.JoinColumn)({
+}), _dec18 = (0, _typeorm.OneToOne)(() => _transactionMetadata.default, transactionMetadata => transactionMetadata.transaction), _dec19 = (0, _typeorm.ManyToOne)(() => _paymentProvider.default), _dec20 = (0, _typeorm.JoinColumn)({
   name: 'payment_provider_id',
   referencedColumnName: 'id'
-}), _dec19 = (0, _typeorm.ManyToOne)(() => _organisationPaymentProvider.default, {
+}), _dec21 = (0, _typeorm.ManyToOne)(() => _organisationPaymentProvider.default, {
   nullable: true
-}), _dec20 = (0, _typeorm.JoinColumn)({
+}), _dec22 = (0, _typeorm.JoinColumn)({
   name: 'organisation_payment_provider_id',
   referencedColumnName: 'id'
-}), _dec21 = (0, _typeorm.Column)({
+}), _dec23 = (0, _typeorm.Column)({
   type: "varchar",
   length: "250",
   nullable: true
-}), _dec22 = (0, _typeorm.Column)({
+}), _dec24 = (0, _typeorm.Column)({
   type: "timestamp with time zone",
   nullable: true
-}), _dec23 = (0, _typeorm.Column)({
+}), _dec25 = (0, _typeorm.Column)({
   type: "text",
   nullable: true
-}), _dec24 = (0, _typeorm.CreateDateColumn)({
+}), _dec26 = (0, _typeorm.CreateDateColumn)({
   type: 'timestamp with time zone'
-}), _dec25 = (0, _typeorm.UpdateDateColumn)({
+}), _dec27 = (0, _typeorm.UpdateDateColumn)({
   type: 'timestamp with time zone'
-}), _dec26 = (0, _typeorm.OneToMany)(() => _transactionBatch.default, transactionBatch => transactionBatch.transaction), _dec(_class = (_class2 = class Transaction {
+}), _dec28 = (0, _typeorm.OneToMany)(() => _transactionBatch.default, transactionBatch => transactionBatch.transaction), _dec(_class = (_class2 = class Transaction {
   constructor() {
     _initializerDefineProperty(this, "id", _descriptor, this);
 
@@ -102,25 +109,27 @@ let Transaction = (_dec = (0, _typeorm.Entity)({
 
     _initializerDefineProperty(this, "type", _descriptor7, this);
 
-    _initializerDefineProperty(this, "payment_link", _descriptor8, this);
+    _initializerDefineProperty(this, "source", _descriptor8, this);
 
-    _initializerDefineProperty(this, "metadata", _descriptor9, this);
+    _initializerDefineProperty(this, "payment_link", _descriptor9, this);
 
-    _initializerDefineProperty(this, "payment_provider", _descriptor10, this);
+    _initializerDefineProperty(this, "metadata", _descriptor10, this);
 
-    _initializerDefineProperty(this, "organisation_payment_provider", _descriptor11, this);
+    _initializerDefineProperty(this, "payment_provider", _descriptor11, this);
 
-    _initializerDefineProperty(this, "provider_reference", _descriptor12, this);
+    _initializerDefineProperty(this, "organisation_payment_provider", _descriptor12, this);
 
-    _initializerDefineProperty(this, "completed_at", _descriptor13, this);
+    _initializerDefineProperty(this, "provider_reference", _descriptor13, this);
 
-    _initializerDefineProperty(this, "message", _descriptor14, this);
+    _initializerDefineProperty(this, "completed_at", _descriptor14, this);
 
-    _initializerDefineProperty(this, "created_at", _descriptor15, this);
+    _initializerDefineProperty(this, "message", _descriptor15, this);
 
-    _initializerDefineProperty(this, "updated_at", _descriptor16, this);
+    _initializerDefineProperty(this, "created_at", _descriptor16, this);
 
-    _initializerDefineProperty(this, "batch", _descriptor17, this);
+    _initializerDefineProperty(this, "updated_at", _descriptor17, this);
+
+    _initializerDefineProperty(this, "batch", _descriptor18, this);
   }
 
   getPublicData() {
@@ -138,11 +147,15 @@ let Transaction = (_dec = (0, _typeorm.Entity)({
       response.booking = this.booking.getPublicData();
     }
 
+    if (this.organisation !== null && typeof this.organisation.id !== 'undefined') {
+      response.organisation = this.organisation.getPublicCompactData();
+    }
+
     return response;
   }
 
   getPublicCompactData() {
-    return {
+    const response = {
       id: this.id,
       amount: this.amount,
       status: this.status.id,
@@ -151,6 +164,12 @@ let Transaction = (_dec = (0, _typeorm.Entity)({
       created_at: this.created_at,
       completed_at: this.completed_at
     };
+
+    if (this.organisation !== null && typeof this.organisation.id !== 'undefined') {
+      response.organisation = this.organisation.getPublicCompactData();
+    }
+
+    return response;
   }
 
 }, (_descriptor = _applyDecoratedDescriptor(_class2.prototype, "id", [_dec2], {
@@ -200,60 +219,67 @@ let Transaction = (_dec = (0, _typeorm.Entity)({
   initializer: function () {
     return _transactionType.default;
   }
-}), _descriptor8 = _applyDecoratedDescriptor(_class2.prototype, "payment_link", [_dec14, _dec15], {
+}), _descriptor8 = _applyDecoratedDescriptor(_class2.prototype, "source", [_dec14, _dec15], {
+  configurable: true,
+  enumerable: true,
+  writable: true,
+  initializer: function () {
+    return _transactionSource.default;
+  }
+}), _descriptor9 = _applyDecoratedDescriptor(_class2.prototype, "payment_link", [_dec16, _dec17], {
   configurable: true,
   enumerable: true,
   writable: true,
   initializer: function () {
     return _paymentLink.default;
   }
-}), _descriptor9 = _applyDecoratedDescriptor(_class2.prototype, "metadata", [_dec16], {
+}), _descriptor10 = _applyDecoratedDescriptor(_class2.prototype, "metadata", [_dec18], {
   configurable: true,
   enumerable: true,
   writable: true,
   initializer: null
-}), _descriptor10 = _applyDecoratedDescriptor(_class2.prototype, "payment_provider", [_dec17, _dec18], {
+}), _descriptor11 = _applyDecoratedDescriptor(_class2.prototype, "payment_provider", [_dec19, _dec20], {
   configurable: true,
   enumerable: true,
   writable: true,
   initializer: function () {
     return _paymentProvider.default;
   }
-}), _descriptor11 = _applyDecoratedDescriptor(_class2.prototype, "organisation_payment_provider", [_dec19, _dec20], {
+}), _descriptor12 = _applyDecoratedDescriptor(_class2.prototype, "organisation_payment_provider", [_dec21, _dec22], {
   configurable: true,
   enumerable: true,
   writable: true,
   initializer: function () {
     return _organisationPaymentProvider.default;
   }
-}), _descriptor12 = _applyDecoratedDescriptor(_class2.prototype, "provider_reference", [_dec21], {
+}), _descriptor13 = _applyDecoratedDescriptor(_class2.prototype, "provider_reference", [_dec23], {
   configurable: true,
   enumerable: true,
   writable: true,
   initializer: function () {
     return "";
   }
-}), _descriptor13 = _applyDecoratedDescriptor(_class2.prototype, "completed_at", [_dec22], {
+}), _descriptor14 = _applyDecoratedDescriptor(_class2.prototype, "completed_at", [_dec24], {
   configurable: true,
   enumerable: true,
   writable: true,
   initializer: null
-}), _descriptor14 = _applyDecoratedDescriptor(_class2.prototype, "message", [_dec23], {
+}), _descriptor15 = _applyDecoratedDescriptor(_class2.prototype, "message", [_dec25], {
   configurable: true,
   enumerable: true,
   writable: true,
   initializer: null
-}), _descriptor15 = _applyDecoratedDescriptor(_class2.prototype, "created_at", [_dec24], {
+}), _descriptor16 = _applyDecoratedDescriptor(_class2.prototype, "created_at", [_dec26], {
   configurable: true,
   enumerable: true,
   writable: true,
   initializer: null
-}), _descriptor16 = _applyDecoratedDescriptor(_class2.prototype, "updated_at", [_dec25], {
+}), _descriptor17 = _applyDecoratedDescriptor(_class2.prototype, "updated_at", [_dec27], {
   configurable: true,
   enumerable: true,
   writable: true,
   initializer: null
-}), _descriptor17 = _applyDecoratedDescriptor(_class2.prototype, "batch", [_dec26], {
+}), _descriptor18 = _applyDecoratedDescriptor(_class2.prototype, "batch", [_dec28], {
   configurable: true,
   enumerable: true,
   writable: true,

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

@@ -0,0 +1,39 @@
+"use strict";
+
+Object.defineProperty(exports, "__esModule", {
+  value: true
+});
+exports.default = void 0;
+
+var _typeorm = require("typeorm");
+
+var _dec, _dec2, _dec3, _class, _class2, _descriptor, _descriptor2;
+
+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 TransactionSource = (_dec = (0, _typeorm.Entity)({
+  name: 'transaction_source',
+  schema: 'payment'
+}), _dec2 = (0, _typeorm.PrimaryColumn)("varchar"), _dec3 = (0, _typeorm.CreateDateColumn)(), _dec(_class = (_class2 = class TransactionSource {
+  constructor() {
+    _initializerDefineProperty(this, "id", _descriptor, this);
+
+    _initializerDefineProperty(this, "created_at", _descriptor2, this);
+  }
+
+}, (_descriptor = _applyDecoratedDescriptor(_class2.prototype, "id", [_dec2], {
+  configurable: true,
+  enumerable: true,
+  writable: true,
+  initializer: null
+}), _descriptor2 = _applyDecoratedDescriptor(_class2.prototype, "created_at", [_dec3], {
+  configurable: true,
+  enumerable: true,
+  writable: true,
+  initializer: null
+})), _class2)) || _class);
+exports.default = TransactionSource;

package/dist/index.js

@@ -327,6 +327,12 @@ Object.defineProperty(exports, "TransactionMethodEntity", {
     return _transactionMethod.default;
   }
 });
+Object.defineProperty(exports, "TransactionSourceEntity", {
+  enumerable: true,
+  get: function () {
+    return _transactionSource.default;
+  }
+});
 Object.defineProperty(exports, "TransactionStatusEntity", {
   enumerable: true,
   get: function () {
@@ -444,6 +450,8 @@ var _transactionType = _interopRequireDefault(require("./entity/payment/transact
 
 var _transactionMetadata = _interopRequireDefault(require("./entity/payment/transaction-metadata"));
 
+var _transactionSource = _interopRequireDefault(require("./entity/payment/transaction-source"));
+
 var _transaction3 = _interopRequireDefault(require("./entity/total-processing/transaction"));
 
 var _transactionMetadata2 = _interopRequireDefault(require("./entity/total-processing/transaction-metadata"));

package/dist/migration/payment/1653296149259-transaction_source.js

@@ -0,0 +1,17 @@
+const { MigrationInterface, QueryRunner } = require("typeorm");
+
+module.exports = class transactionSource1653296149259 {
+    name = 'transactionSource1653296149259'
+
+    async up(queryRunner) {
+        await queryRunner.query(`CREATE TABLE "payment"."transaction_source" ("id" character varying NOT NULL, "created_at" TIMESTAMP NOT NULL DEFAULT now(), CONSTRAINT "PK_67d99beee5e33632f3c765e5123" PRIMARY KEY ("id"))`);
+        await queryRunner.query(`ALTER TABLE "payment"."transaction" ADD "source_id" character varying`);
+        await queryRunner.query(`ALTER TABLE "payment"."transaction" ADD CONSTRAINT "FK_67d99beee5e33632f3c765e5123" FOREIGN KEY ("source_id") REFERENCES "payment"."transaction_source"("id") ON DELETE NO ACTION ON UPDATE NO ACTION`);
+    }
+
+    async down(queryRunner) {
+        await queryRunner.query(`ALTER TABLE "payment"."transaction" DROP CONSTRAINT "FK_67d99beee5e33632f3c765e5123"`);
+        await queryRunner.query(`ALTER TABLE "payment"."transaction" DROP COLUMN "source_id"`);
+        await queryRunner.query(`DROP TABLE "payment"."transaction_source"`);
+    }
+}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@felloh-org/lambda-wrapper",
-  "version": "1.1.12",
+  "version": "1.1.15",
   "description": "Lambda wrapper for all Felloh Serverless Projects",
   "main": "dist/index.js",
   "scripts": {
@@ -57,7 +57,7 @@
     "dotenv": "^16.0.0",
     "epsagon": "^1.121.3",
     "typeorm": "^0.2.41",
-    "typeorm-aurora-data-api-driver": "^2.3.5",
+    "typeorm-aurora-data-api-driver": "^2.4.2",
     "useragent": "^2.3.0",
     "uuid": "^8.3.2",
     "validate.js": "^0.13.1",