@darraghor/nest-backend-libs 1.49.1 → 2.1.0

package/dist/invitations/invitation.service.js

@@ -0,0 +1,92 @@
+"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);
+};
+var __param = (this && this.__param) || function (paramIndex, decorator) {
+    return function (target, key) { decorator(target, key, paramIndex); }
+};
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.InvitationService = void 0;
+const common_1 = require("@nestjs/common");
+const typeorm_1 = require("@nestjs/typeorm");
+const typeorm_2 = require("typeorm");
+const RolesEnum_1 = require("../organisation/dto/RolesEnum");
+const invitation_entity_1 = require("./entities/invitation.entity");
+const email_client_service_1 = require("../smtp-email-client/email-client.service");
+const organisation_entity_1 = require("../organisation/entities/organisation.entity");
+const InvitationConfigurationService_1 = require("./InvitationConfigurationService");
+let InvitationService = class InvitationService {
+    constructor(invitationRepository, organisationRepository, emailClient, configService) {
+        this.invitationRepository = invitationRepository;
+        this.organisationRepository = organisationRepository;
+        this.emailClient = emailClient;
+        this.configService = configService;
+    }
+    async create(createDto, createdBy) {
+        const existingInvitations = await this.invitationRepository.find({
+            where: {
+                emailAddress: createDto.emailAddress,
+                organisation: {
+                    id: createDto.organisationId,
+                },
+            },
+        });
+        const hasUnexpiredInvitations = existingInvitations.some((invitation) => invitation.expiresOn > new Date());
+        if (hasUnexpiredInvitations) {
+            throw new Error("An valid invitation already exists for this email address for this organisation");
+        }
+        // otherwise, create a new invitation
+        const unsavedInvitation = new invitation_entity_1.Invitation();
+        unsavedInvitation.emailAddress = createDto.emailAddress;
+        unsavedInvitation.expiresOn = new Date();
+        unsavedInvitation.expiresOn.setDate(unsavedInvitation.expiresOn.getDate() + 1);
+        unsavedInvitation.organisation =
+            await this.organisationRepository.findOneOrFail({
+                where: { id: createDto.organisationId },
+            });
+        unsavedInvitation.givenName = createDto.givenName;
+        const savedInvitation = await this.invitationRepository.save(unsavedInvitation);
+        // try to email the invitation
+        await this.emailClient.sendMail([unsavedInvitation.emailAddress], [], `Invitation to join ${unsavedInvitation.organisation.name}`, createdBy.uuid, `You have been invited to join ${unsavedInvitation.organisation.name} by ${createdBy.givenName || "another "} ${createdBy.familyName || "member"}. Please click the link below to accept the invitation.
+
+            ${this.configService.baseUrl}/accept-invitation/${savedInvitation.uuid}`);
+        // if it gets to here we have a sent invitation
+        savedInvitation.notificationSent = new Date();
+        return this.invitationRepository.save(savedInvitation);
+    }
+    async remove(uuid, currentUserId) {
+        const invitation = await this.invitationRepository.findOneOrFail({
+            where: {
+                uuid,
+                organisation: {
+                    memberships: {
+                        person: {
+                            id: currentUserId,
+                        },
+                        roles: {
+                            name: RolesEnum_1.Roles.owner,
+                        },
+                    },
+                },
+            },
+        });
+        return this.invitationRepository.remove(invitation);
+    }
+};
+InvitationService = __decorate([
+    (0, common_1.Injectable)(),
+    __param(0, (0, typeorm_1.InjectRepository)(invitation_entity_1.Invitation)),
+    __param(1, (0, typeorm_1.InjectRepository)(organisation_entity_1.Organisation)),
+    __metadata("design:paramtypes", [typeorm_2.Repository,
+        typeorm_2.Repository,
+        email_client_service_1.SmtpEmailClient,
+        InvitationConfigurationService_1.InvitationsConfigurationService])
+], InvitationService);
+exports.InvitationService = InvitationService;
+//# sourceMappingURL=invitation.service.js.map

