@felloh-org/lambda-wrapper 1.1.50 → 1.1.53

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

@@ -9,7 +9,11 @@ var _typeorm = require("typeorm");
 
 var _user = _interopRequireDefault(require("../user"));
 
-var _dec, _dec2, _dec3, _dec4, _dec5, _dec6, _dec7, _dec8, _dec9, _dec10, _dec11, _dec12, _class, _class2, _descriptor, _descriptor2, _descriptor3, _descriptor4, _descriptor5, _descriptor6, _descriptor7, _descriptor8, _descriptor9;
+var _bookingComponent = _interopRequireDefault(require("../../agent-data/booking-component"));
+
+var _organisationFeature = _interopRequireDefault(require("../organisation-feature"));
+
+var _dec, _dec2, _dec3, _dec4, _dec5, _dec6, _dec7, _dec8, _dec9, _dec10, _dec11, _dec12, _dec13, _dec14, _class, _class2, _descriptor, _descriptor2, _descriptor3, _descriptor4, _descriptor5, _descriptor6, _descriptor7, _descriptor8, _descriptor9, _descriptor10, _descriptor11;
 
 function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }
 
@@ -32,7 +36,11 @@ let Organisation = (_dec = (0, _typeorm.Entity)({
   type: "varchar",
   length: "250",
   nullable: true
-}), _dec6 = (0, _typeorm.CreateDateColumn)(), _dec7 = (0, _typeorm.UpdateDateColumn)(), _dec8 = (0, _typeorm.DeleteDateColumn)(), _dec9 = (0, _typeorm.ManyToMany)(() => _user.default, users => users.organisations), _dec10 = (0, _typeorm.JoinTable)({
+}), _dec6 = (0, _typeorm.Column)({
+  type: "varchar",
+  length: "150",
+  nullable: true
+}), _dec7 = (0, _typeorm.CreateDateColumn)(), _dec8 = (0, _typeorm.UpdateDateColumn)(), _dec9 = (0, _typeorm.DeleteDateColumn)(), _dec10 = (0, _typeorm.ManyToMany)(() => _user.default, users => users.organisations), _dec11 = (0, _typeorm.JoinTable)({
   name: "user_organisation",
   schema: "user",
   joinColumn: {
@@ -43,7 +51,7 @@ let Organisation = (_dec = (0, _typeorm.Entity)({
     name: "user_id",
     referencedColumnName: "id"
   }
-}), _dec11 = (0, _typeorm.TreeParent)(), _dec12 = (0, _typeorm.TreeChildren)(), _dec(_class = _dec2(_class = (_class2 = class Organisation {
+}), _dec12 = (0, _typeorm.TreeParent)(), _dec13 = (0, _typeorm.TreeChildren)(), _dec14 = (0, _typeorm.OneToMany)(() => _organisationFeature.default, organisationFeature => organisationFeature.organisation), _dec(_class = _dec2(_class = (_class2 = class Organisation {
   constructor() {
     _initializerDefineProperty(this, "id", _descriptor, this);
 
@@ -51,17 +59,21 @@ let Organisation = (_dec = (0, _typeorm.Entity)({
 
     _initializerDefineProperty(this, "image", _descriptor3, this);
 
-    _initializerDefineProperty(this, "created_at", _descriptor4, this);
+    _initializerDefineProperty(this, "legacy_id", _descriptor4, this);
+
+    _initializerDefineProperty(this, "created_at", _descriptor5, this);
+
+    _initializerDefineProperty(this, "updated_at", _descriptor6, this);
 
-    _initializerDefineProperty(this, "updated_at", _descriptor5, this);
+    _initializerDefineProperty(this, "deleted_at", _descriptor7, this);
 
-    _initializerDefineProperty(this, "deleted_at", _descriptor6, this);
+    _initializerDefineProperty(this, "users", _descriptor8, this);
 
-    _initializerDefineProperty(this, "users", _descriptor7, this);
+    _initializerDefineProperty(this, "parent", _descriptor9, this);
 
-    _initializerDefineProperty(this, "parent", _descriptor8, this);
+    _initializerDefineProperty(this, "children", _descriptor10, this);
 
-    _initializerDefineProperty(this, "children", _descriptor9, this);
+    _initializerDefineProperty(this, "organisation_feature", _descriptor11, this);
   }
 
   propgate(id, name) {
@@ -69,6 +81,28 @@ let Organisation = (_dec = (0, _typeorm.Entity)({
     this.name = name;
   }
 
+  getPublicData() {
+    const response = {
+      id: this.id,
+      name: this.name,
+      image: this.image,
+      created_at: this.created_at,
+      updated_at: this.updated_at,
+      deleted_at: this.deleted_at,
+      features: []
+    };
+
+    if (this.organisation_feature !== null && this.organisation_feature.length >= 1) {
+      response.features = this.organisation_feature.map(orgFeature => ({
+        id: orgFeature.feature.id,
+        name: orgFeature.feature.name,
+        machine_name: orgFeature.feature.machine_name
+      }));
+    }
+
+    return response;
+  }
+
   getPublicCompactData() {
     return {
       id: this.id,
@@ -92,32 +126,42 @@ let Organisation = (_dec = (0, _typeorm.Entity)({
   enumerable: true,
   writable: true,
   initializer: null
-}), _descriptor4 = _applyDecoratedDescriptor(_class2.prototype, "created_at", [_dec6], {
+}), _descriptor4 = _applyDecoratedDescriptor(_class2.prototype, "legacy_id", [_dec6], {
+  configurable: true,
+  enumerable: true,
+  writable: true,
+  initializer: null
+}), _descriptor5 = _applyDecoratedDescriptor(_class2.prototype, "created_at", [_dec7], {
+  configurable: true,
+  enumerable: true,
+  writable: true,
+  initializer: null
+}), _descriptor6 = _applyDecoratedDescriptor(_class2.prototype, "updated_at", [_dec8], {
   configurable: true,
   enumerable: true,
   writable: true,
   initializer: null
-}), _descriptor5 = _applyDecoratedDescriptor(_class2.prototype, "updated_at", [_dec7], {
+}), _descriptor7 = _applyDecoratedDescriptor(_class2.prototype, "deleted_at", [_dec9], {
   configurable: true,
   enumerable: true,
   writable: true,
   initializer: null
-}), _descriptor6 = _applyDecoratedDescriptor(_class2.prototype, "deleted_at", [_dec8], {
+}), _descriptor8 = _applyDecoratedDescriptor(_class2.prototype, "users", [_dec10, _dec11], {
   configurable: true,
   enumerable: true,
   writable: true,
   initializer: null
-}), _descriptor7 = _applyDecoratedDescriptor(_class2.prototype, "users", [_dec9, _dec10], {
+}), _descriptor9 = _applyDecoratedDescriptor(_class2.prototype, "parent", [_dec12], {
   configurable: true,
   enumerable: true,
   writable: true,
   initializer: null
-}), _descriptor8 = _applyDecoratedDescriptor(_class2.prototype, "parent", [_dec11], {
+}), _descriptor10 = _applyDecoratedDescriptor(_class2.prototype, "children", [_dec13], {
   configurable: true,
   enumerable: true,
   writable: true,
   initializer: null
-}), _descriptor9 = _applyDecoratedDescriptor(_class2.prototype, "children", [_dec12], {
+}), _descriptor11 = _applyDecoratedDescriptor(_class2.prototype, "organisation_feature", [_dec14], {
   configurable: true,
   enumerable: true,
   writable: true,

package/dist/migration/user/1658920205370-org_legacy_id.js

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

package/dist/service/authentication.js

@@ -37,6 +37,7 @@ class AuthenticationService extends _dependencyAware.default {
         this.userRoleRepository = await that.connection.getRepository(_userRole.default);
         this.organisationRepository = await that.connection.getRepository(_organisation.default);
         this.user = await di.get(_dependencies.DEFINITIONS.USER).getUser();
+        di.get(_dependencies.DEFINITIONS.LOGGER).info(`user.id: ${this.user.id}`);
       }
     };
   }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@felloh-org/lambda-wrapper",
-  "version": "1.1.50",
+  "version": "1.1.53",
   "description": "Lambda wrapper for all Felloh Serverless Projects",
   "main": "dist/index.js",
   "scripts": {
@@ -17,7 +17,7 @@
     "start": "yarn build -w",
     "test": "jest --coverage"
   },
-  "author": "Felloh",
+  "author": "Felloh.com",
   "license": "MIT",
   "devDependencies": {
     "@babel/cli": "^7.17.6",