feat(entities): added/modified columns and relationships

Author: bitsgenix

src/entities/GroupSettings.ts

@@ -30,7 +30,7 @@ export class GroupSettings {
   black_list!: string[];
 
   @Column({ type: "json", nullable: true })
-  chat_permissions!: ChatPermissions; 
+  chat_permissions!: ChatPermissions;
 
   @Column({ type: "timestamp", default: () => "CURRENT_TIMESTAMP" })
   updated_at!: Date;
@@ -42,11 +42,11 @@ export class GroupSettings {
     cascade: true,
     onDelete: "CASCADE",
   })
-  members!: GroupMembership[];
+  members!: GroupMembership[]
 
   @OneToMany(() => ApprovedUser, (approvedUser) => approvedUser.group, {
     cascade: true,
     onDelete: "CASCADE",
   })
   approvedUsers!: ApprovedUser[];
-}
+}

src/entities/User.ts

@@ -1,6 +1,7 @@
 import { Entity, PrimaryGeneratedColumn, Column, OneToMany, Index } from "typeorm";
 import { Warning } from "./Warning";
 import { GroupMembership } from "./GroupMembership";
+import { ApprovedUser } from "./ApprovedUser";
 
 @Entity()
 export class User {
@@ -10,12 +11,18 @@ export class User {
   @Column({ type: "bigint", unique: true })
   telegram_id!: number;
 
-  @Column({ type: "enum", enum: ["member", "admin", "owner",'restricted'], default: "member" })
-  role!: string;
+  @Column({ type: "varchar", length: 255, nullable: true })
+  username!: string;
+
+  @Column({ type: "enum", enum: ["member", "admin", "owner", "restricted", "approved"], default: "member" })
+role!: string;
 
   @OneToMany(() => Warning, (warning) => warning.user, { cascade: true, onDelete: "CASCADE" })
   warnings!: Warning[];
 
   @OneToMany(() => GroupMembership, (membership) => membership.user, { cascade: true, onDelete: "CASCADE" })
   memberships!: GroupMembership[];
-}
+
+  @OneToMany(() => ApprovedUser, (approvedUser) => approvedUser.user, { cascade: true, onDelete: "CASCADE" })
+  approvedUsers!: ApprovedUser[];
+}