package/dist/invitations/invitation.service.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"invitation.service.js","sourceRoot":"","sources":["../../src/invitations/invitation.service.ts"],"names":[],"mappings":"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"}

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,10 @@
-import { Person } from "../../person/entities/person.entity";
+import { Invitation } from "../../invitations/entities/invitation.entity";
+import { OrganisationMembership } from "./organisation-membership.entity";
 export declare class Organisation {
     id: number;
     uuid: string;
-    members: Person[];
-    owner: Person;
-    ownerId: number;
+    memberships: OrganisationMembership[];
+    invitations: Invitation[];
     name: string;
     createdDate: Date;
     updateDate: Date;

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

@@ -11,14 +11,14 @@ 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 invitation_entity_1 = require("../../invitations/entities/invitation.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 +37,21 @@ __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",
+        cascade: ["insert", "update"],
     }),
-    (0, class_transformer_1.Exclude)(),
-    (0, typeorm_1.JoinTable)(),
+    (0, typeorm_1.Index)(),
     __metadata("design:type", Array)
-], Organisation.prototype, "members", void 0);
+], Organisation.prototype, "memberships", void 0);
 __decorate([
-    (0, typeorm_1.ManyToOne)(() => person_entity_1.Person, (person) => person.ownerOfOrganisations, {
+    (0, typeorm_1.OneToMany)(() => invitation_entity_1.Invitation, (om) => om.organisation, {
         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, "invitations", 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,oFAAwE;AACxE,qFAAwE;AAGjE,IAAM,YAAY,GAAlB,MAAM,YAAY;IA2CrB,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;AAnDG;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,mBAAS,EAAC,GAAG,EAAE,CAAC,8BAAU,EAAE,CAAC,EAAE,EAAE,EAAE,CAAC,EAAE,CAAC,YAAY,EAAE;QAClD,KAAK,EAAE,IAAI;QACX,OAAO,EAAE,CAAC,QAAQ,EAAE,QAAQ,CAAC;KAChC,CAAC;IACD,IAAA,eAAK,GAAE;;iDACmB;AAE3B;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;AAnDQ,YAAY;IADxB,IAAA,gBAAM,GAAE;GACI,YAAY,CAoDxB;AApDY,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;

package/dist/person/entities/person.entity.js

@@ -13,15 +13,12 @@ exports.Person = 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 organisation_membership_entity_1 = require("../../organisation/entities/organisation-membership.entity");
 let Person = class Person {
     // eslint-disable-next-line @typescript-eslint/require-await
     async nullChecks() {
-        if (!this.memberOfOrganisations) {
-            this.memberOfOrganisations = [];
-        }
-        if (!this.ownerOfOrganisations) {
-            this.ownerOfOrganisations = [];
+        if (!this.memberships) {
+            this.memberships = [];
         }
     }
 };
@@ -87,19 +84,11 @@ __decorate([
 ], Person.prototype, "username", void 0);
 __decorate([
     (0, class_transformer_1.Exclude)(),
-    (0, typeorm_1.ManyToMany)(() => organisation_entity_1.Organisation, (org) => org.members, {
-        cascade: true,
-        onDelete: "CASCADE",
-    }),
-    __metadata("design:type", Array)
-], Person.prototype, "memberOfOrganisations", void 0);
-__decorate([
-    (0, class_transformer_1.Exclude)(),
-    (0, typeorm_1.OneToMany)(() => organisation_entity_1.Organisation, (org) => org.owner, {
-        cascade: true,
+    (0, typeorm_1.OneToMany)(() => organisation_membership_entity_1.OrganisationMembership, (om) => om.person, {
+        cascade: ["insert", "update"],
     }),
     __metadata("design:type", Array)
-], Person.prototype, "ownerOfOrganisations", void 0);
+], Person.prototype, "memberships", void 0);
 __decorate([
     (0, typeorm_1.CreateDateColumn)(),
     (0, swagger_1.ApiProperty)(),

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

@@ -1 +1 @@
-{"version":3,"file":"person.entity.js","sourceRoot":"","sources":["../../../src/person/entities/person.entity.ts"],"names":[],"mappings":";;;;;;;;;;;;AAAA,6CAAiE;AACjE,yDAA0C;AAC1C,qCAciB;AACjB,yFAA6E;AAGtE,IAAM,MAAM,GAAZ,MAAM,MAAM;IA2Ef,4DAA4D;IAItD,AAAN,KAAK,CAAC,UAAU;QACZ,IAAI,CAAC,IAAI,CAAC,qBAAqB,EAAE;YAC7B,IAAI,CAAC,qBAAqB,GAAG,EAAE,CAAC;SACnC;QACD,IAAI,CAAC,IAAI,CAAC,oBAAoB,EAAE;YAC5B,IAAI,CAAC,oBAAoB,GAAG,EAAE,CAAC;SAClC;IACL,CAAC;CACJ,CAAA;AAtFG;IAAC,IAAA,gCAAsB,GAAE;IACxB,IAAA,qBAAW,GAAE;;kCACF;AAEZ;IAAC,IAAA,qBAAW,GAAE;IACb,IAAA,gBAAM,GAAE;;qCACM;AAEf;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;;oCACO;AAErB;IAAC,IAAA,qBAAW,GAAE;IACb,IAAA,gBAAM,EAAC,EAAC,OAAO,EAAE,KAAK,EAAC,CAAC;;6CACD;AAExB;IAAC,IAAA,qBAAW,GAAE;IACb,IAAA,gBAAM,EAAC,EAAC,OAAO,EAAE,KAAK,EAAC,CAAC;;uCACP;AAElB;IAAC,IAAA,6BAAmB,GAAE;IACrB,IAAA,gBAAM,EAAC,EAAC,QAAQ,EAAE,IAAI,EAAC,CAAC;;oCACX;AAEd;IAAC,IAAA,6BAAmB,GAAE;IACrB,IAAA,gBAAM,EAAC,EAAC,QAAQ,EAAE,IAAI,EAAC,CAAC;;0CACL;AAEpB;IAAC,IAAA,6BAAmB,GAAE;IACrB,IAAA,gBAAM,EAAC,EAAC,QAAQ,EAAE,IAAI,EAAC,CAAC;;yCACN;AAEnB;IAAC,IAAA,qBAAW,GAAE;IACb,IAAA,gBAAM,GAAE;;uCACQ;AAEjB;IAAC,IAAA,qBAAW,GAAE;IACb,IAAA,gBAAM,GAAE;IACR,IAAA,eAAK,EAAC,EAAC,MAAM,EAAE,IAAI,EAAC,CAAC;;2CACD;AAErB;IAAC,IAAA,6BAAmB,GAAE;IACrB,IAAA,gBAAM,EAAC,EAAC,QAAQ,EAAE,IAAI,EAAC,CAAC;;wCACP;AAElB;IAAC,IAAA,2BAAO,GAAE;IACT,IAAA,oBAAU,EAAC,GAAG,EAAE,CAAC,kCAAY,EAAE,CAAC,GAAG,EAAE,EAAE,CAAC,GAAG,CAAC,OAAO,EAAE;QAClD,OAAO,EAAE,IAAI;QACb,QAAQ,EAAE,SAAS;KACtB,CAAC;;qDACqC;AAEvC;IAAC,IAAA,2BAAO,GAAE;IACT,IAAA,mBAAS,EAAC,GAAG,EAAE,CAAC,kCAAY,EAAE,CAAC,GAAG,EAAE,EAAE,CAAC,GAAG,CAAC,KAAK,EAAE;QAC/C,OAAO,EAAE,IAAI;KAChB,CAAC;;oDACoC;AAEtC;IAAC,IAAA,0BAAgB,GAAE;IAClB,IAAA,qBAAW,GAAE;8BACA,IAAI;2CAAC;AAEnB;IAAC,IAAA,0BAAgB,GAAE;IAClB,IAAA,qBAAW,GAAE;8BACD,IAAI;0CAAC;AAElB;IAAC,IAAA,0BAAgB,GAAE;IAClB,IAAA,qBAAW,GAAE;8BACA,IAAI;2CAAC;AAMb;IAHL,IAAA,mBAAS,GAAE;IACX,IAAA,qBAAW,GAAE;IACb,IAAA,qBAAW,GAAE;;;;wCAQb;AAtFQ,MAAM;IADlB,IAAA,gBAAM,GAAE;GACI,MAAM,CAuFlB;AAvFY,wBAAM"}
+{"version":3,"file":"person.entity.js","sourceRoot":"","sources":["../../../src/person/entities/person.entity.ts"],"names":[],"mappings":";;;;;;;;;;;;AAAA,6CAAiE;AACjE,yDAA0C;AAC1C,qCAaiB;AACjB,+GAAkG;AAG3F,IAAM,MAAM,GAAZ,MAAM,MAAM;IAoEf,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;AA5EG;IAAC,IAAA,gCAAsB,GAAE;IACxB,IAAA,qBAAW,GAAE;;kCACF;AAEZ;IAAC,IAAA,qBAAW,GAAE;IACb,IAAA,gBAAM,GAAE;;qCACM;AAEf;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;;oCACO;AAErB;IAAC,IAAA,qBAAW,GAAE;IACb,IAAA,gBAAM,EAAC,EAAC,OAAO,EAAE,KAAK,EAAC,CAAC;;6CACD;AAExB;IAAC,IAAA,qBAAW,GAAE;IACb,IAAA,gBAAM,EAAC,EAAC,OAAO,EAAE,KAAK,EAAC,CAAC;;uCACP;AAElB;IAAC,IAAA,6BAAmB,GAAE;IACrB,IAAA,gBAAM,EAAC,EAAC,QAAQ,EAAE,IAAI,EAAC,CAAC;;oCACX;AAEd;IAAC,IAAA,6BAAmB,GAAE;IACrB,IAAA,gBAAM,EAAC,EAAC,QAAQ,EAAE,IAAI,EAAC,CAAC;;0CACL;AAEpB;IAAC,IAAA,6BAAmB,GAAE;IACrB,IAAA,gBAAM,EAAC,EAAC,QAAQ,EAAE,IAAI,EAAC,CAAC;;yCACN;AAEnB;IAAC,IAAA,qBAAW,GAAE;IACb,IAAA,gBAAM,GAAE;;uCACQ;AAEjB;IAAC,IAAA,qBAAW,GAAE;IACb,IAAA,gBAAM,GAAE;IACR,IAAA,eAAK,EAAC,EAAC,MAAM,EAAE,IAAI,EAAC,CAAC;;2CACD;AAErB;IAAC,IAAA,6BAAmB,GAAE;IACrB,IAAA,gBAAM,EAAC,EAAC,QAAQ,EAAE,IAAI,EAAC,CAAC;;wCACP;AAElB;IAAC,IAAA,2BAAO,GAAE;IACT,IAAA,mBAAS,EAAC,GAAG,EAAE,CAAC,uDAAsB,EAAE,CAAC,EAAE,EAAE,EAAE,CAAC,EAAE,CAAC,MAAM,EAAE;QACxD,OAAO,EAAE,CAAC,QAAQ,EAAE,QAAQ,CAAC;KAChC,CAAC;;2CACqC;AAEvC;IAAC,IAAA,0BAAgB,GAAE;IAClB,IAAA,qBAAW,GAAE;8BACA,IAAI;2CAAC;AAEnB;IAAC,IAAA,0BAAgB,GAAE;IAClB,IAAA,qBAAW,GAAE;8BACD,IAAI;0CAAC;AAElB;IAAC,IAAA,0BAAgB,GAAE;IAClB,IAAA,qBAAW,GAAE;8BACA,IAAI;2CAAC;AAMb;IAHL,IAAA,mBAAS,GAAE;IACX,IAAA,qBAAW,GAAE;IACb,IAAA,qBAAW,GAAE;;;;wCAKb;AA5EQ,MAAM;IADlB,IAAA,gBAAM,GAAE;GACI,MAAM,CA6ElB;AA7EY,wBAAM"}