@felloh-org/lambda-wrapper 1.11.10 → 1.11.12

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

@@ -7,7 +7,11 @@ exports.default = void 0;
 
 var _typeorm = require("typeorm");
 
-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, _descriptor10, _descriptor11, _descriptor12;
+var _organisation = _interopRequireDefault(require("../../user/organisation"));
+
+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, _descriptor13;
+
+function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }
 
 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 }); }
 
@@ -57,6 +61,11 @@ let Customer = (_dec = (0, _typeorm.Entity)({
 }), _dec13 = (0, _typeorm.DeleteDateColumn)({
   type: 'timestamp with time zone',
   nullable: true
+}), _dec14 = (0, _typeorm.ManyToOne)(() => _organisation.default, {
+  nullable: false
+}), _dec15 = (0, _typeorm.JoinColumn)({
+  name: 'organisation_id',
+  referencedColumnName: 'id'
 }), _dec(_class = (_class2 = class Customer {
   constructor() {
     _initializerDefineProperty(this, "id", _descriptor, this);
@@ -82,6 +91,22 @@ let Customer = (_dec = (0, _typeorm.Entity)({
     _initializerDefineProperty(this, "updated_at", _descriptor11, this);
 
     _initializerDefineProperty(this, "deleted_at", _descriptor12, this);
+
+    _initializerDefineProperty(this, "organisation", _descriptor13, this);
+  }
+
+  getPublicData() {
+    return {
+      id: this.id,
+      customer_name: this.customer_name,
+      email: this.email,
+      address_1: this.address_1,
+      address_2: this.address_2,
+      city: this.city,
+      county: this.county,
+      country: this.country,
+      post_code: this.post_code
+    };
   }
 
 }, (_descriptor = _applyDecoratedDescriptor(_class2.prototype, "id", [_dec2], {
@@ -162,5 +187,12 @@ let Customer = (_dec = (0, _typeorm.Entity)({
   enumerable: true,
   writable: true,
   initializer: null
+}), _descriptor13 = _applyDecoratedDescriptor(_class2.prototype, "organisation", [_dec14, _dec15], {
+  configurable: true,
+  enumerable: true,
+  writable: true,
+  initializer: function () {
+    return _organisation.default;
+  }
 })), _class2)) || _class);
 exports.default = Customer;

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

@@ -157,7 +157,7 @@ let Ecommerce = (_dec = (0, _typeorm.Entity)({
     };
 
     if (this.customer !== null && typeof this.customer.id !== 'undefined') {
-      response.customer = this.customer;
+      response.customer = this.customer.getPublicData();
     }
 
     if (this.booking !== null && typeof this.booking.id !== 'undefined') {

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

@@ -198,7 +198,7 @@ let PaymentLink = (_dec = (0, _typeorm.Entity)({
     };
 
     if (this.customer !== null && typeof this.customer.id !== 'undefined') {
-      response.customer = this.customer;
+      response.customer = this.customer.getPublicData();
     }
 
     if (this.booking !== null && typeof this.booking.id !== 'undefined') {

package/dist/migration/payment/1690368777929-customer_organisation.js

@@ -0,0 +1,13 @@
+const { MigrationInterface, QueryRunner } = require("typeorm");
+
+module.exports = class customerOrganisation1690368777929 {
+    name = 'customerOrganisation1690368777929'
+
+    async up(queryRunner) {
+        await queryRunner.query(`ALTER TABLE "payment"."customer" ADD "organisation_id" character varying(150)`);
+      }
+
+    async down(queryRunner) {
+        await queryRunner.query(`ALTER TABLE "payment"."customer" DROP COLUMN "organisation_id"`);
+    }
+}

package/dist/migration/payment/1690368949313-customer_organisation_notnull.js

@@ -0,0 +1,15 @@
+const { MigrationInterface, QueryRunner } = require("typeorm");
+
+module.exports = class customerOrganisationNotnull1690368949313 {
+    name = 'customerOrganisationNotnull1690368949313'
+
+    async up(queryRunner) {
+        await queryRunner.query(`ALTER TABLE "payment"."customer" ALTER COLUMN "organisation_id" SET NOT NULL`);
+        await queryRunner.query(`ALTER TABLE "payment"."customer" ADD CONSTRAINT "FK_4826e339f8ec2dc55a693f896fc" FOREIGN KEY ("organisation_id") REFERENCES "user"."organisation"("id") ON DELETE NO ACTION ON UPDATE NO ACTION`);
+    }
+
+    async down(queryRunner) {
+        await queryRunner.query(`ALTER TABLE "payment"."customer" DROP CONSTRAINT "FK_4826e339f8ec2dc55a693f896fc"`);
+        await queryRunner.query(`ALTER TABLE "payment"."customer" ALTER COLUMN "organisation_id" DROP NOT NULL`);
+    }
+}

package/dist/service/payment-initiation-object/index.js

@@ -50,7 +50,7 @@ class PaymentInitiationObject extends _dependencyAware.default {
     let result = null;
 
     if (initiationType === _paymentInitationTypes.default.PAYMENT_LINK) {
-      result = await this.paymentLinkRepository.createQueryBuilder('payment_link').leftJoinAndSelect('payment_link.organisation', 'organisation').leftJoinAndSelect('payment_link.booking', 'booking').leftJoinAndMapOne('payment_link.currency', _currency.default, 'currency_join', 'currency_join.id = payment_link.currency').where('payment_link.id = :initiation_object_ID', {
+      result = await this.paymentLinkRepository.createQueryBuilder('payment_link').leftJoinAndSelect('payment_link.organisation', 'organisation').leftJoinAndSelect('payment_link.booking', 'booking').leftJoinAndSelect('payment_link.customer', 'customer').leftJoinAndMapOne('payment_link.currency', _currency.default, 'currency_join', 'currency_join.id = payment_link.currency').where('payment_link.id = :initiation_object_ID', {
         initiation_object_ID: initiationObjectID
       }).getOne(); // Throw an error response if the payment link does not exist
 
@@ -66,7 +66,7 @@ class PaymentInitiationObject extends _dependencyAware.default {
         throw notFoundResponse;
       }
     } else if (initiationType === _paymentInitationTypes.default.ECOMMERCE) {
-      result = await this.ecommerceRepository.createQueryBuilder('ecommerce').leftJoinAndSelect('ecommerce.organisation', 'organisation').leftJoinAndSelect('ecommerce.booking', 'booking').leftJoinAndMapOne('ecommerce.currency', _currency.default, 'currency_join', 'currency_join.id = ecommerce.currency').where('ecommerce.id = :initiation_object_ID', {
+      result = await this.ecommerceRepository.createQueryBuilder('ecommerce').leftJoinAndSelect('ecommerce.organisation', 'organisation').leftJoinAndSelect('ecommerce.booking', 'booking').leftJoinAndSelect('ecommerce.customer', 'customer').leftJoinAndMapOne('ecommerce.currency', _currency.default, 'currency_join', 'currency_join.id = ecommerce.currency').where('ecommerce.id = :initiation_object_ID', {
         initiation_object_ID: initiationObjectID
       }).getOne(); // Throw an error response if the payment link does not exist
 

package/package.json

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