Add Invite User Module and Update User and Space Entities

This commit introduces a new module for handling user invitations, including DTOs, entities, and repositories. It also updates the User and Space entities to include relationships with the new Invite User entities.

libs/common/src/modules/user/dtos/user.dto.ts

@@ -58,20 +58,6 @@ export class UserOtpDto {
   public expiryTime: string;
 }
 
-export class UserRoleDto {
-  @IsString()
-  @IsNotEmpty()
-  public uuid: string;
-
-  @IsString()
-  @IsNotEmpty()
-  public userUuid: string;
-
-  @IsString()
-  @IsNotEmpty()
-  public roleTypeUuid: string;
-}
-
 export class UserSpaceDto {
   @IsString()
   @IsNotEmpty()

libs/common/src/modules/user/entities/user.entity.ts

@@ -2,15 +2,16 @@ import {
   Column,
   DeleteDateColumn,
   Entity,
+  JoinColumn,
   ManyToOne,
   OneToMany,
+  OneToOne,
   Unique,
 } from 'typeorm';
 import {
   UserDto,
   UserNotificationDto,
   UserOtpDto,
-  UserRoleDto,
   UserSpaceDto,
 } from '../dtos';
 import { AbstractEntity } from '../../abstract/entities/abstract.entity';
@@ -26,6 +27,8 @@ import { OtpType } from '../../../../src/constants/otp-type.enum';
 import { RoleTypeEntity } from '../../role-type/entities';
 import { SpaceEntity } from '../../space/entities';
 import { VisitorPasswordEntity } from '../../visitor-password/entities';
+import { InviteUserEntity } from '../../Invite-user/entities';
+import { ProjectEntity } from '../../project/entities';
 
 @Entity({ name: 'user' })
 export class UserEntity extends AbstractEntity<UserDto> {
@@ -100,10 +103,7 @@ export class UserEntity extends AbstractEntity<UserDto> {
     (deviceUserNotification) => deviceUserNotification.user,
   )
   deviceUserNotification: DeviceNotificationEntity[];
-  @OneToMany(() => UserRoleEntity, (role) => role.user, {
-    nullable: true,
-  })
-  roles: UserRoleEntity[];
+
   @ManyToOne(() => RegionEntity, (region) => region.users, { nullable: true })
   region: RegionEntity;
   @ManyToOne(() => TimeZoneEntity, (timezone) => timezone.users, {
@@ -116,6 +116,21 @@ export class UserEntity extends AbstractEntity<UserDto> {
   )
   public visitorPasswords: VisitorPasswordEntity[];
 
+  @ManyToOne(() => RoleTypeEntity, (roleType) => roleType.users, {
+    nullable: true,
+  })
+  public roleType: RoleTypeEntity;
+  @OneToOne(() => InviteUserEntity, (inviteUser) => inviteUser.user, {
+    nullable: true,
+  })
+  @JoinColumn({ name: 'invite_user_uuid' })
+  inviteUser: InviteUserEntity;
+
+  @ManyToOne(() => ProjectEntity, (project) => project.users, {
+    nullable: true,
+  })
+  @JoinColumn({ name: 'project_uuid' })
+  public project: ProjectEntity;
   constructor(partial: Partial<UserEntity>) {
     super();
     Object.assign(this, partial);
@@ -125,7 +140,7 @@ export class UserEntity extends AbstractEntity<UserDto> {
 @Entity({ name: 'user-notification' })
 @Unique(['user', 'subscriptionUuid'])
 export class UserNotificationEntity extends AbstractEntity<UserNotificationDto> {
-  @ManyToOne(() => UserEntity, (user) => user.roles, {
+  @ManyToOne(() => UserEntity, (user) => user.roleType, {
     nullable: false,
   })
   user: UserEntity;
@@ -178,25 +193,6 @@ export class UserOtpEntity extends AbstractEntity<UserOtpDto> {
   }
 }
 
-@Entity({ name: 'user-role' })
-@Unique(['user', 'roleType'])
-export class UserRoleEntity extends AbstractEntity<UserRoleDto> {
-  @ManyToOne(() => UserEntity, (user) => user.roles, {
-    nullable: false,
-  })
-  user: UserEntity;
-
-  @ManyToOne(() => RoleTypeEntity, (roleType) => roleType.roles, {
-    nullable: false,
-  })
-  roleType: RoleTypeEntity;
-
-  constructor(partial: Partial<UserRoleEntity>) {
-    super();
-    Object.assign(this, partial);
-  }
-}
-
 @Entity({ name: 'user-space' })
 @Unique(['user', 'space'])
 export class UserSpaceEntity extends AbstractEntity<UserSpaceDto> {

libs/common/src/modules/user/repositories/user.repository.ts

@@ -4,7 +4,6 @@ import {
   UserEntity,
   UserNotificationEntity,
   UserOtpEntity,
-  UserRoleEntity,
   UserSpaceEntity,
 } from '../entities/';
 
@@ -29,13 +28,6 @@ export class UserOtpRepository extends Repository<UserOtpEntity> {
   }
 }
 
-@Injectable()
-export class UserRoleRepository extends Repository<UserRoleEntity> {
-  constructor(private dataSource: DataSource) {
-    super(UserRoleEntity, dataSource.createEntityManager());
-  }
-}
-
 @Injectable()
 export class UserSpaceRepository extends Repository<UserSpaceEntity> {
   constructor(private dataSource: DataSource) {