@darraghor/nest-backend-libs 2.27.0 → 2.28.0

package/dist/invitations/invitation.service.js

@@ -11,9 +11,9 @@ var __param = (this && this.__param) || function (paramIndex, decorator) {
     return function (target, key) { decorator(target, key, paramIndex); }
 };
 var InvitationService_1;
-import { Injectable, Logger, NotFoundException } from "@nestjs/common";
+import { BadRequestException, ForbiddenException, Injectable, Logger, NotFoundException, } from "@nestjs/common";
 import { InjectRepository } from "@nestjs/typeorm";
-import { IsNull, LessThan, Repository } from "typeorm";
+import { IsNull, MoreThan, Repository } from "typeorm";
 import { Roles } from "../organisation/dto/RolesEnum.js";
 import { Invitation } from "./entities/invitation.entity.js";
 import { SmtpEmailClient } from "../smtp-email-client/email-client.service.js";
@@ -40,7 +40,7 @@ let InvitationService = InvitationService_1 = class InvitationService {
             where: {
                 uuid: invitationCode,
                 acceptedOn: IsNull(),
-                expiresOn: LessThan(new Date()),
+                expiresOn: MoreThan(new Date()),
             },
             relations: {
                 organisationMembership: {
@@ -50,30 +50,26 @@ let InvitationService = InvitationService_1 = class InvitationService {
             },
         });
     }
