refactor: standardize channel ID naming convention across Telegram bot files

- Updated the `channel_id` field to `channelId` in the TelegramGroup interface and SQL queries for consistency.
- Adjusted related functions in the ban, pin, and unban command files to reflect the new naming convention.
- Ensured all database interactions use the updated field name for improved clarity and maintainability.

Author: mkltkn

telegrambot/docs/PRISMA_TO_SQL_REFACTORING.md

@@ -55,7 +55,7 @@ This document summarizes the refactoring of the telegrambot project from Prisma
 - `expiresAt` → `expires_at` (TIMESTAMP)
 
 #### Table: `telegram_groups`
-- `channelId` → `channel_id` (VARCHAR)
+- `channelId` remains `"channelId"` in DB (use double quotes in raw SQL; no snake_case)
 - `name` → `name` (VARCHAR)
 - `link` → `link` (VARCHAR)
 - `active` → `active` (BOOLEAN)

telegrambot/src/commands/ban.ts

@@ -48,12 +48,12 @@ function generateBanMessage(ctx: Context, args: string): string {
  */
 async function fetchActiveGroups(): Promise<Array<{ channelId: string }>> {
   try {
-    const groups = await queryMany<{ channel_id: string | null }>(
-      `SELECT channel_id FROM telegram_groups WHERE active = true AND channel_id IS NOT NULL`
+    const groups = await queryMany<{ channelId: string | null }>(
+      `SELECT "channelId" FROM telegram_groups WHERE active = true AND "channelId" IS NOT NULL`
     );
     return groups
-      .filter((g) => g.channel_id !== null)
-      .map((g) => ({ channelId: g.channel_id! }));
+      .filter((g) => g.channelId !== null)
+      .map((g) => ({ channelId: g.channelId! }));
   } catch (error) {
     console.error('Error fetching active groups:', error);
     throw error;

telegrambot/src/commands/pin.ts

@@ -35,12 +35,12 @@ function readPinIgnore(): string[] {
  */
 async function fetchActiveGroups(): Promise<Array<{ channelId: string; name: string }>> {
   try {
-    const groups = await queryMany<{ channel_id: string | null; name: string }>(
-      `SELECT channel_id, name FROM telegram_groups WHERE active = true AND channel_id IS NOT NULL`
+    const groups = await queryMany<{ channelId: string | null; name: string }>(
+      `SELECT "channelId", name FROM telegram_groups WHERE active = true AND "channelId" IS NOT NULL`
     );
     return groups
-      .filter((g) => g.channel_id !== null)
-      .map((g) => ({ channelId: g.channel_id!, name: g.name }));
+      .filter((g) => g.channelId !== null)
+      .map((g) => ({ channelId: g.channelId!, name: g.name }));
   } catch (error) {
     console.error('Error fetching active groups:', error);
     throw error;

telegrambot/src/commands/unban.ts

@@ -36,12 +36,12 @@ function generateUnbanMessage(ctx: Context, userId: string): string {
  */
 async function fetchActiveGroups(): Promise<Array<{ channelId: string }>> {
   try {
-    const groups = await queryMany<{ channel_id: string | null }>(
-      `SELECT channel_id FROM telegram_groups WHERE active = true AND channel_id IS NOT NULL`
+    const groups = await queryMany<{ channelId: string | null }>(
+      `SELECT "channelId" FROM telegram_groups WHERE active = true AND "channelId" IS NOT NULL`
     );
     return groups
-      .filter((g) => g.channel_id !== null)
-      .map((g) => ({ channelId: g.channel_id! }));
+      .filter((g) => g.channelId !== null)
+      .map((g) => ({ channelId: g.channelId! }));
   } catch (error) {
     console.error('Error fetching active groups:', error);
     throw error;

telegrambot/src/workers/cronWorker.ts

@@ -13,7 +13,7 @@ const redisConnection = getRedisConnection();
 interface TelegramGroup {
   id: number;
   name: string;
-  channel_id: string | null;
+  channelId: string | null;
   members: number;
 }
 
@@ -103,9 +103,9 @@ async function processMemberCountJob(job: Job<CronJobData>): Promise<JobResult>
 
     // Get all active groups from database
     const allGroups = await queryMany<TelegramGroup>(
-      `SELECT id, name, channel_id, members
+      `SELECT id, name, "channelId", members
        FROM telegram_groups
-       WHERE active = true AND channel_id IS NOT NULL
+       WHERE active = true AND "channelId" IS NOT NULL
        ORDER BY "listOrder" ASC`
     );
 
@@ -114,7 +114,7 @@ async function processMemberCountJob(job: Job<CronJobData>): Promise<JobResult>
     // Process groups sequentially with delay
     for (const group of allGroups) {
       try {
-        const memberCount = await bot.telegram.getChatMembersCount(group.channel_id!);
+        const memberCount = await bot.telegram.getChatMembersCount(group.channelId!);
 
         console.log(group.name, memberCount + ' user');
         await updateMembers(group.id, memberCount);

telegrambot/telegram.ts

@@ -12,7 +12,7 @@ import { query, queryMany } from './src/utils/db-client';
 interface TelegramGroup {
   id: number;
   name: string;
-  channel_id: string | null;
+  channelId: string | null;
   members: number;
 }
 
@@ -46,9 +46,9 @@ cron.schedule('00 01 * * *', async () => {
   try {
     // Get all active groups from database
     const allGroups = await queryMany<TelegramGroup>(
-      `SELECT id, name, channel_id, members
+      `SELECT id, name, "channelId", members
        FROM telegram_groups
-       WHERE active = true AND channel_id IS NOT NULL
+       WHERE active = true AND "channelId" IS NOT NULL
        ORDER BY "listOrder" ASC`
     );
 
@@ -59,7 +59,7 @@ cron.schedule('00 01 * * *', async () => {
     // Get group member count from Telegram and update database
     for (const group of allGroups) {
       try {
-        const memberCount = await bot.telegram.getChatMembersCount(group.channel_id!);
+        const memberCount = await bot.telegram.getChatMembersCount(group.channelId!);
 
         console.log(group.name, memberCount + ' user');
         await updateMembers(group.id, memberCount);