feat(entity): Removed GroupMembership entity, updated GroupSettings and User entities, and modified Warning entity to reference GroupSettings instead of GroupMembership.

Author: bitsgenix

src/entities/GroupMembership.ts

@@ -1,7 +1,7 @@
 import { Entity, PrimaryGeneratedColumn, Column, OneToMany } from "typeorm";
-import { GroupMembership } from "./GroupMembership";
 import { ApprovedUser } from "./ApprovedUser";
 import { ChatPermissions } from "grammy/types";
+import { Warning } from "./Warning";
 
 @Entity()
 export class GroupSettings {
@@ -14,15 +14,9 @@ export class GroupSettings {
   @Column()
   group_name!: string;
 
-  @Column({ type: "text", nullable: true })
-  welcome_message!: string;
-
   @Column({ type: "text", nullable: true })
   rules!: string;
 
-  @Column({ type: "text", nullable: true })
-  description!: string;
-
   @Column({ type: "bigint", nullable: true })
   added_by_id!: number;
 
@@ -38,15 +32,21 @@ export class GroupSettings {
   @Column({ type: "timestamp", default: () => "CURRENT_TIMESTAMP" })
   created_at!: Date;
 
-  @OneToMany(() => GroupMembership, (membership) => membership.group, {
+  @OneToMany(() => ApprovedUser, (approvedUser) => approvedUser.group, {
     cascade: true,
     onDelete: "CASCADE",
   })
-  members!: GroupMembership[]
+  approvedUsers!: ApprovedUser[];
 
-  @OneToMany(() => ApprovedUser, (approvedUser) => approvedUser.group, {
+  @OneToMany(() => Warning, (warning) => warning.group, {
     cascade: true,
     onDelete: "CASCADE",
   })
-  approvedUsers!: ApprovedUser[];
-}
+  warnings!: Warning[];
+
+  @Column({ type: "boolean" })
+  isSpamTime: boolean = false;
+
+  @Column({ type: "simple-array", nullable: true })
+  members!: string[];
+}

src/entities/GroupSettings.ts

@@ -1,8 +1,6 @@
-import { Entity, PrimaryGeneratedColumn, Column, OneToMany, Index } from "typeorm";
+import { Entity, PrimaryGeneratedColumn, Column, OneToMany } from "typeorm";
 import { Warning } from "./Warning";
-import { GroupMembership } from "./GroupMembership";
 import { ApprovedUser } from "./ApprovedUser";
-
 @Entity()
 export class User {
   @PrimaryGeneratedColumn()
@@ -15,14 +13,11 @@ export class User {
   username!: string;
 
   @Column({ type: "enum", enum: ["member", "admin", "owner", "restricted", "approved"], default: "member" })
-role!: string;
+  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[];
 }

src/entities/User.ts

@@ -1,5 +1,6 @@
 import { Entity, PrimaryGeneratedColumn, Column, ManyToOne } from "typeorm";
 import { User } from "./User";
+import { GroupSettings } from "./GroupSettings";
 
 @Entity()
 export class Warning {
@@ -9,6 +10,9 @@ export class Warning {
   @ManyToOne(() => User, (user) => user.warnings)
   user!: User;
 
+  @ManyToOne(() => GroupSettings, (group) => group.warnings)
+  group!: GroupSettings;
+
   @Column({ type: "timestamp", default: () => "CURRENT_TIMESTAMP" })
   warned_at!: Date;