-    async acceptInvitation(invitationId) {
-        await this.invitationRepository.manager.transaction(async (transactionalEntityManager) => {
-            // get the invitation again to ensure we have the latest version
-            const latestInvitation = await transactionalEntityManager.findOne(Invitation, {
-                where: { id: invitationId },
-                relations: {
-                    organisationMembership: true,
+    async getAllForOrg(orgId, requestUser) {
+        await this.canManageInvitationsForThisOrg({
+            orgUuid: orgId,
+            user: requestUser,
+        });
+        return this.invitationRepository.find({
+            where: {
+                organisationMembership: {
+                    organisation: {
+                        uuid: orgId,
+                    },
                 },
-            });
-            if (!latestInvitation) {
-                throw new NotFoundException(`Invitation with id ${invitationId} not found`);
-            }
-            // set the invitation to accepted
-            latestInvitation.acceptedOn = new Date();
-            await transactionalEntityManager.save(latestInvitation);
-            // set the user's membership to member and remove the invitation role
-            const memberRole = new MembershipRole();
-            memberRole.name = Roles.member;
-            latestInvitation.organisationMembership.roles = [memberRole];
-            await transactionalEntityManager.save(latestInvitation.organisationMembership);
+            },
         });
     }
     async create(createDto, createdBy) {
-        await this.canManageInvitationsForThisOrg(createDto.organisationId, createdBy.id);
+        await this.canManageInvitationsForThisOrg({
+            orgId: createDto.organisationId,
+            user: createdBy,
+        });
         const existingMemberships = await this.orgMembershipRepository.find({
             where: {
                 user: {
@@ -84,21 +80,20 @@ let InvitationService = InvitationService_1 = class InvitationService {
                 },
             },
             relations: {
-                invitation: true,
+                invitations: true,
                 roles: true,
             },
         });
-        if (existingMemberships.some((m) => m.roles.some((r) => r.name === Roles.member || r.name === Roles.owner))) {
+        if (existingMemberships.some((m) => m.roles?.some((r) => r.name === Roles.member || r.name === Roles.owner))) {
             const message = "A user with this email address is already a member of this organisation";
             this.logger.error(message, { createDto, createdBy });
             throw new Error(message);
         }
-        if (existingMemberships.some((m) => m.invitation &&
-            m.invitation.acceptedOn === null &&
-            m.invitation.expiresOn > new Date())) {
+        if (existingMemberships.some((m) => m.invitations &&
+            m.invitations.some((mi) => mi.acceptedOn === null && mi.expiresOn > new Date()))) {
             const message = "An valid invitation with this email already exists for this organisation";
             this.logger.error(message, { createDto, createdBy });
-            throw new Error(message);
+            throw new BadRequestException(message);
         }
         // new empty user
         const user = new User();
@@ -114,54 +109,90 @@ let InvitationService = InvitationService_1 = class InvitationService {
         unsavedInvitation.expiresOn.setDate(unsavedInvitation.expiresOn.getDate() + 1);
         unsavedInvitation.givenName = createDto.givenName;
         // create a new membership
-        const membership = this.orgMembershipRepository.create();
+        const membership = this.orgMembershipRepository.create({
+            invitations: [],
+        });
         membership.organisationId = createDto.organisationId;
         membership.userId = savedUser.id;
-        membership.invitation = unsavedInvitation;
+        membership.invitations?.push(unsavedInvitation);
         membership.roles = [role];
         const savedMembership = await this.orgMembershipRepository.save(membership);
         const retrievedMembership = await this.orgMembershipRepository.findOne({
             where: { id: savedMembership.id },
             relations: {
-                invitation: true,
+                invitations: true,
                 organisation: true,
             },
         });
-        if (!retrievedMembership || !retrievedMembership.invitation) {
-            this.logger.error("Newly saved membership not found", {
+        if (!retrievedMembership) {
+            this.logger.error("New membership did not save correctly", {
+                createDto,
+                createdBy,
+                createdMembershipId: savedMembership?.id,
+            });
+            throw new Error("New membership did not save correctly");
+        }
+        const validInvitation = retrievedMembership.invitations?.find((invitation) => invitation.expiresOn > new Date() && !invitation.acceptedOn);
+        if (!validInvitation) {
+            this.logger.error("New invitation did not save correctly", {
                 createDto,
                 createdBy,
                 createdMembershipId: savedMembership?.id,
             });
-            throw new Error("Newly saved membership not found");
+            throw new Error("New invitation did not save correctly");
         }
         // try to email the invitation
         await this.emailClient.sendMail([unsavedInvitation.emailAddress], [], `Invitation to join ${retrievedMembership.organisation.name}`, createdBy.uuid, `You have been invited to join ${retrievedMembership.organisation.name} by ${createdBy.givenName || "another member"}. Please click the link below to accept the invitation.
 
-            ${this.configService.baseUrl}/accept-invitation/${retrievedMembership.invitation.uuid}`);
+            ${this.configService.baseUrl}/accept-invitation/${validInvitation.uuid}`);
         // if it gets to here we have a queued invitation
-        retrievedMembership.invitation.notificationSent = new Date();
-        return this.invitationRepository.save(retrievedMembership.invitation);
+        validInvitation.notificationSent = new Date();
+        const savedInvitation = await this.invitationRepository.save(validInvitation);
+        // we need to return the membership with the invitation
+        // torm doesn't like if we just assign and return so get it again
+        const fullInvitation = await this.invitationRepository.findOne({
+            where: {
+                id: savedInvitation.id,
+            },
+            relations: {
+                organisationMembership: {
+                    user: true,
+                    roles: true,
+                },
+            },
+        });
+        // eslint-disable-next-line @typescript-eslint/no-non-null-assertion
+        return fullInvitation;
     }
-    async canManageInvitationsForThisOrg(orgId, userId) {
+    async canManageInvitationsForThisOrg(parameters) {
+        const { orgId, orgUuid, user } = parameters;
+        if (orgId === undefined && orgUuid === undefined) {
+            throw new BadRequestException("Either orgId or orgUuid must be provided");
+        }
+        // super admin can do anything
+        if (user.permissions.includes("modify:all")) {
+            return;
+        }
         const requesterMembership = await this.orgMembershipRepository.findOneOrFail({
             where: {
                 organisation: {
                     id: orgId,
+                    uuid: orgUuid,
                 },
                 user: {
-                    id: userId,
+                    id: user.id,
                 },
             },
             relations: {
                 roles: true,
             },
         });
-        if (requesterMembership.roles.some((role) => role.name === Roles.owner)) {
-            throw new Error("You must be an admin to invite users to an organisation");
+        if (requesterMembership.roles?.some((role) => role.name === Roles.owner)) {
+            return;
         }
+        throw new ForbiddenException("You don't have permission to work with invitations");
     }
-    async remove(uuid, currentUserId) {
+    async remove(uuid, currentUser) {
         const invitation = await this.invitationRepository.findOneOrFail({
             where: {
                 uuid,
@@ -173,7 +204,10 @@ let InvitationService = InvitationService_1 = class InvitationService {
         if (!invitation) {
             throw new NotFoundException();
         }
-        await this.canManageInvitationsForThisOrg(invitation.organisationMembership.organisation.id, currentUserId);
+        await this.canManageInvitationsForThisOrg({
+            orgId: invitation.organisationMembership.organisation.id,
+            user: currentUser,
+        });
         return this.invitationRepository.remove(invitation);
     }
 };

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

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

package/dist/organisation/dto/create-organisation.dto.js

@@ -8,6 +8,8 @@ var __metadata = (this && this.__metadata) || function (k, v) {
     if (typeof Reflect === "object" && typeof Reflect.metadata === "function") return Reflect.metadata(k, v);
 };
 import { ApiProperty } from "@nestjs/swagger";
+import { Type } from "class-transformer";
+import { IsArray, IsDefined, IsString, MinLength, ValidateNested, } from "class-validator";
 import { User } from "../../user-internal/entities/user.entity.js";
 export class CreateOrganisationDto {
     members;
@@ -15,15 +17,22 @@ export class CreateOrganisationDto {
     name;
 }
 __decorate([
+    Type(() => User),
     ApiProperty({ type: User, isArray: true }),
+    ValidateNested({ each: true }),
+    IsArray(),
     __metadata("design:type", Array)
 ], CreateOrganisationDto.prototype, "members", void 0);
 __decorate([
+    Type(() => User),
+    IsDefined(),
     ApiProperty({ type: User }),
     __metadata("design:type", User)
 ], CreateOrganisationDto.prototype, "owner", void 0);
 __decorate([
     ApiProperty(),
+    IsString(),
+    MinLength(1),
     __metadata("design:type", String)
 ], CreateOrganisationDto.prototype, "name", void 0);
 //# sourceMappingURL=create-organisation.dto.js.map

package/dist/organisation/dto/create-organisation.dto.js.map

@@ -1 +1 @@
-{"version":3,"file":"create-organisation.dto.js","sourceRoot":"","sources":["../../../src/organisation/dto/create-organisation.dto.ts"],"names":[],"mappings":";;;;;;;;;AAAA,OAAO,EAAC,WAAW,EAAC,MAAM,iBAAiB,CAAC;AAC5C,OAAO,EAAC,IAAI,EAAC,MAAM,6CAA6C,CAAC;AAEjE,MAAM,OAAO,qBAAqB;IAE9B,OAAO,CAAU;IAGjB,KAAK,CAAQ;IAGb,IAAI,CAAU;CACjB;AARG;IAAC,WAAW,CAAC,EAAC,IAAI,EAAE,IAAI,EAAE,OAAO,EAAE,IAAI,EAAC,CAAC;;sDACxB;AAEjB;IAAC,WAAW,CAAC,EAAC,IAAI,EAAE,IAAI,EAAC,CAAC;8BAClB,IAAI;oDAAC;AAEb;IAAC,WAAW,EAAE;;mDACA"}
+{"version":3,"file":"create-organisation.dto.js","sourceRoot":"","sources":["../../../src/organisation/dto/create-organisation.dto.ts"],"names":[],"mappings":";;;;;;;;;AAAA,OAAO,EAAC,WAAW,EAAC,MAAM,iBAAiB,CAAC;AAC5C,OAAO,EAAC,IAAI,EAAC,MAAM,mBAAmB,CAAC;AACvC,OAAO,EACH,OAAO,EACP,SAAS,EACT,QAAQ,EACR,SAAS,EACT,cAAc,GACjB,MAAM,iBAAiB,CAAC;AACzB,OAAO,EAAC,IAAI,EAAC,MAAM,6CAA6C,CAAC;AAEjE,MAAM,OAAO,qBAAqB;IAK9B,OAAO,CAAU;IAKjB,KAAK,CAAQ;IAKb,IAAI,CAAU;CACjB;AAfG;IAAC,IAAI,CAAC,GAAG,EAAE,CAAC,IAAI,CAAC;IAChB,WAAW,CAAC,EAAC,IAAI,EAAE,IAAI,EAAE,OAAO,EAAE,IAAI,EAAC,CAAC;IACxC,cAAc,CAAC,EAAC,IAAI,EAAE,IAAI,EAAC,CAAC;IAC5B,OAAO,EAAE;;sDACO;AAEjB;IAAC,IAAI,CAAC,GAAG,EAAE,CAAC,IAAI,CAAC;IAChB,SAAS,EAAE;IACX,WAAW,CAAC,EAAC,IAAI,EAAE,IAAI,EAAC,CAAC;8BAClB,IAAI;oDAAC;AAEb;IAAC,WAAW,EAAE;IACb,QAAQ,EAAE;IACV,SAAS,CAAC,CAAC,CAAC;;mDACC"}

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

@@ -7,5 +7,4 @@ export declare class MembershipRole {
     name: string;
     createdDate: Date;
     updateDate: Date;
-    deletedDate: Date;
 }

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

@@ -7,9 +7,10 @@ var __decorate = (this && this.__decorate) || function (decorators, target, key,
 var __metadata = (this && this.__metadata) || function (k, v) {
     if (typeof Reflect === "object" && typeof Reflect.metadata === "function") return Reflect.metadata(k, v);
 };
-import { ApiProperty } from "@nestjs/swagger";
-import { Column, CreateDateColumn, DeleteDateColumn, Entity, ManyToOne, PrimaryGeneratedColumn, RelationId, UpdateDateColumn, } from "typeorm";
+import { ApiExtraModels, ApiProperty } from "@nestjs/swagger";
+import { Column, CreateDateColumn, Entity, ManyToOne, PrimaryGeneratedColumn, RelationId, UpdateDateColumn, } from "typeorm";
 import { OrganisationMembership } from "../../organisation-memberships/entities/organisation-membership.entity.js";
+import { Roles } from "../dto/RolesEnum.js";
 let MembershipRole = class MembershipRole {
     id;
     // we don't expose this because the roles are exposed on the membership
@@ -18,7 +19,6 @@ let MembershipRole = class MembershipRole {
     name;
     createdDate;
     updateDate;
-    deletedDate;
 };
 __decorate([
     PrimaryGeneratedColumn(),
@@ -38,6 +38,7 @@ __decorate([
 __decorate([
     ApiProperty(),
     Column(),
+    ApiExtraModels(() => Roles),
     __metadata("design:type", String)
 ], MembershipRole.prototype, "name", void 0);
 __decorate([
@@ -50,11 +51,6 @@ __decorate([
     ApiProperty(),
     __metadata("design:type", Date)
 ], MembershipRole.prototype, "updateDate", void 0);
-__decorate([
-    DeleteDateColumn(),
-    ApiProperty(),
-    __metadata("design:type", Date)
-], MembershipRole.prototype, "deletedDate", void 0);
 MembershipRole = __decorate([
     Entity()
 ], MembershipRole);

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

@@ -1 +1 @@
-{"version":3,"file":"member-role.entity.js","sourceRoot":"","sources":["../../../src/organisation/entities/member-role.entity.ts"],"names":[],"mappings":";;;;;;;;;AAAA,OAAO,EAAC,WAAW,EAAC,MAAM,iBAAiB,CAAC;AAE5C,OAAO,EACH,MAAM,EACN,gBAAgB,EAChB,gBAAgB,EAChB,MAAM,EACN,SAAS,EACT,sBAAsB,EAEtB,UAAU,EACV,gBAAgB,GACnB,MAAM,SAAS,CAAC;AACjB,OAAO,EAAC,sBAAsB,EAAC,MAAM,2EAA2E,CAAC;AAG1G,IAAM,cAAc,GAApB,MAAM,cAAc;IAGvB,EAAE,CAAU;IAEZ,uEAAuE;IAEvE,UAAU,CAAoC;IAKvC,YAAY,CAAU;IAI7B,IAAI,CAAU;IAId,WAAW,CAAQ;IAInB,UAAU,CAAQ;IAIlB,WAAW,CAAQ;CACtB,CAAA;AA5BG;IAAC,sBAAsB,EAAE;IACxB,WAAW,EAAE;;0CACF;AAGZ;IAAC,SAAS,CAAC,GAAG,EAAE,CAAC,sBAAsB,EAAE,CAAC,UAAU,EAAE,EAAE,CAAC,UAAU,CAAC,KAAK,CAAC;;kDAC5B;AAE9C;IAAC,WAAW,EAAE;IACb,MAAM,EAAE;IACR,UAAU,CAAC,CAAC,EAAkB,EAAE,EAAE,CAAC,EAAE,CAAC,UAAU,CAAC;;oDACrB;AAE7B;IAAC,WAAW,EAAE;IACb,MAAM,EAAE;;4CACK;AAEd;IAAC,gBAAgB,EAAE;IAClB,WAAW,EAAE;8BACA,IAAI;mDAAC;AAEnB;IAAC,gBAAgB,EAAE;IAClB,WAAW,EAAE;8BACD,IAAI;kDAAC;AAElB;IAAC,gBAAgB,EAAE;IAClB,WAAW,EAAE;8BACA,IAAI;mDAAC;AA5BV,cAAc;IAD1B,MAAM,EAAE;GACI,cAAc,CA6B1B;SA7BY,cAAc"}
+{"version":3,"file":"member-role.entity.js","sourceRoot":"","sources":["../../../src/organisation/entities/member-role.entity.ts"],"names":[],"mappings":";;;;;;;;;AAAA,OAAO,EAAC,cAAc,EAAE,WAAW,EAAC,MAAM,iBAAiB,CAAC;AAE5D,OAAO,EACH,MAAM,EACN,gBAAgB,EAChB,MAAM,EACN,SAAS,EACT,sBAAsB,EAEtB,UAAU,EACV,gBAAgB,GACnB,MAAM,SAAS,CAAC;AACjB,OAAO,EAAC,sBAAsB,EAAC,MAAM,2EAA2E,CAAC;AACjH,OAAO,EAAC,KAAK,EAAC,MAAM,qBAAqB,CAAC;AAGnC,IAAM,cAAc,GAApB,MAAM,cAAc;IAGvB,EAAE,CAAU;IAEZ,uEAAuE;IAEvE,UAAU,CAAoC;IAKvC,YAAY,CAAU;IAK7B,IAAI,CAAU;IAId,WAAW,CAAQ;IAInB,UAAU,CAAQ;CACrB,CAAA;AAzBG;IAAC,sBAAsB,EAAE;IACxB,WAAW,EAAE;;0CACF;AAGZ;IAAC,SAAS,CAAC,GAAG,EAAE,CAAC,sBAAsB,EAAE,CAAC,UAAU,EAAE,EAAE,CAAC,UAAU,CAAC,KAAK,CAAC;;kDAC5B;AAE9C;IAAC,WAAW,EAAE;IACb,MAAM,EAAE;IACR,UAAU,CAAC,CAAC,EAAkB,EAAE,EAAE,CAAC,EAAE,CAAC,UAAU,CAAC;;oDACrB;AAE7B;IAAC,WAAW,EAAE;IACb,MAAM,EAAE;IACR,cAAc,CAAC,GAAG,EAAE,CAAC,KAAK,CAAC;;4CACd;AAEd;IAAC,gBAAgB,EAAE;IAClB,WAAW,EAAE;8BACA,IAAI;mDAAC;AAEnB;IAAC,gBAAgB,EAAE;IAClB,WAAW,EAAE;8BACD,IAAI;kDAAC;AAzBT,cAAc;IAD1B,MAAM,EAAE;GACI,cAAc,CA0B1B;SA1BY,cAAc"}

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

@@ -3,11 +3,10 @@ import { OrganisationSubscriptionRecord } from "../../organisation-subscriptions
 export declare class Organisation {
     id: number;
     uuid: string;
-    memberships: OrganisationMembership[];
-    subscriptionRecords: OrganisationSubscriptionRecord[];
+    memberships?: OrganisationMembership[];
+    subscriptionRecords?: OrganisationSubscriptionRecord[];
     name: string;
     createdDate: Date;
     updateDate: Date;
     deletedDate: Date;
-    nullChecks(): Promise<void>;
 }

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

@@ -9,7 +9,7 @@ var __metadata = (this && this.__metadata) || function (k, v) {
 };
 import { ApiProperty } from "@nestjs/swagger";
 import { Type } from "class-transformer";
-import { AfterInsert, AfterLoad, AfterUpdate, Column, CreateDateColumn, DeleteDateColumn, Entity, Generated, Index, OneToMany, PrimaryGeneratedColumn, UpdateDateColumn, } from "typeorm";
+import { Column, CreateDateColumn, DeleteDateColumn, Entity, Generated, Index, OneToMany, PrimaryGeneratedColumn, UpdateDateColumn, } from "typeorm";
 import { OrganisationMembership } from "../../organisation-memberships/entities/organisation-membership.entity.js";
 import { OrganisationSubscriptionRecord } from "../../organisation-subscriptions/entities/organisation-subscription.entity.js";
 let Organisation = class Organisation {
@@ -21,12 +21,6 @@ let Organisation = class Organisation {
     createdDate;
     updateDate;
     deletedDate;
-    // eslint-disable-next-line @typescript-eslint/require-await
-    async nullChecks() {
-        if (!this.memberships) {
-            this.memberships = [];
-        }
-    }
 };
 __decorate([
     PrimaryGeneratedColumn(),
@@ -77,14 +71,6 @@ __decorate([
     ApiProperty(),
     __metadata("design:type", Date)
 ], Organisation.prototype, "deletedDate", void 0);
-__decorate([
-    AfterLoad(),
-    AfterInsert(),
-    AfterUpdate(),
-    __metadata("design:type", Function),
-    __metadata("design:paramtypes", []),
-    __metadata("design:returntype", Promise)
-], Organisation.prototype, "nullChecks", null);
 Organisation = __decorate([
     Entity()
 ], Organisation);

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,OAAO,EAAC,WAAW,EAAC,MAAM,iBAAiB,CAAC;AAC5C,OAAO,EAAC,IAAI,EAAC,MAAM,mBAAmB,CAAC;AAEvC,OAAO,EACH,WAAW,EACX,SAAS,EACT,WAAW,EACX,MAAM,EACN,gBAAgB,EAChB,gBAAgB,EAChB,MAAM,EACN,SAAS,EACT,KAAK,EACL,SAAS,EACT,sBAAsB,EACtB,gBAAgB,GACnB,MAAM,SAAS,CAAC;AACjB,OAAO,EAAC,sBAAsB,EAAC,MAAM,2EAA2E,CAAC;AACjH,OAAO,EAAC,8BAA8B,EAAC,MAAM,+EAA+E,CAAC;AAGtH,IAAM,YAAY,GAAlB,MAAM,YAAY;IAGrB,EAAE,CAAU;IASL,IAAI,CAAU;IAMrB,WAAW,CAA4B;IAUvC,mBAAmB,CAAoC;IAIvD,IAAI,CAAU;IAId,WAAW,CAAQ;IAInB,UAAU,CAAQ;IAIlB,WAAW,CAAQ;IAEnB,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;AAtDG;IAAC,sBAAsB,EAAE;IACxB,WAAW,EAAE;;wCACF;AAEZ;IAAC,MAAM,CAAC,MAAM,EAAE;QACZ,IAAI,EAAE,MAAM;QACZ,OAAO,EAAE,GAAG,EAAE,CAAC,oBAAoB;KACtC,CAAC;IACD,SAAS,CAAC,MAAM,CAAC;IACjB,WAAW,EAAE;IACb,KAAK,EAAE;;0CACa;AAErB;IAAC,SAAS,CAAC,GAAG,EAAE,CAAC,sBAAsB,EAAE,CAAC,EAAE,EAAE,EAAE,CAAC,EAAE,CAAC,YAAY,EAAE;QAC9D,OAAO,EAAE,CAAC,QAAQ,EAAE,QAAQ,CAAC;KAChC,CAAC;IACD,IAAI,CAAC,GAAG,EAAE,CAAC,sBAAsB,CAAC;;iDACI;AAEvC;IAAC,SAAS,CACN,GAAG,EAAE,CAAC,8BAA8B,EACpC,CAAC,GAAG,EAAE,EAAE,CAAC,GAAG,CAAC,YAAY,EACzB;QACI,OAAO,EAAE,CAAC,QAAQ,EAAE,QAAQ,CAAC;KAChC,CACJ;IACA,IAAI,CAAC,GAAG,EAAE,CAAC,8BAA8B,CAAC;;yDACY;AAEvD;IAAC,MAAM,EAAE;IACR,WAAW,EAAE;;0CACA;AAEd;IAAC,gBAAgB,EAAE;IAClB,WAAW,EAAE;8BACA,IAAI;iDAAC;AAEnB;IAAC,gBAAgB,EAAE;IAClB,WAAW,EAAE;8BACD,IAAI;gDAAC;AAElB;IAAC,gBAAgB,EAAE;IAClB,WAAW,EAAE;8BACA,IAAI;iDAAC;AAMb;IAHL,SAAS,EAAE;IACX,WAAW,EAAE;IACb,WAAW,EAAE;;;;8CAKb;AAtDQ,YAAY;IADxB,MAAM,EAAE;GACI,YAAY,CAuDxB;SAvDY,YAAY"}
+{"version":3,"file":"organisation.entity.js","sourceRoot":"","sources":["../../../src/organisation/entities/organisation.entity.ts"],"names":[],"mappings":";;;;;;;;;AAAA,OAAO,EAAC,WAAW,EAAC,MAAM,iBAAiB,CAAC;AAC5C,OAAO,EAAC,IAAI,EAAC,MAAM,mBAAmB,CAAC;AAEvC,OAAO,EACH,MAAM,EACN,gBAAgB,EAChB,gBAAgB,EAChB,MAAM,EACN,SAAS,EACT,KAAK,EACL,SAAS,EACT,sBAAsB,EACtB,gBAAgB,GACnB,MAAM,SAAS,CAAC;AACjB,OAAO,EAAC,sBAAsB,EAAC,MAAM,2EAA2E,CAAC;AACjH,OAAO,EAAC,8BAA8B,EAAC,MAAM,+EAA+E,CAAC;AAGtH,IAAM,YAAY,GAAlB,MAAM,YAAY;IAGrB,EAAE,CAAU;IASL,IAAI,CAAU;IAMrB,WAAW,CAA4B;IAUvC,mBAAmB,CAAoC;IAIvD,IAAI,CAAU;IAId,WAAW,CAAQ;IAInB,UAAU,CAAQ;IAIlB,WAAW,CAAQ;CACtB,CAAA;AA5CG;IAAC,sBAAsB,EAAE;IACxB,WAAW,EAAE;;wCACF;AAEZ;IAAC,MAAM,CAAC,MAAM,EAAE;QACZ,IAAI,EAAE,MAAM;QACZ,OAAO,EAAE,GAAG,EAAE,CAAC,oBAAoB;KACtC,CAAC;IACD,SAAS,CAAC,MAAM,CAAC;IACjB,WAAW,EAAE;IACb,KAAK,EAAE;;0CACa;AAErB;IAAC,SAAS,CAAC,GAAG,EAAE,CAAC,sBAAsB,EAAE,CAAC,EAAE,EAAE,EAAE,CAAC,EAAE,CAAC,YAAY,EAAE;QAC9D,OAAO,EAAE,CAAC,QAAQ,EAAE,QAAQ,CAAC;KAChC,CAAC;IACD,IAAI,CAAC,GAAG,EAAE,CAAC,sBAAsB,CAAC;;iDACI;AAEvC;IAAC,SAAS,CACN,GAAG,EAAE,CAAC,8BAA8B,EACpC,CAAC,GAAG,EAAE,EAAE,CAAC,GAAG,CAAC,YAAY,EACzB;QACI,OAAO,EAAE,CAAC,QAAQ,EAAE,QAAQ,CAAC;KAChC,CACJ;IACA,IAAI,CAAC,GAAG,EAAE,CAAC,8BAA8B,CAAC;;yDACY;AAEvD;IAAC,MAAM,EAAE;IACR,WAAW,EAAE;;0CACA;AAEd;IAAC,gBAAgB,EAAE;IAClB,WAAW,EAAE;8BACA,IAAI;iDAAC;AAEnB;IAAC,gBAAgB,EAAE;IAClB,WAAW,EAAE;8BACD,IAAI;gDAAC;AAElB;IAAC,gBAAgB,EAAE;IAClB,WAAW,EAAE;8BACA,IAAI;iDAAC;AA5CV,YAAY;IADxB,MAAM,EAAE;GACI,YAAY,CA6CxB;SA7CY,YAAY"}

package/dist/organisation/organisation.service.js

@@ -33,6 +33,8 @@ let OrganisationService = class OrganisationService {
         ownerMembership.user = createOrganisationDto.owner;
         const ownerRole = new MembershipRole();
         ownerRole.name = Roles.owner;
+        if (!ownerMembership.roles)
+            ownerMembership.roles = [];
         ownerMembership.roles.push(ownerRole);
         unsavedOrganisation.memberships.push(ownerMembership);
         // add all the others
@@ -41,6 +43,8 @@ let OrganisationService = class OrganisationService {
             membership.user = member;
             const memberRole = new MembershipRole();
             memberRole.name = Roles.member;
+            if (!membership.roles)
+                membership.roles = [];
             membership.roles.push(memberRole);
             return membership;
         });

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

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

package/dist/organisation-memberships/dtos/create-membership-dto.js

@@ -8,16 +8,19 @@ var __metadata = (this && this.__metadata) || function (k, v) {
     if (typeof Reflect === "object" && typeof Reflect.metadata === "function") return Reflect.metadata(k, v);
 };
 import { ApiProperty } from "@nestjs/swagger";
+import { IsArray, IsInt } from "class-validator";
 export class CreateUpdateMembershipDto {
     userId;
     roles;
 }
 __decorate([
     ApiProperty(),
+    IsInt(),
     __metadata("design:type", Number)
 ], CreateUpdateMembershipDto.prototype, "userId", void 0);
 __decorate([
     ApiProperty({ type: String, isArray: true }),
+    IsArray(),
     __metadata("design:type", Array)
 ], CreateUpdateMembershipDto.prototype, "roles", void 0);
 //# sourceMappingURL=create-membership-dto.js.map

package/dist/organisation-memberships/dtos/create-membership-dto.js.map

@@ -1 +1 @@
-{"version":3,"file":"create-membership-dto.js","sourceRoot":"","sources":["../../../src/organisation-memberships/dtos/create-membership-dto.ts"],"names":[],"mappings":";;;;;;;;;AAAA,OAAO,EAAC,WAAW,EAAC,MAAM,iBAAiB,CAAC;AAE5C,MAAM,OAAO,yBAAyB;IAElC,MAAM,CAAU;IAGhB,KAAK,CAAY;CACpB;AALG;IAAC,WAAW,EAAE;;yDACE;AAEhB;IAAC,WAAW,CAAC,EAAC,IAAI,EAAE,MAAM,EAAE,OAAO,EAAE,IAAI,EAAC,CAAC;;wDAC1B"}
+{"version":3,"file":"create-membership-dto.js","sourceRoot":"","sources":["../../../src/organisation-memberships/dtos/create-membership-dto.ts"],"names":[],"mappings":";;;;;;;;;AAAA,OAAO,EAAC,WAAW,EAAC,MAAM,iBAAiB,CAAC;AAC5C,OAAO,EAAC,OAAO,EAAE,KAAK,EAAC,MAAM,iBAAiB,CAAC;AAE/C,MAAM,OAAO,yBAAyB;IAGlC,MAAM,CAAU;IAIhB,KAAK,CAAY;CACpB;AAPG;IAAC,WAAW,EAAE;IACb,KAAK,EAAE;;yDACQ;AAEhB;IAAC,WAAW,CAAC,EAAC,IAAI,EAAE,MAAM,EAAE,OAAO,EAAE,IAAI,EAAC,CAAC;IAC1C,OAAO,EAAE;;wDACO"}

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

@@ -1,3 +1,4 @@
+import { Relation } from "typeorm";
 import { Invitation } from "../../invitations/entities/invitation.entity.js";
 import { MembershipRole } from "../../organisation/entities/member-role.entity.js";
 import { Organisation } from "../../organisation/entities/organisation.entity.js";
@@ -9,11 +10,9 @@ export declare class OrganisationMembership {
     userId: number;
     organisation: Organisation;
     organisationId: number;
-    invitation?: Invitation;
-    invitationId: number;
-    roles: MembershipRole[];
+    invitations?: Relation<Invitation>[];
+    roles?: MembershipRole[];
     createdDate: Date;
     updateDate: Date;
     deletedDate: Date;
-    nullChecks(): Promise<void>;
 }

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

@@ -7,9 +7,9 @@ var __decorate = (this && this.__decorate) || function (decorators, target, key,
 var __metadata = (this && this.__metadata) || function (k, v) {
     if (typeof Reflect === "object" && typeof Reflect.metadata === "function") return Reflect.metadata(k, v);
 };
-import { ApiProperty } from "@nestjs/swagger";
+import { ApiProperty, ApiPropertyOptional } from "@nestjs/swagger";
 import { Type } from "class-transformer";
-import { AfterInsert, AfterLoad, AfterUpdate, Column, CreateDateColumn, DeleteDateColumn, Entity, Generated, Index, JoinColumn, ManyToOne, OneToMany, OneToOne, PrimaryGeneratedColumn, RelationId, UpdateDateColumn, } from "typeorm";
+import { Column, CreateDateColumn, DeleteDateColumn, Entity, Generated, Index, JoinColumn, ManyToOne, OneToMany, PrimaryGeneratedColumn, RelationId, UpdateDateColumn, } from "typeorm";
 import { Invitation } from "../../invitations/entities/invitation.entity.js";
 import { MembershipRole } from "../../organisation/entities/member-role.entity.js";
 import { Organisation } from "../../organisation/entities/organisation.entity.js";
@@ -21,18 +21,11 @@ let OrganisationMembership = class OrganisationMembership {
     userId;
     organisation;
     organisationId;
-    invitation;
-    invitationId;
+    invitations;
     roles;
     createdDate;
     updateDate;
     deletedDate;
-    // eslint-disable-next-line @typescript-eslint/require-await
-    async nullChecks() {
-        if (!this.roles) {
-            this.roles = [];
-        }
-    }
 };
 __decorate([
     PrimaryGeneratedColumn(),
@@ -76,27 +69,22 @@ __decorate([
     __metadata("design:type", Number)
 ], OrganisationMembership.prototype, "organisationId", void 0);
 __decorate([
-    OneToOne(() => Invitation, (inv) => inv.organisationMembership, {
+    OneToMany(() => Invitation, (inv) => inv.organisationMembership, {
         eager: true,
         nullable: true,
         cascade: ["insert", "update"],
     }),
     JoinColumn(),
-    __metadata("design:type", Invitation)
-], OrganisationMembership.prototype, "invitation", void 0);
-__decorate([
-    Column(),
-    ApiProperty(),
-    RelationId((membership) => membership.invitation),
-    __metadata("design:type", Number)
-], OrganisationMembership.prototype, "invitationId", void 0);
+    __metadata("design:type", Array)
+], OrganisationMembership.prototype, "invitations", void 0);
 __decorate([
-    ApiProperty({ type: () => MembershipRole, isArray: true })
+    ApiPropertyOptional({ type: () => MembershipRole, isArray: true })
     // eslint-disable-next-line @typescript-eslint/no-unsafe-return
     ,
     OneToMany(() => MembershipRole, (role) => role.membership, {
         eager: true,
-        cascade: true,
+        cascade: ["insert", "update"],
+        orphanedRowAction: "delete",
     }),
     Type(() => MembershipRole),
     __metadata("design:type", Array)
@@ -116,14 +104,6 @@ __decorate([
     ApiProperty(),
     __metadata("design:type", Date)
 ], OrganisationMembership.prototype, "deletedDate", void 0);
-__decorate([
-    AfterLoad(),
-    AfterInsert(),
-    AfterUpdate(),
-    __metadata("design:type", Function),
-    __metadata("design:paramtypes", []),
-    __metadata("design:returntype", Promise)
-], OrganisationMembership.prototype, "nullChecks", null);
 OrganisationMembership = __decorate([
     Entity()
 ], OrganisationMembership);

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

@@ -1 +1 @@
-{"version":3,"file":"organisation-membership.entity.js","sourceRoot":"","sources":["../../../src/organisation-memberships/entities/organisation-membership.entity.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"organisation-membership.entity.js","sourceRoot":"","sources":["../../../src/organisation-memberships/entities/organisation-membership.entity.ts"],"names":[],"mappings":"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"}

package/dist/organisation-memberships/organisation-memberships.service.js

@@ -63,19 +63,19 @@ let OrganisationMembershipsService = class OrganisationMembershipsService {
         // check if the user is allowed to work with memberships
         this.currentUserIsOwnerGuard(org, currentUserId);
         // existing membership for this user?
-        const existingMembership = org.memberships.find((m) => m.user.id === createOmDto.userId);
+        const existingMembership = org.memberships?.find((m) => m.user.id === createOmDto.userId);
         if (existingMembership) {
             // add all roles to the existing membership
             for (const role of createOmDto.roles) {
-                const existingRole = existingMembership.roles.find((r) => r.name === role);
+                const existingRole = existingMembership.roles?.find((r) => r.name === role);
                 if (!existingRole) {
                     const newRole = new MembershipRole();
                     newRole.name = role;
-                    existingMembership.roles.push(newRole);
+                    existingMembership.roles?.push(newRole);
                 }
             }
             // remove all roles that are not in the DTO
-            existingMembership.roles = existingMembership.roles.filter((r) => createOmDto.roles.includes(r.name));
+            existingMembership.roles = existingMembership.roles?.filter((r) => createOmDto.roles.includes(r.name));
         }
         else {
             // create a new membership
@@ -84,15 +84,15 @@ let OrganisationMembershipsService = class OrganisationMembershipsService {
             for (const role of createOmDto.roles) {
                 const newRole = new MembershipRole();
                 newRole.name = role;
-                newMembership.roles.push(newRole);
+                newMembership.roles?.push(newRole);
             }
-            org.memberships.push(newMembership);
+            org.memberships?.push(newMembership);
         }
         return await this.orgRepo.save(org);
     }
     currentUserIsOwnerGuard(org, currentUserId) {
-        const membership = org.memberships.find((m) => m.user.id === currentUserId &&
-            m.roles.some((r) => r.name === Roles.owner));
+        const membership = org.memberships?.find((m) => m.user.id === currentUserId &&
+            m.roles?.some((r) => r.name === Roles.owner));
         if (!membership) {
             throw new NotFoundException("You are not allowed to add a member to this organisation");
         }
@@ -115,7 +115,7 @@ let OrganisationMembershipsService = class OrganisationMembershipsService {
         // check if the user is allowed to work with memberships
         this.currentUserIsOwnerGuard(org, currentUserId);
         // remove the membership
-        const membership = org.memberships.find((m) => m.uuid === membershipUuid);
+        const membership = org.memberships?.find((m) => m.uuid === membershipUuid);
         if (!membership) {
             throw new Error("Membership not found");
         }