refactor(command): remove unused imports, simplify getEntities method, and update add, remove, and list methods"

Author: bitsgenix

src/service/command/approved.ts

@@ -1,19 +1,16 @@
 import { Context } from "grammy";
 import { UserService } from "../db/user";
 import { GroupSettingsService } from "../db/group";
-import { GroupMembershipService } from "../db/group/Membership";
 import { ApprovedUserService } from "../db/user/Approved";
 import { Permissions } from "./Permissions";
+import { initGroupSetting } from "../../decorators/db";
 
 export class Approved {
   private static userRepo: UserService = new UserService();
   private static approvedUserRepo: ApprovedUserService =
     new ApprovedUserService();
   private static groupSettingsRepo: GroupSettingsService =
     new GroupSettingsService();
-  private static groupMembershipRepo: GroupMembershipService =
-    new GroupMembershipService();
-
   // Helper method to fetch the user and group settings
   private static async getEntities(ctx: Context) {
     const userId = ctx.message?.reply_to_message?.from?.id!;
@@ -24,20 +21,16 @@ export class Approved {
 
     return { userId, chatId, user, groupSettings };
   }
-
+  @initGroupSetting()
   static async add(ctx: Context) {
-    const { userId, chatId, user, groupSettings } = await this.getEntities(ctx);
+    const { userId,  user, groupSettings } = await this.getEntities(ctx);
 
     if (user) {
       return ctx.reply("This user is already approved.");
     }
-
-    if (!groupSettings) {
-      return ctx.reply("Group settings not found.");
-    }
     // Add user to the approved list
     const approvedUser = await this.approvedUserRepo.create({
-      group: groupSettings,
+      group: groupSettings!,
       user_id: userId,
       username: ctx.message?.reply_to_message?.from?.username!,
     });
@@ -54,30 +47,54 @@ export class Approved {
       }
     );
   }
-
+  @initGroupSetting()
   static async remove(ctx: Context) {
-      const { userId, chatId, groupSettings } = await this.getEntities(ctx);
-
-      if (!groupSettings) {
-        return ctx.reply("Group settings not found.");
-      }
+    const { userId, groupSettings } = await this.getEntities(ctx);
+    // Remove user from the approved list
+    const approvedUser = await this.approvedUserRepo.getByIdAndGroup(
+      userId,
+      groupSettings!.id!
+    );
+    if (approvedUser) {
+      await this.approvedUserRepo.remove(approvedUser.id);
+    }
 
-      // Remove user from the approved list
-      const approvedUser = await this.approvedUserRepo.getByIdAndGroup(userId,groupSettings)
+    // Restrict permissions
+    await ctx.restrictChatMember(userId, Permissions.APPROVED_USER(false));
 
-      if (approvedUser) {
-        await this.approvedUserRepo.remove(approvedUser.id);
+    // Send a confirmation message
+    await ctx.reply(
+      "The user's approval has been removed, and their permissions have been restricted.",
+      {
+        reply_to_message_id: ctx.message?.message_id,
       }
+    );
+  }
+  @initGroupSetting()
+  static async list(ctx: Context) {
+    const { chatId } = await this.getEntities(ctx);
+    const updatedGroupSettings = await Approved.groupSettingsRepo.getByGroupId(
+      chatId
+    );
+    const approvedUsers = await this.approvedUserRepo.getByGroup(
+      updatedGroupSettings!
+    );
+    if (!approvedUsers || approvedUsers.length === 0) {
+      await ctx.reply("There are no approved users in this group.");
+      return;
+    }
 
-      // Restrict permissions
-      await ctx.restrictChatMember(userId,Permissions.APPROVED_USER(false));
+    // Format the list of approved users
+    const userList = approvedUsers
+      .map((user) => {
+        const username = user.username ? `@${user.username}` : "No username";
+        return `- ${username}`;
+      })
+      .join("\n");
 
-      // Send a confirmation message
-      await ctx.reply(
-        "The user's approval has been removed, and their permissions have been restricted.",
-        {
-          reply_to_message_id: ctx.message?.message_id,
-        }
-      );
+    // Send the list to the chat
+    await ctx.reply(`Approved users in this group:\n${userList}`, {
+      reply_to_message_id: ctx.message?.message_id,
+    });
   }
 }