Question service

.github/workflows/ci.yml

@@ -14,8 +14,8 @@ jobs:
   lint:
     runs-on: ubuntu-latest
     steps:
-      - uses: actions/checkout@v3
-      - uses: actions/setup-node@v3
+      - uses: actions/checkout@v4
+      - uses: actions/setup-node@v4
         with:
           node-version: 20
           cache: 'npm'
@@ -24,8 +24,8 @@ jobs:
   test:
     runs-on: ubuntu-latest
     steps:
-      - uses: actions/checkout@v3
-      - uses: actions/setup-node@v3
+      - uses: actions/checkout@v4
+      - uses: actions/setup-node@v4
         with:
           node-version: 20
           cache: 'npm'
@@ -36,8 +36,8 @@ jobs:
     needs: [ test ]
     runs-on: ubuntu-latest
     steps:
-      - uses: actions/checkout@v3
-      - uses: actions/setup-node@v3
+      - uses: actions/checkout@v4
+      - uses: actions/setup-node@v4
         with:
           node-version: 20
           cache: 'npm'
@@ -51,9 +51,9 @@ jobs:
     needs: [ test, lint ]
     runs-on: ubuntu-latest
     steps:
-      - uses: actions/checkout@v3
-      - uses: docker/setup-buildx-action@v2
-      - uses: docker/login-action@v2
+      - uses: actions/checkout@v4
+      - uses: docker/setup-buildx-action@v3
+      - uses: docker/login-action@v3
         with:
           registry: ${{ env.REGISTRY }}
           username: ${{ github.actor }}
@@ -62,7 +62,7 @@ jobs:
         id: meta
         with:
           images: ${{ env.REGISTRY }}/${{ env.IMAGE_NAME }}
-      - uses: docker/build-push-action@v4
+      - uses: docker/build-push-action@v6
         with:
           context: .
           target: production

Dockerfile

@@ -14,6 +14,7 @@ COPY . .
 RUN npm run build bot
 RUN npm run build event-store
 RUN npm run build graph-store
+RUN npm run build question-service
 
 FROM node:alpine AS production
 

apps/bot/src/bot.controller.ts

@@ -0,0 +1,25 @@
+import { Controller, Logger, UseInterceptors } from '@nestjs/common';
+import { MessagePattern, Payload } from '@nestjs/microservices';
+import { BotService } from './bot.service';
+import { TelegramAction } from '@app/common';
+import { EventsInterceptor } from '@app/common/rmq/interceptors/events.interceptor';
+
+interface MessagePayload {
+  chat_id: number | string;
+  text: string;
+  other: any;
+}
+
+@Controller()
+@UseInterceptors(EventsInterceptor)
+export class BotController {
+  private readonly logger = new Logger(BotController.name);
+  constructor(private readonly botService: BotService) { }
+
+  @MessagePattern(TelegramAction.SEND_MESSAGE)
+  async sendMessage(@Payload() payload: MessagePayload): Promise<void> {
+    const { chat_id, text, other } = payload;
+    await this.botService.sendMessage(chat_id, text, other);
+    return;
+  }
+}

apps/bot/src/bot.module.ts

@@ -9,6 +9,7 @@ import {
   RmqModule,
 } from '@app/common';
 import { Services } from '@app/common';
+import { BotController } from './bot.controller';
 
 @Module({
   imports: [
@@ -19,7 +20,9 @@ import { Services } from '@app/common';
     }),
     RmqModule.register(Services.EventStore),
     RmqModule.register(Services.GraphStore),
+    RmqModule.register(Services.TGQuestionService),
   ],
+  controllers: [BotController],
   providers: [BotService],
 })
-export class BotModule {}
+export class BotModule { }

apps/bot/src/bot.service.spec.ts

@@ -24,6 +24,12 @@ describe('BotService', () => {
             emit: jest.fn(),
           },
         },
+        {
+          provide: Services.TGQuestionService.name,
+          useValue: {
+            emit: jest.fn(),
+          },
+        },
         {
           provide: ConfigService,
           useValue: {

apps/bot/src/bot.service.ts

@@ -2,7 +2,9 @@ import { IgnoreEvent, Services, UpdateEvent } from '@app/common';
 import { Inject, Injectable, Logger, OnModuleInit } from '@nestjs/common';
 import { ConfigService } from '@nestjs/config';
 import { ClientProxy } from '@nestjs/microservices';
-import { API_CONSTANTS, Bot } from 'grammy';
+import { API_CONSTANTS, Bot, RawApi } from 'grammy';
+import { Other } from 'grammy/out/core/api';
+import { Message } from 'grammy/types';
 
 @Injectable()
 export class BotService implements OnModuleInit {
@@ -12,6 +14,8 @@ export class BotService implements OnModuleInit {
   constructor(
     @Inject(Services.EventStore.name) private readonly eventClient: ClientProxy,
     @Inject(Services.GraphStore.name) private readonly graphClient: ClientProxy,
+    @Inject(Services.TGQuestionService.name)
+    private readonly tgQuestionClient: ClientProxy,
     private readonly configService: ConfigService,
   ) {
     this.bot = new Bot(configService.get<string>('telegram.token'));
@@ -27,6 +31,10 @@ export class BotService implements OnModuleInit {
         this.logger.log(`Received ${event} from ${ctx.chat.id}`);
         this.eventClient.emit(event, ctx);
         this.graphClient.emit(event, ctx);
+        if (!ctx.update.message.from.is_bot) {
+          this.tgQuestionClient.emit(event, ctx);
+        }
+        return;
       });
     });
   }
@@ -36,4 +44,14 @@ export class BotService implements OnModuleInit {
       allowed_updates: API_CONSTANTS.ALL_UPDATE_TYPES,
     });
   }
