fix: working

src/authorization/services/UserValidation.service.ts

@@ -51,7 +51,14 @@ export class UserValidationService {
         user: User,
         authProviderPermissions: string[] | undefined
     ): RequestUser {
-        console.debug({list: this.config.superUserIds}, "super user ids");
+        console.debug(
+            {
+                list: this.config.superUserIds,
+                userId: user.uuid,
+                userMail: user.email,
+            },
+            "super user ids"
+        );
         if (!user?.id) {
             throw new Error(
                 "Unable to authenticate and register a valid user with this auth0 user"

src/invitations/invitation.service.ts

@@ -280,6 +280,6 @@ export class InvitationService {
             orgId: invitation.organisationMembership.organisation.id,
             user: currentUser,
         });
-        return this.invitationRepository.remove(invitation);
+        return this.invitationRepository.softRemove(invitation);
     }
 }

src/organisation-memberships/entities/organisation-membership.entity.ts

@@ -4,7 +4,6 @@ import {Type} from "class-transformer";
 import {
     Column,
     CreateDateColumn,
-    DeleteDateColumn,
     Entity,
     Generated,
     Index,
@@ -73,6 +72,7 @@ export class OrganisationMembership {
     @OneToMany(() => MembershipRole, (role) => role.membership, {
         eager: true,
         cascade: ["insert", "update"],
+        onDelete: "CASCADE",
         orphanedRowAction: "delete",
     })
     @Type(() => MembershipRole)
@@ -85,8 +85,4 @@ export class OrganisationMembership {
     @UpdateDateColumn()
     @ApiProperty()
     updateDate!: Date;
-
-    @DeleteDateColumn()
-    @ApiPropertyOptional()
-    deletedDate?: Date;
 }

src/organisation-memberships/organisation-memberships.controller.ts

@@ -54,17 +54,7 @@ export class OrganisationMembershipsController {
         @Param("membershipUuid") membershipUuid: string,
         @Request() request: RequestWithUser
     ): Promise<BooleanResult> {
-        const deleteResult = await this.omService.remove(
-            orgUuid,
-            membershipUuid,
-            request.user.id
-        );
-        return {
-            result:
-                deleteResult !== undefined &&
-                deleteResult.affected !== undefined &&
-                deleteResult?.affected !== null &&
-                deleteResult?.affected > 0,
-        };
+        await this.omService.remove(orgUuid, membershipUuid, request.user.id);
+        return {result: true};
     }
 }

src/organisation-memberships/organisation-memberships.module.ts

@@ -5,13 +5,15 @@ import {OrganisationMembershipsController} from "./organisation-memberships.cont
 import {OrganisationMembershipsService} from "./organisation-memberships.service.js";
 import {Organisation} from "../organisation/entities/organisation.entity.js";
 import {MembershipRole} from "../organisation/entities/member-role.entity.js";
+import {Invitation} from "../invitations/entities/invitation.entity.js";
 
 @Module({
     imports: [
         TypeOrmModule.forFeature([
             Organisation,
             OrganisationMembership,
             MembershipRole,
+            Invitation,
         ]),
     ],
     controllers: [OrganisationMembershipsController],

src/organisation-memberships/organisation-memberships.service.ts

@@ -1,6 +1,7 @@
 import {Injectable, NotFoundException} from "@nestjs/common";
 import {InjectRepository} from "@nestjs/typeorm";
-import {DeleteResult, Repository} from "typeorm";
+import {Repository} from "typeorm";
+import {Invitation} from "../invitations/entities/invitation.entity.js";
 import {Roles} from "../organisation/dto/RolesEnum.js";
 import {MembershipRole} from "../organisation/entities/member-role.entity.js";
 import {Organisation} from "../organisation/entities/organisation.entity.js";
@@ -13,7 +14,9 @@ export class OrganisationMembershipsService {
         @InjectRepository(Organisation)
         private orgRepo: Repository<Organisation>,
         @InjectRepository(OrganisationMembership)
-        private membershipRepo: Repository<OrganisationMembership>
+        private membershipRepo: Repository<OrganisationMembership>,
+        @InjectRepository(Invitation)
+        private invitationRepo: Repository<Invitation>
     ) {}
     private notFoundMessage =
         "Organisation not found or you are not owner of it";
@@ -39,7 +42,7 @@ export class OrganisationMembershipsService {
         if (!isAMember) {
             throw new Error("You are not a member of this organisation");
         }
-        console.log("memberships", memberships);
+
         return memberships;
     }
     async createOrUpdate(
@@ -116,7 +119,7 @@ export class OrganisationMembershipsService {
         orgUuid: string,
         membershipUuid: string,
         currentUserId: number
-    ): Promise<DeleteResult> {
+    ): Promise<void> {
         // find the org
         const org = await this.orgRepo.findOne({
             where: {
@@ -141,6 +144,10 @@ export class OrganisationMembershipsService {
         if (!membership) {
             throw new Error("Membership not found");
         }
-        return await this.membershipRepo.delete(membership.id);
+        if (membership.invitations) {
+            await this.invitationRepo.softRemove(membership.invitations);
+        }
+
+        await this.membershipRepo.remove(membership);
     }
 }

src/organisation-subscriptions/organisation-subscriptions.service.ts

@@ -211,14 +211,14 @@ export class OrganisationSubscriptionService {
         if (!result) {
             throw new NotFoundException("Subscription not found");
         }
+
+        await this.orgSubRepository.softRemove(result);
         await this.queue.add({
             organisationUuid: result.organisation.uuid,
             subscriptionUuid: result.uuid,
             productKey: result.internalSku,
             active: false,
         });
-
-        await this.orgSubRepository.delete(result);
         return true;
     }
 }

src/organisation/organisation.controller.ts

@@ -61,16 +61,7 @@ export class OrganisationController {
         @Param("uuid") uuid: string,
         @Request() request: RequestWithUser
     ): Promise<BooleanResult> {
-        const deleteResult = await this.organisationService.remove(
-            uuid,
-            request.user.id
-        );
-        return {
-            result:
-                deleteResult !== undefined &&
-                deleteResult.affected !== undefined &&
-                deleteResult?.affected !== null &&
-                deleteResult?.affected > 0,
-        };
+        await this.organisationService.remove(uuid, request.user.id);
+        return {result: true};
     }
 }

src/organisation/organisation.service.ts

@@ -1,6 +1,6 @@
 import {Injectable, NotFoundException} from "@nestjs/common";
 import {InjectRepository} from "@nestjs/typeorm";
-import {DeleteResult, Repository, UpdateResult} from "typeorm";
+import {Repository, UpdateResult} from "typeorm";
 import {OrganisationMembership} from "../organisation-memberships/entities/organisation-membership.entity.js";
 import {CreateOrganisationDto} from "./dto/create-organisation.dto.js";
 import {Roles} from "./dto/RolesEnum.js";
@@ -105,8 +105,8 @@ export class OrganisationService {
         return this.repository.update(ownerOfOrg.id, ownerOfOrg);
     }
 
-    async remove(uuid: string, currentUserId: number): Promise<DeleteResult> {
-        const ownerOfOrg = await this.repository.findOneOrFail({
+    async remove(uuid: string, currentUserId: number): Promise<void> {
+        const ownedOrg = await this.repository.findOneOrFail({
             where: {
                 uuid,
                 memberships: {
@@ -120,8 +120,6 @@ export class OrganisationService {
             },
         });
 
-        return this.repository.delete({
-            id: ownerOfOrg.id,
-        });
+        await this.repository.softRemove(ownedOrg);
     }
 }

src/payment-sessions/payment-session.entity.ts

@@ -27,11 +27,14 @@ export class PaymentSessionReference {
     @ApiProperty()
     createdDate!: Date;
 
+    // note that this is not a database relation
     @Column({nullable: true})
     organisationUuid?: string;
 
     // This is nullable because it we have a sample "not authenticated" controller
+    // in this set of modules.
     // but you most likely want to make this non-nullable
+    // also note this is not a relation, it's just a string
     @Column({nullable: true})
     userUuid?: string;
 }

src/user-api-key/user-apikey.service.ts

@@ -78,8 +78,8 @@ export class UserApiKeyService {
         if (!userApiKey) {
             throw new NotFoundException();
         }
-
-        const result = await this.repository.remove(userApiKey);
-        return result.deletedDate !== undefined;
+        // note, no soft delete here. Once a key is gone it should be gone
+        await this.repository.remove(userApiKey);
+        return true;
     }
 }

src/user-api-key/userApiKey.entity.ts

@@ -1,8 +1,7 @@
-import {ApiProperty, ApiPropertyOptional} from "@nestjs/swagger";
+import {ApiProperty} from "@nestjs/swagger";
 import {
     Column,
     CreateDateColumn,
-    DeleteDateColumn,
     Entity,
     Generated,
     Index,
@@ -49,8 +48,4 @@ export class UserApiKey {
     @UpdateDateColumn()
     @ApiProperty()
     updateDate!: Date;
-
-    @DeleteDateColumn()
-    @ApiPropertyOptional()
-    deletedDate?: Date;
 }

src/user/dto/userResponseDto.ts

@@ -44,6 +44,9 @@ export class UserDto {
     @ApiProperty({type: () => OrganisationMembership, isArray: true})
     memberships!: OrganisationMembership[];
 
+    @ApiProperty({type: String, isArray: true})
+    activeSubscriptionProductKeys!: string[];
+
     @ApiProperty()
     createdDate!: Date;
 

src/user/user.controller.ts

@@ -59,8 +59,15 @@ export class UserController {
             uuid,
             request.user
         );
+        const activePaidForProducts = new Set<string>(
+            result.memberships
+                ?.flatMap((m) => m.organisation.subscriptionRecords || [])
+                ?.filter((s) => s && s.validUntil > new Date())
+                ?.map((s) => s?.internalSku) || []
+        );
         return {
             ...result,
+            activeSubscriptionProductKeys: [...activePaidForProducts],
             memberships: request.user.memberships ?? [],
         };
     }
@@ -78,6 +85,9 @@ export class UserController {
 
     @Patch(":uuid")
     @ApiOkResponse({type: BooleanResult})
+    @ApiOperation({
+        description: "Limited to Super Admin role or the user themselves.",
+    })
     async update(
         @Param("uuid") uuid: string,
         @Body() updateUserDto: UpdateUserDto,
@@ -92,6 +102,9 @@ export class UserController {
     }
 
     @Delete(":uuid")
+    @ApiOperation({
+        description: "Limited to Super Admin role or the user themselves.",
+    })
     @ApiOkResponse({type: BooleanResult})
     async remove(
         @Param("uuid") uuid: string,

src/user/user.service.ts

@@ -130,12 +130,12 @@ export class UserService {
                 )
             ) {
                 throw new Error(
-                    "Can't remove the owner of an organisation. Un-assign a new owner first."
+                    "Can't remove the owner of an organisation. Assign a new owner first."
                 );
             }
         }
 
-        return this.repository.remove(user);
+        return this.repository.softRemove(user);
     }
 
     private isCurrentUserGuard(