@darraghor/nest-backend-libs 1.49.0 → 2.0.0

package/dist/authz/authzstrategy.js

@@ -29,13 +29,13 @@ let JwtStrategy = class JwtStrategy extends (0, passport_1.PassportStrategy)(pas
                 cache: true,
                 rateLimit: true,
                 jwksRequestsPerMinute: 5,
-                jwksUri: `${config.auth0Domain}/.well-known/jwks.json`,
+                jwksUri: `https://${config.auth0Domain}/.well-known/jwks.json`,
             }),
             passReqToCallback: true,
             // eslint-disable-next-line @typescript-eslint/no-unsafe-member-access,@typescript-eslint/no-unsafe-assignment, @typescript-eslint/no-unsafe-call
             jwtFromRequest: passport_jwt_1.ExtractJwt.fromAuthHeaderAsBearerToken(),
             audience: config.auth0Audience,
-            issuer: `${config.auth0Domain}/`,
+            issuer: `https://${config.auth0Domain}/`,
             algorithms: ["RS256"],
         });
         this.personService = personService;

package/dist/authz/authzstrategy.js.map

@@ -1 +1 @@
-{"version":3,"file":"authzstrategy.js","sourceRoot":"","sources":["../../src/authz/authzstrategy.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;AAAA,2CAA0C;AAC1C,+CAAkD;AAClD,+CAAkD;AAClD,uCAA2C;AAC3C,6DAAuD;AAGvD,yEAAoE;AACpE,oFAA4D;AAIrD,IAAM,WAAW,GAAjB,MAAM,WAAY,SAAQ,IAAA,2BAAgB,EAAC,uBAAQ,CAAC;IACvD,gEAAgE;IAChE,sDAAsD;IAEtD,YACqB,aAA4B,EAC5B,MAAyB,EAC1C,MAAgC;QAEhC,KAAK,CAAC;YACF,mBAAmB,EAAE,IAAA,4BAAiB,EAAC;gBACnC,KAAK,EAAE,IAAI;gBACX,SAAS,EAAE,IAAI;gBACf,qBAAqB,EAAE,CAAC;gBACxB,OAAO,EAAE,GAAG,MAAM,CAAC,WAAW,wBAAwB;aACzD,CAAC;YACF,iBAAiB,EAAE,IAAI;YACvB,iJAAiJ;YACjJ,cAAc,EAAE,yBAAU,CAAC,2BAA2B,EAAE;YACxD,QAAQ,EAAE,MAAM,CAAC,aAAa;YAC9B,MAAM,EAAE,GAAG,MAAM,CAAC,WAAW,GAAG;YAChC,UAAU,EAAE,CAAC,OAAO,CAAC;SACxB,CAAC,CAAC;QAjBc,kBAAa,GAAb,aAAa,CAAe;QAC5B,WAAM,GAAN,MAAM,CAAmB;IAiB9C,CAAC;IAED,KAAK,CAAC,QAAQ,CACV,OAAgB,EAChB,OAAoB;QAEpB,MAAM,cAAc,GAChB,yBAAU,CAAC,2BAA2B,EAAE,CAAC,OAAO,CAAC,CAAC;QACtD,IAAI,cAAc,KAAK,SAAS,IAAI,cAAc,KAAK,IAAI,EAAE;YACzD,IAAI,CAAC,MAAM,CAAC,KAAK,CAAC,mCAAmC,CAAC,CAAC;YACvD,OAAO;SACV;QAED,MAAM,YAAY,GAAG,MAAM,IAAI,CAAC,aAAa,CAAC,YAAY,CACtD,OAAO,EACP,cAAc,CACjB,CAAC;QAEF,MAAM,eAAe,GAAG,EAAC,WAAW,EAAE,OAAO,CAAC,WAAW,IAAI,EAAE,EAAC,CAAC;QACjE,2DAA2D;QAC3D,MAAM,EAAE,GAAG,EAAC,GAAG,YAAY,EAAE,GAAG,eAAe,EAAkB,CAAC;QAClE,OAAO,EAAE,CAAC;IACd,CAAC;CACJ,CAAA;AA9CY,WAAW;IADvB,IAAA,mBAAU,GAAE;qCAM2B,8BAAa;QACpB,2BAAiB;QAClC,mDAAwB;GAP3B,WAAW,CA8CvB;AA9CY,kCAAW"}
+{"version":3,"file":"authzstrategy.js","sourceRoot":"","sources":["../../src/authz/authzstrategy.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;AAAA,2CAA0C;AAC1C,+CAAkD;AAClD,+CAAkD;AAClD,uCAA2C;AAC3C,6DAAuD;AAGvD,yEAAoE;AACpE,oFAA4D;AAIrD,IAAM,WAAW,GAAjB,MAAM,WAAY,SAAQ,IAAA,2BAAgB,EAAC,uBAAQ,CAAC;IACvD,gEAAgE;IAChE,sDAAsD;IAEtD,YACqB,aAA4B,EAC5B,MAAyB,EAC1C,MAAgC;QAEhC,KAAK,CAAC;YACF,mBAAmB,EAAE,IAAA,4BAAiB,EAAC;gBACnC,KAAK,EAAE,IAAI;gBACX,SAAS,EAAE,IAAI;gBACf,qBAAqB,EAAE,CAAC;gBACxB,OAAO,EAAE,WAAW,MAAM,CAAC,WAAW,wBAAwB;aACjE,CAAC;YACF,iBAAiB,EAAE,IAAI;YACvB,iJAAiJ;YACjJ,cAAc,EAAE,yBAAU,CAAC,2BAA2B,EAAE;YACxD,QAAQ,EAAE,MAAM,CAAC,aAAa;YAC9B,MAAM,EAAE,WAAW,MAAM,CAAC,WAAW,GAAG;YACxC,UAAU,EAAE,CAAC,OAAO,CAAC;SACxB,CAAC,CAAC;QAjBc,kBAAa,GAAb,aAAa,CAAe;QAC5B,WAAM,GAAN,MAAM,CAAmB;IAiB9C,CAAC;IAED,KAAK,CAAC,QAAQ,CACV,OAAgB,EAChB,OAAoB;QAEpB,MAAM,cAAc,GAChB,yBAAU,CAAC,2BAA2B,EAAE,CAAC,OAAO,CAAC,CAAC;QACtD,IAAI,cAAc,KAAK,SAAS,IAAI,cAAc,KAAK,IAAI,EAAE;YACzD,IAAI,CAAC,MAAM,CAAC,KAAK,CAAC,mCAAmC,CAAC,CAAC;YACvD,OAAO;SACV;QAED,MAAM,YAAY,GAAG,MAAM,IAAI,CAAC,aAAa,CAAC,YAAY,CACtD,OAAO,EACP,cAAc,CACjB,CAAC;QAEF,MAAM,eAAe,GAAG,EAAC,WAAW,EAAE,OAAO,CAAC,WAAW,IAAI,EAAE,EAAC,CAAC;QACjE,2DAA2D;QAC3D,MAAM,EAAE,GAAG,EAAC,GAAG,YAAY,EAAE,GAAG,eAAe,EAAkB,CAAC;QAClE,OAAO,EAAE,CAAC;IACd,CAAC;CACJ,CAAA;AA9CY,WAAW;IADvB,IAAA,mBAAU,GAAE;qCAM2B,8BAAa;QACpB,2BAAiB;QAClC,mDAAwB;GAP3B,WAAW,CA8CvB;AA9CY,kCAAW"}

package/dist/core-config/CoreConfigurationService.d.ts

@@ -7,8 +7,7 @@ export declare class CoreConfigurationService extends ValidatedConfigurationServ
     get shouldAutomaticallyInstallApiModels(): boolean;
     get shouldUseNestCors(): boolean;
     get webPort(): number;
-    get clientCorsUrl(): string;
     get appTitle(): string;
-    get appEnvironmentSpecificUrl(): string;
+    get frontEndAppUrl(): string;
     get nodeEnv(): string;
 }

package/dist/core-config/CoreConfigurationService.js

@@ -33,14 +33,11 @@ let CoreConfigurationService = class CoreConfigurationService extends ValidatedC
     get webPort() {
         return Number.parseInt(this.configService.get("core.webPort"), 10);
     }
-    get clientCorsUrl() {
-        return this.configService.get("core.clientCorsUrl");
-    }
     get appTitle() {
         return this.configService.get("core.appTitle");
     }
-    get appEnvironmentSpecificUrl() {
-        return this.configService.get("core.appEnvironmentSpecificUrl");
+    get frontEndAppUrl() {
+        return this.configService.get("core.frontEndAppUrl");
     }
     get nodeEnv() {
         return this.configService.get("core.nodeEnv");
@@ -70,12 +67,6 @@ __decorate([
     __metadata("design:type", Number),
     __metadata("design:paramtypes", [])
 ], CoreConfigurationService.prototype, "webPort", null);
-__decorate([
-    (0, class_validator_1.IsDefined)(),
-    (0, class_validator_1.IsString)(),
-    __metadata("design:type", String),
-    __metadata("design:paramtypes", [])
-], CoreConfigurationService.prototype, "clientCorsUrl", null);
 __decorate([
     (0, class_validator_1.IsDefined)(),
     (0, class_validator_1.IsString)(),
@@ -87,7 +78,7 @@ __decorate([
     (0, class_validator_1.IsString)(),
     __metadata("design:type", String),
     __metadata("design:paramtypes", [])
-], CoreConfigurationService.prototype, "appEnvironmentSpecificUrl", null);
+], CoreConfigurationService.prototype, "frontEndAppUrl", null);
 __decorate([
     (0, class_validator_1.IsDefined)(),
     (0, class_validator_1.IsString)(),

package/dist/core-config/CoreConfigurationService.js.map

@@ -1 +1 @@
-{"version":3,"file":"CoreConfigurationService.js","sourceRoot":"","sources":["../../src/core-config/CoreConfigurationService.ts"],"names":[],"mappings":";;;;;;;;;;;;AAAA,6DAA6D;AAC7D,2CAA0C;AAC1C,2CAA6C;AAC7C,qDAAsE;AACtE,kGAA6F;AAGtF,IAAM,wBAAwB,GAA9B,MAAM,wBAAyB,SAAQ,6DAA6B;IACvE,YAAoB,aAA4B;QAC5C,KAAK,EAAE,CAAC;QADQ,kBAAa,GAAb,aAAa,CAAe;IAEhD,CAAC;IAED,IAEI,qBAAqB;QACrB,OAAO,CACH,IAAI,CAAC,aAAa,CAAC,GAAG,CAAS,4BAA4B,CAAC;YAC5D,MAAM,CACT,CAAC;IACN,CAAC;IAED,IAEI,mCAAmC;QACnC,OAAO,CACH,IAAI,CAAC,aAAa,CAAC,GAAG,CAClB,0CAA0C,CAC7C,KAAK,MAAM,CACf,CAAC;IACN,CAAC;IAED,IAEI,iBAAiB;QACjB,OAAO,CACH,IAAI,CAAC,aAAa,CAAC,GAAG,CAAS,wBAAwB,CAAC,KAAK,MAAM,CACtE,CAAC;IACN,CAAC;IAED,IAEI,OAAO;QACP,OAAO,MAAM,CAAC,QAAQ,CAClB,IAAI,CAAC,aAAa,CAAC,GAAG,CAAS,cAAc,CAAE,EAC/C,EAAE,CACL,CAAC;IACN,CAAC;IAED,IAEI,aAAa;QACb,OAAO,IAAI,CAAC,aAAa,CAAC,GAAG,CAAS,oBAAoB,CAAE,CAAC;IACjE,CAAC;IAED,IAEI,QAAQ;QACR,OAAO,IAAI,CAAC,aAAa,CAAC,GAAG,CAAS,eAAe,CAAE,CAAC;IAC5D,CAAC;IAED,IAEI,yBAAyB;QACzB,OAAO,IAAI,CAAC,aAAa,CAAC,GAAG,CACzB,gCAAgC,CAClC,CAAC;IACP,CAAC;IAED,IAEI,OAAO;QACP,OAAO,IAAI,CAAC,aAAa,CAAC,GAAG,CAAS,cAAc,CAAE,CAAC;IAC3D,CAAC;CACJ,CAAA;AA7DG;IAAC,IAAA,2BAAS,GAAE;IACX,IAAA,2BAAS,GAAE;;;qEAMX;AAED;IAAC,IAAA,2BAAS,GAAE;IACX,IAAA,2BAAS,GAAE;;;mFAOX;AAED;IAAC,IAAA,2BAAS,GAAE;IACX,IAAA,2BAAS,GAAE;;;iEAKX;AAED;IAAC,IAAA,2BAAS,GAAE;IACX,IAAA,uBAAK,GAAE;;;uDAMP;AAED;IAAC,IAAA,2BAAS,GAAE;IACX,IAAA,0BAAQ,GAAE;;;6DAGV;AAED;IAAC,IAAA,2BAAS,GAAE;IACX,IAAA,0BAAQ,GAAE;;;wDAGV;AAED;IAAC,IAAA,2BAAS,GAAE;IACX,IAAA,0BAAQ,GAAE;;;yEAKV;AAED;IAAC,IAAA,2BAAS,GAAE;IACX,IAAA,0BAAQ,GAAE;;;uDAGV;AAjEQ,wBAAwB;IADpC,IAAA,mBAAU,GAAE;qCAE0B,sBAAa;GADvC,wBAAwB,CAkEpC;AAlEY,4DAAwB"}
+{"version":3,"file":"CoreConfigurationService.js","sourceRoot":"","sources":["../../src/core-config/CoreConfigurationService.ts"],"names":[],"mappings":";;;;;;;;;;;;AAAA,6DAA6D;AAC7D,2CAA0C;AAC1C,2CAA6C;AAC7C,qDAAsE;AACtE,kGAA6F;AAGtF,IAAM,wBAAwB,GAA9B,MAAM,wBAAyB,SAAQ,6DAA6B;IACvE,YAAoB,aAA4B;QAC5C,KAAK,EAAE,CAAC;QADQ,kBAAa,GAAb,aAAa,CAAe;IAEhD,CAAC;IAED,IAEI,qBAAqB;QACrB,OAAO,CACH,IAAI,CAAC,aAAa,CAAC,GAAG,CAAS,4BAA4B,CAAC;YAC5D,MAAM,CACT,CAAC;IACN,CAAC;IAED,IAEI,mCAAmC;QACnC,OAAO,CACH,IAAI,CAAC,aAAa,CAAC,GAAG,CAClB,0CAA0C,CAC7C,KAAK,MAAM,CACf,CAAC;IACN,CAAC;IAED,IAEI,iBAAiB;QACjB,OAAO,CACH,IAAI,CAAC,aAAa,CAAC,GAAG,CAAS,wBAAwB,CAAC,KAAK,MAAM,CACtE,CAAC;IACN,CAAC;IAED,IAEI,OAAO;QACP,OAAO,MAAM,CAAC,QAAQ,CAClB,IAAI,CAAC,aAAa,CAAC,GAAG,CAAS,cAAc,CAAE,EAC/C,EAAE,CACL,CAAC;IACN,CAAC;IAED,IAEI,QAAQ;QACR,OAAO,IAAI,CAAC,aAAa,CAAC,GAAG,CAAS,eAAe,CAAE,CAAC;IAC5D,CAAC;IAED,IAEI,cAAc;QACd,OAAO,IAAI,CAAC,aAAa,CAAC,GAAG,CAAS,qBAAqB,CAAE,CAAC;IAClE,CAAC;IAED,IAEI,OAAO;QACP,OAAO,IAAI,CAAC,aAAa,CAAC,GAAG,CAAS,cAAc,CAAE,CAAC;IAC3D,CAAC;CACJ,CAAA;AArDG;IAAC,IAAA,2BAAS,GAAE;IACX,IAAA,2BAAS,GAAE;;;qEAMX;AAED;IAAC,IAAA,2BAAS,GAAE;IACX,IAAA,2BAAS,GAAE;;;mFAOX;AAED;IAAC,IAAA,2BAAS,GAAE;IACX,IAAA,2BAAS,GAAE;;;iEAKX;AAED;IAAC,IAAA,2BAAS,GAAE;IACX,IAAA,uBAAK,GAAE;;;uDAMP;AAED;IAAC,IAAA,2BAAS,GAAE;IACX,IAAA,0BAAQ,GAAE;;;wDAGV;AAED;IAAC,IAAA,2BAAS,GAAE;IACX,IAAA,0BAAQ,GAAE;;;8DAGV;AAED;IAAC,IAAA,2BAAS,GAAE;IACX,IAAA,0BAAQ,GAAE;;;uDAGV;AAzDQ,wBAAwB;IADpC,IAAA,mBAAU,GAAE;qCAE0B,sBAAa;GADvC,wBAAwB,CA0DpC;AA1DY,4DAAwB"}

package/dist/core-config/CoreConfigurationVariables.d.ts

@@ -3,8 +3,7 @@ declare const _default: (() => {
     shouldGenerateSwagger: string | undefined;
     webPort: string | undefined;
     nodeEnv: string | undefined;
-    clientCorsUrl: string | undefined;
-    appEnvironmentSpecificUrl: string | undefined;
+    frontEndAppUrl: string | undefined;
     shouldUseNestCors: string | undefined;
     shouldAutomaticallyInstallApiModels: string | undefined;
     appTitle: string | undefined;
@@ -13,8 +12,7 @@ declare const _default: (() => {
     shouldGenerateSwagger: string | undefined;
     webPort: string | undefined;
     nodeEnv: string | undefined;
-    clientCorsUrl: string | undefined;
-    appEnvironmentSpecificUrl: string | undefined;
+    frontEndAppUrl: string | undefined;
     shouldUseNestCors: string | undefined;
     shouldAutomaticallyInstallApiModels: string | undefined;
     appTitle: string | undefined;

package/dist/core-config/CoreConfigurationVariables.js

@@ -6,8 +6,7 @@ exports.default = (0, config_1.registerAs)("core", () => ({
     shouldGenerateSwagger: process.env.GENERATE_SWAGGER,
     webPort: process.env.WEB_PORT,
     nodeEnv: process.env.NODE_ENV,
-    clientCorsUrl: process.env.CLIENT_CORS_URL,
-    appEnvironmentSpecificUrl: process.env.APP_ENVIRONMENT_SPECIFIC_URL,
+    frontEndAppUrl: process.env.FRONTEND_APP_URL,
     shouldUseNestCors: process.env.ENABLE_NEST_CORS,
     shouldAutomaticallyInstallApiModels: process.env.AUTO_INSTALL_API_MODELS,
     appTitle: process.env.APP_TITLE,

package/dist/core-config/CoreConfigurationVariables.js.map

@@ -1 +1 @@
-{"version":3,"file":"CoreConfigurationVariables.js","sourceRoot":"","sources":["../../src/core-config/CoreConfigurationVariables.ts"],"names":[],"mappings":";;AAAA,2CAA0C;AAE1C,kBAAe,IAAA,mBAAU,EAAC,MAAM,EAAE,GAAG,EAAE,CAAC,CAAC;IACrC,UAAU,EAAE,OAAO,CAAC,GAAG,CAAC,WAAW;IACnC,qBAAqB,EAAE,OAAO,CAAC,GAAG,CAAC,gBAAgB;IACnD,OAAO,EAAE,OAAO,CAAC,GAAG,CAAC,QAAQ;IAC7B,OAAO,EAAE,OAAO,CAAC,GAAG,CAAC,QAAQ;IAC7B,aAAa,EAAE,OAAO,CAAC,GAAG,CAAC,eAAe;IAC1C,yBAAyB,EAAE,OAAO,CAAC,GAAG,CAAC,4BAA4B;IACnE,iBAAiB,EAAE,OAAO,CAAC,GAAG,CAAC,gBAAgB;IAC/C,mCAAmC,EAAE,OAAO,CAAC,GAAG,CAAC,uBAAuB;IACxE,QAAQ,EAAE,OAAO,CAAC,GAAG,CAAC,SAAS;CAClC,CAAC,CAAC,CAAC"}
+{"version":3,"file":"CoreConfigurationVariables.js","sourceRoot":"","sources":["../../src/core-config/CoreConfigurationVariables.ts"],"names":[],"mappings":";;AAAA,2CAA0C;AAE1C,kBAAe,IAAA,mBAAU,EAAC,MAAM,EAAE,GAAG,EAAE,CAAC,CAAC;IACrC,UAAU,EAAE,OAAO,CAAC,GAAG,CAAC,WAAW;IACnC,qBAAqB,EAAE,OAAO,CAAC,GAAG,CAAC,gBAAgB;IACnD,OAAO,EAAE,OAAO,CAAC,GAAG,CAAC,QAAQ;IAC7B,OAAO,EAAE,OAAO,CAAC,GAAG,CAAC,QAAQ;IAC7B,cAAc,EAAE,OAAO,CAAC,GAAG,CAAC,gBAAgB;IAC5C,iBAAiB,EAAE,OAAO,CAAC,GAAG,CAAC,gBAAgB;IAC/C,mCAAmC,EAAE,OAAO,CAAC,GAAG,CAAC,uBAAuB;IACxE,QAAQ,EAAE,OAAO,CAAC,GAAG,CAAC,SAAS;CAClC,CAAC,CAAC,CAAC"}

package/dist/database-postgres/PostgresDatabaseConfigurationService.d.ts

@@ -1,8 +1,6 @@
 import { TypeOrmModuleOptions } from "@nestjs/typeorm";
 export declare class DatabaseConfigurationService {
     /**
-     * This method uses process.env directly because it is also used in a node script that doesn't have access
-     * to NestJS injection.
      * @returns {TypeOrmModuleOptions} Database config for the current env
      */
     getTypeOrmConfig(): TypeOrmModuleOptions;

package/dist/database-postgres/PostgresDatabaseConfigurationService.js

@@ -11,8 +11,6 @@ const common_1 = require("@nestjs/common");
 const PostgresTypeOrmConfigurationProvider_1 = require("./PostgresTypeOrmConfigurationProvider");
 let DatabaseConfigurationService = class DatabaseConfigurationService {
     /**
-     * This method uses process.env directly because it is also used in a node script that doesn't have access
-     * to NestJS injection.
      * @returns {TypeOrmModuleOptions} Database config for the current env
      */
     getTypeOrmConfig() {

package/dist/database-postgres/PostgresDatabaseConfigurationService.js.map

@@ -1 +1 @@
-{"version":3,"file":"PostgresDatabaseConfigurationService.js","sourceRoot":"","sources":["../../src/database-postgres/PostgresDatabaseConfigurationService.ts"],"names":[],"mappings":";;;;;;;;;AAAA,2CAA0C;AAE1C,iGAA4F;AAGrF,IAAM,4BAA4B,GAAlC,MAAM,4BAA4B;IACrC;;;;OAIG;IACI,gBAAgB;QACnB,OAAO,2EAAoC,CAAC,gBAAgB,EAAE,CAAC;IACnE,CAAC;CACJ,CAAA;AATY,4BAA4B;IADxC,IAAA,mBAAU,GAAE;GACA,4BAA4B,CASxC;AATY,oEAA4B"}
+{"version":3,"file":"PostgresDatabaseConfigurationService.js","sourceRoot":"","sources":["../../src/database-postgres/PostgresDatabaseConfigurationService.ts"],"names":[],"mappings":";;;;;;;;;AAAA,2CAA0C;AAE1C,iGAA4F;AAGrF,IAAM,4BAA4B,GAAlC,MAAM,4BAA4B;IACrC;;OAEG;IACI,gBAAgB;QACnB,OAAO,2EAAoC,CAAC,gBAAgB,EAAE,CAAC;IACnE,CAAC;CACJ,CAAA;AAPY,4BAA4B;IADxC,IAAA,mBAAU,GAAE;GACA,4BAA4B,CAOxC;AAPY,oEAA4B"}

package/dist/organisation/dto/RolesEnum.d.ts

@@ -0,0 +1,4 @@
+export declare enum Roles {
+    owner = "owner",
+    member = "member"
+}

package/dist/organisation/dto/RolesEnum.js

@@ -0,0 +1,10 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.Roles = void 0;
+/* eslint-disable @typescript-eslint/naming-convention */
+var Roles;
+(function (Roles) {
+    Roles["owner"] = "owner";
+    Roles["member"] = "member";
+})(Roles = exports.Roles || (exports.Roles = {}));
+//# sourceMappingURL=RolesEnum.js.map

package/dist/organisation/dto/RolesEnum.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"RolesEnum.js","sourceRoot":"","sources":["../../../src/organisation/dto/RolesEnum.ts"],"names":[],"mappings":";;;AAAA,yDAAyD;AACzD,IAAY,KAGX;AAHD,WAAY,KAAK;IACb,wBAAe,CAAA;IACf,0BAAiB,CAAA;AACrB,CAAC,EAHW,KAAK,GAAL,aAAK,KAAL,aAAK,QAGhB"}

package/dist/organisation/entities/member-role.entity.d.ts

@@ -0,0 +1,10 @@
+import { OrganisationMembership } from "./organisation-membership.entity";
+export declare class MembershipRole {
+    id: number;
+    membership: OrganisationMembership;
+    membershipId: number;
+    name: string;
+    createdDate: Date;
+    updateDate: Date;
+    deletedDate: Date;
+}

package/dist/organisation/entities/member-role.entity.js

@@ -0,0 +1,60 @@
+"use strict";
+var __decorate = (this && this.__decorate) || function (decorators, target, key, desc) {
+    var c = arguments.length, r = c < 3 ? target : desc === null ? desc = Object.getOwnPropertyDescriptor(target, key) : desc, d;
+    if (typeof Reflect === "object" && typeof Reflect.decorate === "function") r = Reflect.decorate(decorators, target, key, desc);
+    else for (var i = decorators.length - 1; i >= 0; i--) if (d = decorators[i]) r = (c < 3 ? d(r) : c > 3 ? d(target, key, r) : d(target, key)) || r;
+    return c > 3 && r && Object.defineProperty(target, key, r), r;
+};
+var __metadata = (this && this.__metadata) || function (k, v) {
+    if (typeof Reflect === "object" && typeof Reflect.metadata === "function") return Reflect.metadata(k, v);
+};
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.MembershipRole = void 0;
+const swagger_1 = require("@nestjs/swagger");
+const typeorm_1 = require("typeorm");
+const organisation_membership_entity_1 = require("./organisation-membership.entity");
+let MembershipRole = class MembershipRole {
+};
+__decorate([
+    (0, typeorm_1.PrimaryGeneratedColumn)(),
+    (0, swagger_1.ApiProperty)(),
+    __metadata("design:type", Number)
+], MembershipRole.prototype, "id", void 0);
+__decorate([
+    (0, typeorm_1.ManyToOne)(() => organisation_membership_entity_1.OrganisationMembership, (membership) => membership.roles, {
+        eager: true,
+        cascade: true,
+    }),
+    (0, typeorm_1.Index)(),
+    (0, typeorm_1.JoinColumn)(),
+    __metadata("design:type", organisation_membership_entity_1.OrganisationMembership)
+], MembershipRole.prototype, "membership", void 0);
+__decorate([
+    (0, typeorm_1.Column)(),
+    (0, typeorm_1.RelationId)((membership) => membership.membership),
+    __metadata("design:type", Number)
+], MembershipRole.prototype, "membershipId", void 0);
+__decorate([
+    (0, typeorm_1.Column)(),
+    __metadata("design:type", String)
+], MembershipRole.prototype, "name", void 0);
+__decorate([
+    (0, typeorm_1.CreateDateColumn)(),
+    (0, swagger_1.ApiProperty)(),
+    __metadata("design:type", Date)
+], MembershipRole.prototype, "createdDate", void 0);
+__decorate([
+    (0, typeorm_1.UpdateDateColumn)(),
+    (0, swagger_1.ApiProperty)(),
+    __metadata("design:type", Date)
+], MembershipRole.prototype, "updateDate", void 0);
+__decorate([
+    (0, typeorm_1.DeleteDateColumn)(),
+    (0, swagger_1.ApiProperty)(),
+    __metadata("design:type", Date)
+], MembershipRole.prototype, "deletedDate", void 0);
+MembershipRole = __decorate([
+    (0, typeorm_1.Entity)()
+], MembershipRole);
+exports.MembershipRole = MembershipRole;
+//# sourceMappingURL=member-role.entity.js.map

package/dist/organisation/entities/member-role.entity.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"member-role.entity.js","sourceRoot":"","sources":["../../../src/organisation/entities/member-role.entity.ts"],"names":[],"mappings":";;;;;;;;;;;;AAAA,6CAA4C;AAE5C,qCAWiB;AACjB,qFAAwE;AAGjE,IAAM,cAAc,GAApB,MAAM,cAAc;CA+B1B,CAAA;AA9BG;IAAC,IAAA,gCAAsB,GAAE;IACxB,IAAA,qBAAW,GAAE;;0CACF;AAEZ;IAAC,IAAA,mBAAS,EAAC,GAAG,EAAE,CAAC,uDAAsB,EAAE,CAAC,UAAU,EAAE,EAAE,CAAC,UAAU,CAAC,KAAK,EAAE;QACvE,KAAK,EAAE,IAAI;QACX,OAAO,EAAE,IAAI;KAChB,CAAC;IACD,IAAA,eAAK,GAAE;IACP,IAAA,oBAAU,GAAE;8BACA,uDAAsB;kDAAC;AAEpC;IAAC,IAAA,gBAAM,GAAE;IACR,IAAA,oBAAU,EAAC,CAAC,UAA0B,EAAE,EAAE,CAAC,UAAU,CAAC,UAAU,CAAC;;oDACrC;AAE7B;IAAC,IAAA,gBAAM,GAAE;;4CACK;AAEd;IAAC,IAAA,0BAAgB,GAAE;IAClB,IAAA,qBAAW,GAAE;8BACA,IAAI;mDAAC;AAEnB;IAAC,IAAA,0BAAgB,GAAE;IAClB,IAAA,qBAAW,GAAE;8BACD,IAAI;kDAAC;AAElB;IAAC,IAAA,0BAAgB,GAAE;IAClB,IAAA,qBAAW,GAAE;8BACA,IAAI;mDAAC;AA9BV,cAAc;IAD1B,IAAA,gBAAM,GAAE;GACI,cAAc,CA+B1B;AA/BY,wCAAc"}

package/dist/organisation/entities/organisation-membership.entity.d.ts

@@ -0,0 +1,16 @@
+import { Organisation } from "../../organisation/entities/organisation.entity";
+import { Person } from "../../person/entities/person.entity";
+import { MembershipRole } from "./member-role.entity";
+export declare class OrganisationMembership {
+    id: number;
+    uuid: string;
+    person: Person;
+    personId: number;
+    organisation: Organisation;
+    organisationId: number;
+    roles: MembershipRole[];
+    createdDate: Date;
+    updateDate: Date;
+    deletedDate: Date;
+    nullChecks(): Promise<void>;
+}

package/dist/organisation/entities/organisation-membership.entity.js

@@ -0,0 +1,105 @@
+"use strict";
+var __decorate = (this && this.__decorate) || function (decorators, target, key, desc) {
+    var c = arguments.length, r = c < 3 ? target : desc === null ? desc = Object.getOwnPropertyDescriptor(target, key) : desc, d;
+    if (typeof Reflect === "object" && typeof Reflect.decorate === "function") r = Reflect.decorate(decorators, target, key, desc);
+    else for (var i = decorators.length - 1; i >= 0; i--) if (d = decorators[i]) r = (c < 3 ? d(r) : c > 3 ? d(target, key, r) : d(target, key)) || r;
+    return c > 3 && r && Object.defineProperty(target, key, r), r;
+};
+var __metadata = (this && this.__metadata) || function (k, v) {
+    if (typeof Reflect === "object" && typeof Reflect.metadata === "function") return Reflect.metadata(k, v);
+};
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.OrganisationMembership = void 0;
+const swagger_1 = require("@nestjs/swagger");
+const class_transformer_1 = require("class-transformer");
+const typeorm_1 = require("typeorm");
+const organisation_entity_1 = require("../../organisation/entities/organisation.entity");
+const person_entity_1 = require("../../person/entities/person.entity");
+const member_role_entity_1 = require("./member-role.entity");
+let OrganisationMembership = class OrganisationMembership {
+    // eslint-disable-next-line @typescript-eslint/require-await
+    async nullChecks() {
+        if (!this.roles) {
+            this.roles = [];
+        }
+    }
+};
+__decorate([
+    (0, typeorm_1.PrimaryGeneratedColumn)(),
+    (0, swagger_1.ApiProperty)(),
+    __metadata("design:type", Number)
+], OrganisationMembership.prototype, "id", void 0);
+__decorate([
+    (0, typeorm_1.Column)("uuid", {
+        name: "uuid",
+        default: () => "uuid_generate_v4()",
+    }),
+    (0, typeorm_1.Generated)("uuid"),
+    (0, swagger_1.ApiProperty)(),
+    __metadata("design:type", String)
+], OrganisationMembership.prototype, "uuid", void 0);
+__decorate([
+    (0, typeorm_1.ManyToOne)(() => person_entity_1.Person, (person) => person.memberships, {
+        eager: true,
+        cascade: ["insert", "update"],
+    }),
+    (0, class_transformer_1.Exclude)(),
+    (0, typeorm_1.JoinColumn)(),
+    __metadata("design:type", person_entity_1.Person)
+], OrganisationMembership.prototype, "person", void 0);
+__decorate([
+    (0, typeorm_1.Column)(),
+    (0, typeorm_1.RelationId)((membership) => membership.person),
+    __metadata("design:type", Number)
+], OrganisationMembership.prototype, "personId", void 0);
+__decorate([
+    (0, typeorm_1.ManyToOne)(() => organisation_entity_1.Organisation, (org) => org.memberships, {
+        eager: true,
+        cascade: ["insert", "update"],
+    }),
+    (0, class_transformer_1.Exclude)(),
+    (0, typeorm_1.JoinColumn)(),
+    __metadata("design:type", organisation_entity_1.Organisation)
+], OrganisationMembership.prototype, "organisation", void 0);
+__decorate([
+    (0, typeorm_1.Column)(),
+    (0, typeorm_1.RelationId)((membership) => membership.organisation),
+    __metadata("design:type", Number)
+], OrganisationMembership.prototype, "organisationId", void 0);
+__decorate([
+    (0, typeorm_1.OneToMany)(() => member_role_entity_1.MembershipRole, (role) => role.membership, {
+        eager: true,
+        cascade: true,
+    }),
+    (0, typeorm_1.Index)(),
+    (0, typeorm_1.JoinColumn)(),
+    __metadata("design:type", Array)
+], OrganisationMembership.prototype, "roles", void 0);
+__decorate([
+    (0, typeorm_1.CreateDateColumn)(),
+    (0, swagger_1.ApiProperty)(),
+    __metadata("design:type", Date)
+], OrganisationMembership.prototype, "createdDate", void 0);
+__decorate([
+    (0, typeorm_1.UpdateDateColumn)(),
+    (0, swagger_1.ApiProperty)(),
+    __metadata("design:type", Date)
+], OrganisationMembership.prototype, "updateDate", void 0);
+__decorate([
+    (0, typeorm_1.DeleteDateColumn)(),
+    (0, swagger_1.ApiProperty)(),
+    __metadata("design:type", Date)
+], OrganisationMembership.prototype, "deletedDate", void 0);
+__decorate([
+    (0, typeorm_1.AfterLoad)(),
+    (0, typeorm_1.AfterInsert)(),
+    (0, typeorm_1.AfterUpdate)(),
+    __metadata("design:type", Function),
+    __metadata("design:paramtypes", []),
+    __metadata("design:returntype", Promise)
+], OrganisationMembership.prototype, "nullChecks", null);
+OrganisationMembership = __decorate([
+    (0, typeorm_1.Entity)()
+], OrganisationMembership);
+exports.OrganisationMembership = OrganisationMembership;
+//# sourceMappingURL=organisation-membership.entity.js.map

package/dist/organisation/entities/organisation-membership.entity.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"organisation-membership.entity.js","sourceRoot":"","sources":["../../../src/organisation/entities/organisation-membership.entity.ts"],"names":[],"mappings":";;;;;;;;;;;;AAAA,6CAA4C;AAC5C,yDAA0C;AAC1C,qCAgBiB;AACjB,yFAA6E;AAC7E,uEAA2D;AAC3D,6DAAoD;AAG7C,IAAM,sBAAsB,GAA5B,MAAM,sBAAsB;IAyD/B,4DAA4D;IAItD,AAAN,KAAK,CAAC,UAAU;QACZ,IAAI,CAAC,IAAI,CAAC,KAAK,EAAE;YACb,IAAI,CAAC,KAAK,GAAG,EAAE,CAAC;SACnB;IACL,CAAC;CACJ,CAAA;AAjEG;IAAC,IAAA,gCAAsB,GAAE;IACxB,IAAA,qBAAW,GAAE;;kDACF;AAEZ;IAAC,IAAA,gBAAM,EAAC,MAAM,EAAE;QACZ,IAAI,EAAE,MAAM;QACZ,OAAO,EAAE,GAAG,EAAE,CAAC,oBAAoB;KACtC,CAAC;IACD,IAAA,mBAAS,EAAC,MAAM,CAAC;IACjB,IAAA,qBAAW,GAAE;;oDACO;AAErB;IAAC,IAAA,mBAAS,EAAC,GAAG,EAAE,CAAC,sBAAM,EAAE,CAAC,MAAM,EAAE,EAAE,CAAC,MAAM,CAAC,WAAW,EAAE;QACrD,KAAK,EAAE,IAAI;QACX,OAAO,EAAE,CAAC,QAAQ,EAAE,QAAQ,CAAC;KAChC,CAAC;IACD,IAAA,2BAAO,GAAE;IACT,IAAA,oBAAU,GAAE;8BACJ,sBAAM;sDAAC;AAEhB;IAAC,IAAA,gBAAM,GAAE;IACR,IAAA,oBAAU,EAAC,CAAC,UAAkC,EAAE,EAAE,CAAC,UAAU,CAAC,MAAM,CAAC;;wDAC7C;AAEzB;IAAC,IAAA,mBAAS,EAAC,GAAG,EAAE,CAAC,kCAAY,EAAE,CAAC,GAAG,EAAE,EAAE,CAAC,GAAG,CAAC,WAAW,EAAE;QACrD,KAAK,EAAE,IAAI;QACX,OAAO,EAAE,CAAC,QAAQ,EAAE,QAAQ,CAAC;KAChC,CAAC;IACD,IAAA,2BAAO,GAAE;IACT,IAAA,oBAAU,GAAE;8BACE,kCAAY;4DAAC;AAE5B;IAAC,IAAA,gBAAM,GAAE;IACR,IAAA,oBAAU,EAAC,CAAC,UAAkC,EAAE,EAAE,CAAC,UAAU,CAAC,YAAY,CAAC;;8DAC7C;AAE/B;IAAC,IAAA,mBAAS,EAAC,GAAG,EAAE,CAAC,mCAAc,EAAE,CAAC,IAAI,EAAE,EAAE,CAAC,IAAI,CAAC,UAAU,EAAE;QACxD,KAAK,EAAE,IAAI;QACX,OAAO,EAAE,IAAI;KAChB,CAAC;IACD,IAAA,eAAK,GAAE;IACP,IAAA,oBAAU,GAAE;;qDACY;AAEzB;IAAC,IAAA,0BAAgB,GAAE;IAClB,IAAA,qBAAW,GAAE;8BACA,IAAI;2DAAC;AAEnB;IAAC,IAAA,0BAAgB,GAAE;IAClB,IAAA,qBAAW,GAAE;8BACD,IAAI;0DAAC;AAElB;IAAC,IAAA,0BAAgB,GAAE;IAClB,IAAA,qBAAW,GAAE;8BACA,IAAI;2DAAC;AAMb;IAHL,IAAA,mBAAS,GAAE;IACX,IAAA,qBAAW,GAAE;IACb,IAAA,qBAAW,GAAE;;;;wDAKb;AAjEQ,sBAAsB;IADlC,IAAA,gBAAM,GAAE;GACI,sBAAsB,CAkElC;AAlEY,wDAAsB"}

package/dist/organisation/entities/organisation.entity.d.ts

@@ -1,10 +1,8 @@
-import { Person } from "../../person/entities/person.entity";
+import { OrganisationMembership } from "./organisation-membership.entity";
 export declare class Organisation {
     id: number;
     uuid: string;
-    members: Person[];
-    owner: Person;
-    ownerId: number;
+    memberships: OrganisationMembership[];
     name: string;
     createdDate: Date;
     updateDate: Date;

package/dist/organisation/entities/organisation.entity.js

@@ -11,14 +11,13 @@ var __metadata = (this && this.__metadata) || function (k, v) {
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.Organisation = void 0;
 const swagger_1 = require("@nestjs/swagger");
-const class_transformer_1 = require("class-transformer");
 const typeorm_1 = require("typeorm");
-const person_entity_1 = require("../../person/entities/person.entity");
+const organisation_membership_entity_1 = require("./organisation-membership.entity");
 let Organisation = class Organisation {
     // eslint-disable-next-line @typescript-eslint/require-await
     async nullChecks() {
-        if (!this.members) {
-            this.members = [];
+        if (!this.memberships) {
+            this.memberships = [];
         }
     }
 };
@@ -37,28 +36,13 @@ __decorate([
     __metadata("design:type", String)
 ], Organisation.prototype, "uuid", void 0);
 __decorate([
-    (0, typeorm_1.ManyToMany)(() => person_entity_1.Person, (orgMember) => orgMember.memberOfOrganisations, {
+    (0, typeorm_1.OneToMany)(() => organisation_membership_entity_1.OrganisationMembership, (om) => om.organisation, {
         eager: true,
-        onDelete: "CASCADE",
-    }),
-    (0, class_transformer_1.Exclude)(),
-    (0, typeorm_1.JoinTable)(),
-    __metadata("design:type", Array)
-], Organisation.prototype, "members", void 0);
-__decorate([
-    (0, typeorm_1.ManyToOne)(() => person_entity_1.Person, (person) => person.ownerOfOrganisations, {
-        eager: true,
-        onDelete: "CASCADE",
+        cascade: ["insert", "update"],
     }),
     (0, typeorm_1.Index)(),
-    (0, typeorm_1.JoinColumn)(),
-    __metadata("design:type", person_entity_1.Person)
-], Organisation.prototype, "owner", void 0);
-__decorate([
-    (0, typeorm_1.RelationId)((organisation) => organisation.owner),
-    (0, swagger_1.ApiProperty)(),
-    __metadata("design:type", Number)
-], Organisation.prototype, "ownerId", void 0);
+    __metadata("design:type", Array)
+], Organisation.prototype, "memberships", void 0);
 __decorate([
     (0, typeorm_1.Column)(),
     (0, swagger_1.ApiProperty)(),

package/dist/organisation/entities/organisation.entity.js.map

@@ -1 +1 @@
-{"version":3,"file":"organisation.entity.js","sourceRoot":"","sources":["../../../src/organisation/entities/organisation.entity.ts"],"names":[],"mappings":";;;;;;;;;;;;AAAA,6CAA4C;AAC5C,yDAA0C;AAC1C,qCAiBiB;AACjB,uEAA2D;AAGpD,IAAM,YAAY,GAAlB,MAAM,YAAY;IAiDrB,4DAA4D;IAItD,AAAN,KAAK,CAAC,UAAU;QACZ,IAAI,CAAC,IAAI,CAAC,OAAO,EAAE;YACf,IAAI,CAAC,OAAO,GAAG,EAAE,CAAC;SACrB;IACL,CAAC;CACJ,CAAA;AAzDG;IAAC,IAAA,gCAAsB,GAAE;IACxB,IAAA,qBAAW,GAAE;;wCACF;AAEZ;IAAC,IAAA,gBAAM,EAAC,MAAM,EAAE;QACZ,IAAI,EAAE,MAAM;QACZ,OAAO,EAAE,GAAG,EAAE,CAAC,oBAAoB;KACtC,CAAC;IACD,IAAA,mBAAS,EAAC,MAAM,CAAC;IACjB,IAAA,qBAAW,GAAE;;0CACO;AAErB;IAAC,IAAA,oBAAU,EAAC,GAAG,EAAE,CAAC,sBAAM,EAAE,CAAC,SAAS,EAAE,EAAE,CAAC,SAAS,CAAC,qBAAqB,EAAE;QACtE,KAAK,EAAE,IAAI;QACX,QAAQ,EAAE,SAAS;KACtB,CAAC;IACD,IAAA,2BAAO,GAAE;IACT,IAAA,mBAAS,GAAE;;6CACO;AAEnB;IAAC,IAAA,mBAAS,EAAC,GAAG,EAAE,CAAC,sBAAM,EAAE,CAAC,MAAM,EAAE,EAAE,CAAC,MAAM,CAAC,oBAAoB,EAAE;QAC9D,KAAK,EAAE,IAAI;QACX,QAAQ,EAAE,SAAS;KACtB,CAAC;IACD,IAAA,eAAK,GAAE;IACP,IAAA,oBAAU,GAAE;8BACL,sBAAM;2CAAC;AAEf;IAAC,IAAA,oBAAU,EAAC,CAAC,YAA0B,EAAE,EAAE,CAAC,YAAY,CAAC,KAAK,CAAC;IAC9D,IAAA,qBAAW,GAAE;;6CACG;AAEjB;IAAC,IAAA,gBAAM,GAAE;IACR,IAAA,qBAAW,GAAE;;0CACA;AAEd;IAAC,IAAA,0BAAgB,GAAE;IAClB,IAAA,qBAAW,GAAE;8BACA,IAAI;iDAAC;AAEnB;IAAC,IAAA,0BAAgB,GAAE;IAClB,IAAA,qBAAW,GAAE;8BACD,IAAI;gDAAC;AAElB;IAAC,IAAA,0BAAgB,GAAE;IAClB,IAAA,qBAAW,GAAE;8BACA,IAAI;iDAAC;AAMb;IAHL,IAAA,mBAAS,GAAE;IACX,IAAA,qBAAW,GAAE;IACb,IAAA,qBAAW,GAAE;;;;8CAKb;AAzDQ,YAAY;IADxB,IAAA,gBAAM,GAAE;GACI,YAAY,CA0DxB;AA1DY,oCAAY"}
+{"version":3,"file":"organisation.entity.js","sourceRoot":"","sources":["../../../src/organisation/entities/organisation.entity.ts"],"names":[],"mappings":";;;;;;;;;;;;AAAA,6CAA4C;AAE5C,qCAaiB;AACjB,qFAAwE;AAGjE,IAAM,YAAY,GAAlB,MAAM,YAAY;IAoCrB,4DAA4D;IAItD,AAAN,KAAK,CAAC,UAAU;QACZ,IAAI,CAAC,IAAI,CAAC,WAAW,EAAE;YACnB,IAAI,CAAC,WAAW,GAAG,EAAE,CAAC;SACzB;IACL,CAAC;CACJ,CAAA;AA5CG;IAAC,IAAA,gCAAsB,GAAE;IACxB,IAAA,qBAAW,GAAE;;wCACF;AAEZ;IAAC,IAAA,gBAAM,EAAC,MAAM,EAAE;QACZ,IAAI,EAAE,MAAM;QACZ,OAAO,EAAE,GAAG,EAAE,CAAC,oBAAoB;KACtC,CAAC;IACD,IAAA,mBAAS,EAAC,MAAM,CAAC;IACjB,IAAA,qBAAW,GAAE;;0CACO;AAErB;IAAC,IAAA,mBAAS,EAAC,GAAG,EAAE,CAAC,uDAAsB,EAAE,CAAC,EAAE,EAAE,EAAE,CAAC,EAAE,CAAC,YAAY,EAAE;QAC9D,KAAK,EAAE,IAAI;QACX,OAAO,EAAE,CAAC,QAAQ,EAAE,QAAQ,CAAC;KAChC,CAAC;IACD,IAAA,eAAK,GAAE;;iDAC+B;AAEvC;IAAC,IAAA,gBAAM,GAAE;IACR,IAAA,qBAAW,GAAE;;0CACA;AAEd;IAAC,IAAA,0BAAgB,GAAE;IAClB,IAAA,qBAAW,GAAE;8BACA,IAAI;iDAAC;AAEnB;IAAC,IAAA,0BAAgB,GAAE;IAClB,IAAA,qBAAW,GAAE;8BACD,IAAI;gDAAC;AAElB;IAAC,IAAA,0BAAgB,GAAE;IAClB,IAAA,qBAAW,GAAE;8BACA,IAAI;iDAAC;AAMb;IAHL,IAAA,mBAAS,GAAE;IACX,IAAA,qBAAW,GAAE;IACb,IAAA,qBAAW,GAAE;;;;8CAKb;AA5CQ,YAAY;IADxB,IAAA,gBAAM,GAAE;GACI,YAAY,CA6CxB;AA7CY,oCAAY"}

package/dist/organisation/organisation.service.js

@@ -16,38 +16,94 @@ exports.OrganisationService = void 0;
 const common_1 = require("@nestjs/common");
 const typeorm_1 = require("@nestjs/typeorm");
 const typeorm_2 = require("typeorm");
+const RolesEnum_1 = require("./dto/RolesEnum");
+const member_role_entity_1 = require("./entities/member-role.entity");
+const organisation_membership_entity_1 = require("./entities/organisation-membership.entity");
 const organisation_entity_1 = require("./entities/organisation.entity");
 let OrganisationService = class OrganisationService {
     constructor(repository) {
         this.repository = repository;
     }
     async create(createOrganisationDto) {
-        return this.repository.save(createOrganisationDto);
+        // create a new organisation
+        const unsavedOrganisation = new organisation_entity_1.Organisation();
+        unsavedOrganisation.name = createOrganisationDto.name;
+        unsavedOrganisation.memberships = [];
+        // add the owner
+        const ownerMembership = new organisation_membership_entity_1.OrganisationMembership();
+        ownerMembership.person = createOrganisationDto.owner;
+        const ownerRole = new member_role_entity_1.MembershipRole();
+        ownerRole.name = RolesEnum_1.Roles.owner;
+        ownerMembership.roles.push(ownerRole);
+        unsavedOrganisation.memberships.push(ownerMembership);
+        // add all the others
+        const normalMemberships = createOrganisationDto.members.map((member) => {
+            const membership = new organisation_membership_entity_1.OrganisationMembership();
+            membership.person = member;
+            const memberRole = new member_role_entity_1.MembershipRole();
+            memberRole.name = RolesEnum_1.Roles.member;
+            membership.roles.push(memberRole);
+            return membership;
+        });
+        unsavedOrganisation.memberships.push(...normalMemberships);
+        return this.repository.save(unsavedOrganisation);
     }
     async findAllForUser(currentUserId) {
-        return this.repository
-            .createQueryBuilder("orgs")
-            .innerJoinAndSelect("orgs.owner", "owner")
-            .where("owner.id = :currentUserId")
-            .setParameters({ currentUserId })
-            .getMany();
+        return this.repository.find({
+            where: {
+                memberships: {
+                    person: {
+                        id: currentUserId,
+                    },
+                },
+            },
+        });
     }
     async findOne(uuid, currentUserId) {
-        return this.repository
-            .createQueryBuilder("orgs")
-            .innerJoinAndSelect("orgs.owner", "owner")
-            .where("owner.id = :currentUserId")
-            .andWhere("orgs.uuid = :uuid")
-            .setParameters({ currentUserId, uuid })
-            .getOneOrFail();
+        return this.repository.findOneOrFail({
+            where: {
+                uuid,
+                memberships: {
+                    person: {
+                        id: currentUserId,
+                    },
+                },
+            },
+        });
     }
     async update(uuid, updateOrganisationDto, currentUserId) {
-        return this.repository.update({ uuid, ownerId: currentUserId }, updateOrganisationDto);
+        const ownerOfOrg = await this.repository.findOneOrFail({
+            where: {
+                uuid,
+                memberships: {
+                    person: {
+                        id: currentUserId,
+                    },
+                    roles: {
+                        name: RolesEnum_1.Roles.owner,
+                    },
+                },
+            },
+        });
+        this.repository.merge(ownerOfOrg, updateOrganisationDto);
+        return this.repository.update(ownerOfOrg.id, ownerOfOrg);
     }
     async remove(uuid, currentUserId) {
+        const ownerOfOrg = await this.repository.findOneOrFail({
+            where: {
+                uuid,
+                memberships: {
+                    person: {
+                        id: currentUserId,
+                    },
+                    roles: {
+                        name: RolesEnum_1.Roles.owner,
+                    },
+                },
+            },
+        });
         return this.repository.delete({
-            uuid,
-            ownerId: currentUserId,
+            id: ownerOfOrg.id,
         });
     }
 };

package/dist/organisation/organisation.service.js.map

@@ -1 +1 @@
-{"version":3,"file":"organisation.service.js","sourceRoot":"","sources":["../../src/organisation/organisation.service.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;AAAA,2CAA0C;AAC1C,6CAAiD;AACjD,qCAA+D;AAG/D,wEAA4D;AAGrD,IAAM,mBAAmB,GAAzB,MAAM,mBAAmB;IAC5B,YAEY,UAAoC;QAApC,eAAU,GAAV,UAAU,CAA0B;IAC7C,CAAC;IAEJ,KAAK,CAAC,MAAM,CACR,qBAA4C;QAE5C,OAAO,IAAI,CAAC,UAAU,CAAC,IAAI,CAAC,qBAAqB,CAAC,CAAC;IACvD,CAAC;IAED,KAAK,CAAC,cAAc,CAAC,aAAqB;QACtC,OAAO,IAAI,CAAC,UAAU;aACjB,kBAAkB,CAAC,MAAM,CAAC;aAC1B,kBAAkB,CAAC,YAAY,EAAE,OAAO,CAAC;aACzC,KAAK,CAAC,2BAA2B,CAAC;aAClC,aAAa,CAAC,EAAC,aAAa,EAAC,CAAC;aAC9B,OAAO,EAAE,CAAC;IACnB,CAAC;IAED,KAAK,CAAC,OAAO,CAAC,IAAY,EAAE,aAAqB;QAC7C,OAAO,IAAI,CAAC,UAAU;aACjB,kBAAkB,CAAC,MAAM,CAAC;aAC1B,kBAAkB,CAAC,YAAY,EAAE,OAAO,CAAC;aACzC,KAAK,CAAC,2BAA2B,CAAC;aAClC,QAAQ,CAAC,mBAAmB,CAAC;aAC7B,aAAa,CAAC,EAAC,aAAa,EAAE,IAAI,EAAC,CAAC;aACpC,YAAY,EAAE,CAAC;IACxB,CAAC;IAED,KAAK,CAAC,MAAM,CACR,IAAY,EACZ,qBAA4C,EAC5C,aAAqB;QAErB,OAAO,IAAI,CAAC,UAAU,CAAC,MAAM,CACzB,EAAC,IAAI,EAAE,OAAO,EAAE,aAAa,EAAC,EAC9B,qBAAqB,CACxB,CAAC;IACN,CAAC;IAED,KAAK,CAAC,MAAM,CAAC,IAAY,EAAE,aAAqB;QAC5C,OAAO,IAAI,CAAC,UAAU,CAAC,MAAM,CAAC;YAC1B,IAAI;YACJ,OAAO,EAAE,aAAa;SACzB,CAAC,CAAC;IACP,CAAC;CACJ,CAAA;AAhDY,mBAAmB;IAD/B,IAAA,mBAAU,GAAE;IAGJ,WAAA,IAAA,0BAAgB,EAAC,kCAAY,CAAC,CAAA;qCACX,oBAAU;GAHzB,mBAAmB,CAgD/B;AAhDY,kDAAmB"}
+{"version":3,"file":"organisation.service.js","sourceRoot":"","sources":["../../src/organisation/organisation.service.ts"],"names":[],"mappings":"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"}

package/dist/person/entities/person.entity.d.ts

@@ -1,4 +1,4 @@
-import { Organisation } from "../../organisation/entities/organisation.entity";
+import { OrganisationMembership } from "../../organisation/entities/organisation-membership.entity";
 export declare class Person {
     id: number;
     email: string;
@@ -11,8 +11,7 @@ export declare class Person {
     picture: string;
     auth0UserId: string;
     username?: string;
-    memberOfOrganisations: Organisation[];
-    ownerOfOrganisations: Organisation[];
+    memberships: OrganisationMembership[];
     createdDate: Date;
     updateDate: Date;
     deletedDate: Date;