+
+  async sendMessage(
+    chat_id: number | string,
+    text: string,
+    other?: Other<RawApi, 'sendMessage', 'text' | 'chat_id'>,
+  ): Promise<Message.TextMessage | null> {
+    const receipt = await this.bot.api.sendMessage(chat_id, text, other);
+    this.logger.log(`Message ${receipt.message_id} sent to ${receipt.chat.id}`);
+    return receipt;
+  }
 }

apps/bot/src/main.ts

@@ -3,7 +3,6 @@ import { BotModule } from './bot.module';
 import { RmqService, Services } from '@app/common';
 
 async function bootstrap() {
-  // const app = await NestFactory.createMicroservice(BotModule);
   const app = await NestFactory.create(BotModule);
   const rmqService = app.get<RmqService>(RmqService);
   app.connectMicroservice(rmqService.getOptions(Services.TelegramBot.queue));

apps/event-store/src/event-store.controller.ts

@@ -2,15 +2,15 @@ import { Controller, Logger, UseInterceptors } from '@nestjs/common';
 import { EventStoreService } from './event-store.service';
 import { MessagePattern, Payload } from '@nestjs/microservices';
 import { UpdateEvent } from '@app/common';
-import { EventsInterceptor } from './interceptors/events.interceptor';
+import { EventsInterceptor } from '@app/common/rmq/interceptors/events.interceptor';
 import { API_CONSTANTS } from 'grammy';
 
 @Controller()
 @UseInterceptors(EventsInterceptor)
 export class EventStoreController {
   private readonly logger = new Logger(EventStoreController.name);
 
-  constructor(private readonly eventsService: EventStoreService) {}
+  constructor(private readonly eventsService: EventStoreService) { }
 
   a = typeof API_CONSTANTS.ALL_UPDATE_TYPES;
 

apps/graph-store/src/chat_member/chat_member.controller.ts

@@ -2,7 +2,7 @@ import { UpdateEvent } from '@app/common';
 import { Controller, Logger, UseInterceptors } from '@nestjs/common';
 import { MessagePattern } from '@nestjs/microservices';
 import { DChatMemberUpdated } from '../decorators/chatMemberUpdated.decorator';
-import { RmqInterceptor } from '../interceptors/rmq.interceptor';
+import { EventsInterceptor } from '@app/common/rmq/interceptors/events.interceptor';
 import { Chat, ChatMemberUpdated } from 'grammy/types';
 import { ChatMemberService } from './chat_member.service';
 import { DChat } from '../decorators/chat.decorator';
@@ -25,11 +25,11 @@ type Action =
   | 'DEMOTED';
 
 @Controller('chat-member')
-@UseInterceptors(RmqInterceptor)
+@UseInterceptors(EventsInterceptor)
 export class ChatMemberController {
   private readonly logger = new Logger(ChatMemberController.name);
 
-  constructor(private readonly chatMemberService: ChatMemberService) {}
+  constructor(private readonly chatMemberService: ChatMemberService) { }
 
   @MessagePattern(UpdateEvent.CHAT_MEMBER)
   async chat_member(

apps/graph-store/src/edited_message/edited_message.controller.ts

@@ -13,10 +13,10 @@ import { MentionedService } from '../mentioned/mentioned.service';
 import { MessageService } from '../message/message.service';
 import { RepliedService } from '../replied/replied.service';
 import { UserService } from '../user/user.service';
-import { RmqInterceptor } from '../interceptors/rmq.interceptor';
+import { EventsInterceptor } from '@app/common/rmq/interceptors/events.interceptor';
 
 @Controller('edited-message')
-@UseInterceptors(RmqInterceptor)
+@UseInterceptors(EventsInterceptor)
 export class EditedMessageController {
   private readonly logger = new Logger(EditedMessageController.name);
 
@@ -28,7 +28,7 @@ export class EditedMessageController {
     private readonly joinedService: JoinedService,
     private readonly repliedService: RepliedService,
     private readonly mentionedService: MentionedService,
-  ) {}
+  ) { }
 
   @MessagePattern(UpdateEvent.EDITED_MESSAGE)
   async chat_member(

apps/graph-store/src/graph-store.module.ts

@@ -36,4 +36,4 @@ import { MessageReactionModule } from './message_reaction/message_reaction.modul
     MessageReactionModule,
   ],
 })
-export class GraphStoreModule {}
+export class GraphStoreModule { }