refactor(service/db): BotOverseer, GroupMembershipService, GroupSettingsService, DatabaseService, ApprovedUserService, UserService, and WarningServiceDb classes, modifying method signatures, adding new methods, and updating existing logic."

Author: bitsgenix

src/service/bot/index.ts

@@ -88,9 +88,7 @@ export class BotOverseer {
     return user!;
   }
   @SafeExecution()
-  async userInGroup(
-    msg: string = "The user is no longer a member of this group."
-  ): Promise<boolean | undefined> {
+  async userInGroup(msg: string = "The user is no longer a member of this group."): Promise<boolean | undefined> {
     const id = await this.getRepliedUserId();
     if (!id) {
       await this.ctx.reply(

src/service/db/group/Membership.ts

@@ -4,18 +4,26 @@ import { GroupMembership } from "../../../entities/GroupMembership";
 export class GroupMembershipService extends DatabaseService {
   private groupMembershipRepo = this.getRepo(GroupMembership);
 
-  async add(membership: GroupMembership) {
-    return this.groupMembershipRepo.save(membership);
+  async create(membership: Partial<GroupMembership>): Promise<GroupMembership> {
+    return this.groupMembershipRepo.create(membership);
   }
 
   async getById(id: number) {
     return this.groupMembershipRepo.findOne({ where: { id } });
   }
 
+  async getGroupAndUserId(groupId: number, userId: number) {
+    return this.groupMembershipRepo.findOne({
+      where: { group: { id: groupId }, user: { id: userId } },
+    });
+  }
+  async save(membership: Partial<GroupMembership>): Promise<GroupMembership> {
+    return this.groupMembershipRepo.save(membership);
+  }
   async remove(id: number) {
     return this.groupMembershipRepo.delete({ id });
   }
-  async deleteUser(userId:number){
+  async deleteUser(userId: number) {
     return this.groupMembershipRepo.delete({ user: { id: userId } });
   }
 }

src/service/db/group/index.ts

@@ -1,3 +1,4 @@
+import { Context } from "grammy";
 import { DatabaseService } from "..";
 import { GroupSettings } from "../../../entities/GroupSettings";
 
@@ -19,4 +20,20 @@ export class GroupSettingsService extends DatabaseService {
   async remove(id: number) {
     return this.groupSettingsRepo.delete({ id });
   }
+  async init(ctx: Context) {
+    const chat = ctx.chat!;
+    const from = ctx.from;
+    return await this.save(
+      await this.create({
+        group_id: chat.id,
+        group_name: chat.title,
+        welcome_message: "",
+        chat_permissions: (await ctx.api.getChat(chat.id)).permissions,
+        rules: "",
+        description: "",
+        black_list: [],
+        added_by_id: from?.id,
+      })
+    );
+  }
 }

src/service/db/index.ts

@@ -15,12 +15,8 @@ export class DatabaseService {
   }
 
   async initialize() {
-    try {
       await this.db.initialize();
       logger.info("Database connection initialized", "DATABASE");
-    } catch (error: any) {
-      logger.error("Error initializing database connection", error, "DATABASE");
-    }
   }
 
   async close() {

src/service/db/user/Approved.ts

@@ -14,12 +14,18 @@ export class ApprovedUserService extends DatabaseService {
   async getById(id: number): Promise<ApprovedUser | null> {
     return this.approvedUserRepo.findOne({ where: { id } });
   }
-  async getByIdAndGroup(userId: number,groupSettings:GroupSettings) {
+  async getByIdAndGroup(userId: number, groupId: number) {
     return this.approvedUserRepo.findOne({
-      where: { user_id: userId, group: groupSettings },
+      where: { user_id: userId, group: { id: groupId } },
     });
   }
+  async getByGroup(groupSettings: GroupSettings): Promise<ApprovedUser[]> {
+  return this.approvedUserRepo.find({
+    where: { group: { id: groupSettings.id } }, // Use the ID to filter
+    relations: ["group"],
+  });
+}
   async remove(id: number): Promise<void> {
-    await this.approvedUserRepo.delete({ id });
+    await this.approvedUserRepo.delete(id);
   }
 }

src/service/db/user/index.ts

@@ -28,16 +28,14 @@ export class UserService extends DatabaseService {
     const chatMember = await ctx.getChatMember(telegram_id);
     const role = chatMember.status;
     let user = await this.getByTelegramId(telegram_id);
-
     if (!user) {
-      user = await this.userRepo.create({
+      user = this.userRepo.create({
         telegram_id,
         role,
         warnings: [],
       });
       await this.userRepo.save(user);
     }
-
     return user;
   }
 }

src/service/db/user/warning.ts

@@ -4,21 +4,26 @@ import { Warning } from "../../../entities/Warning";
 
 export class WarningServiceDb extends DatabaseService {
   private warningRepo = this.getRepo(Warning);
+
   async create(warning: Partial<Warning>): Promise<Warning> {
-    return this.warningRepo.create(warning);
+    const newWarning = this.warningRepo.create(warning);
+    return this.warningRepo.save(newWarning);
   }
+
   async save(warning: Warning) {
     return this.warningRepo.save(warning);
   }
 
   async getByUserId(userId: number) {
     return this.warningRepo.find({ where: { user: { id: userId } } });
   }
+
   async remove(id: number) {
     return this.warningRepo.delete({ id });
   }
-  async clear(user: any) {
-    return this.warningRepo.delete({ user });
+
+  async clear(userId: number) {
+    return this.warningRepo.delete({ user: { id: userId } });
   }
 
   async count(user: User) {