refactor: the whole role and permission flow

src/modules/users/entities/role.entity.ts

@@ -1,15 +1,24 @@
 import { Column, Entity, JoinTable, ManyToMany } from "typeorm";
 
 import { Permission } from "./permission.entity";
+import { User } from "./user.entity";
 import { BaseEntity } from "../../../common/entities/base.entity";
-import { RoleEnum } from "../enums/role.enum";
 
 @Entity()
 export class Role extends BaseEntity {
-  @Column({ type: "enum", enum: RoleEnum, default: RoleEnum.USER, nullable: false, unique: true })
-  name: RoleEnum;
+  //   @Column({ type: "enum", enum: RoleEnum, default: RoleEnum.USER, nullable: false, unique: true })
+  //   name: RoleEnum;
+
+  @Column({ type: "varchar", length: 150, nullable: false, unique: true })
+  name: string;
+
+  @Column({ type: "boolean", default: false })
+  isAdmin: boolean;
 
   @ManyToMany(() => Permission, (permission) => permission.roles)
   @JoinTable({ name: "role_permission_relation" })
   permissions: Permission[];
+
+  @ManyToMany(() => User, (user) => user.roles)
+  users: User[];
 }

src/modules/users/entities/user-financial.entity.ts

@@ -0,0 +1,27 @@
+import { Column, Entity, ManyToOne, Unique } from "typeorm";
+
+import { User } from "./user.entity";
+import { BaseEntity } from "../../../common/entities/base.entity";
+import { FinancialType } from "../enums/financial-type.enum";
+
+@Unique(["user", "type"])
+@Entity()
+export class UserFinancial extends BaseEntity {
+  @Column({ type: "enum", enum: FinancialType, default: FinancialType.REAL })
+  type: FinancialType;
+
+  @Column({ nullable: true })
+  economicCode: string;
+
+  @Column({ nullable: true })
+  registrationId: string;
+
+  @Column({ nullable: true })
+  nationalId: string;
+
+  @Column({ nullable: true })
+  number: string;
+
+  @ManyToOne(() => User)
+  user: User;
+}

src/modules/users/entities/user.entity.ts

@@ -43,14 +43,16 @@ export class User extends BaseEntity {
   @Column({ type: "varchar", length: 12, nullable: true })
   birthDate: string;
 
-  @Column({ type: "varchar", length: 100, unique: true, nullable: false })
-  nationalCode: string;
+  @Column({ type: "varchar", length: 100, unique: true, nullable: true })
+  nationalCode: string | null;
 
+  @Column({ type: "varchar", length: 100, nullable: true })
+  profilePic: string;
   //-----------------------------------------
   //   @ManyToOne(() => Role, { eager: true, onDelete: "RESTRICT", nullable: false })
   //   role: Role;
 
-  @ManyToMany(() => Role)
+  @ManyToMany(() => Role, (role) => role.users)
   @JoinTable({ name: "user_role_relation" })
   roles: Role[];