diff --git a/src/modules/payments/entities/payment.entity.ts b/src/modules/payments/entities/payment.entity.ts index 2a3dd58..f98b494 100755 --- a/src/modules/payments/entities/payment.entity.ts +++ b/src/modules/payments/entities/payment.entity.ts @@ -22,7 +22,7 @@ export class Payment extends BaseEntity { @Column({ type: "enum", enum: PaymentStatus, default: PaymentStatus.PENDING }) status: PaymentStatus; - @ManyToOne(() => User, (user) => user.payments, { nullable: false, onDelete: "SET NULL" }) + @ManyToOne(() => User, (user) => user.payments, { nullable: false, onDelete: "CASCADE" }) user: User; @ManyToOne(() => PaymentGateway, { nullable: false, onDelete: "RESTRICT" }) diff --git a/src/modules/users/repositories/users.repository.ts b/src/modules/users/repositories/users.repository.ts index b252eeb..6c0e321 100755 --- a/src/modules/users/repositories/users.repository.ts +++ b/src/modules/users/repositories/users.repository.ts @@ -91,8 +91,10 @@ export class UserRepository extends Repository { const queryBuilder = this.createQueryBuilder("user") .leftJoin("user.roles", "role") .where("role.name = :roleName", { roleName: RoleEnum.USER }) - .leftJoin("user.groups", "groups") - .addSelect(["groups.id", "groups.name"]) + .leftJoin("user.legalUser", "legalUser") + .addSelect(["legalUser.id", "legalUser.registrationName"]) + .leftJoin("user.realUser", "realUser") + .addSelect(["realUser.id", "realUser.firstName", "realUser.lastName"]) .loadRelationCountAndMap("user.invoicesCount", "user.invoices") .loadRelationCountAndMap("user.subscriptionsCount", "user.subscriptions") .loadRelationCountAndMap("user.ticketsCount", "user.tickets");