refactor(docker-compose): add container names and dependencies for services

- Added container names for Redis, Zookeeper, and Kafka services for better identification.
- Updated Kafka service to depend on Zookeeper to ensure proper startup order.
- Cleaned up network definitions for clarity.
- Refactored Kafka consumer variable names for improved readability.

Author: DanielJames0302

backend/matching-service/src/config/kafka.ts

@@ -11,8 +11,8 @@ export class KafkaManager {
   private kafka: Kafka;
   private admin: Admin;
   private producer: Producer;
-  private consumer: Consumer;
-  private consumer2: Consumer;
+  private consumer_of_question_topic: Consumer;
+  private consumer_of_room_created_topic: Consumer;
   private isConnected = false;
 
   constructor() {
@@ -33,8 +33,8 @@ export class KafkaManager {
 
     this.admin = this.kafka.admin();
     this.producer = this.kafka.producer();
-    this.consumer = this.kafka.consumer({ groupId: 'matching-service-group' });
-    this.consumer2 = this.kafka.consumer({ groupId: 'matching-service-group-2' });
+    this.consumer_of_question_topic = this.kafka.consumer({ groupId: 'matching-service-group' });
+    this.consumer_of_room_created_topic = this.kafka.consumer({ groupId: 'matching-service-group-2' });
   }
 
   async initWithRetry(maxRetries = 5, retryDelayMs = 2000): Promise<void> {
@@ -74,8 +74,8 @@ export class KafkaManager {
 
         await this.admin.disconnect();
         await this.producer.connect();
-        await this.consumer.connect();
-        await this.consumer2.connect();
+        await this.consumer_of_question_topic.connect();
+        await this.consumer_of_room_created_topic.connect();
         this.isConnected = true; 
         console.log('Connected to Kafka');
         return;
@@ -101,9 +101,9 @@ export class KafkaManager {
   }): Promise<void> {
     await this.initWithRetry();
 
-    await this.consumer.subscribe({ topic: QUESTION_TOPIC, fromBeginning: false });
+    await this.consumer_of_question_topic.subscribe({ topic: QUESTION_TOPIC, fromBeginning: false });
 
-    this.consumer.run({
+    this.consumer_of_question_topic.run({
       eachMessage: async ({ topic, message }: EachMessagePayload) => {
         if (topic === QUESTION_TOPIC && handlers.onQuestionMessage) {
           await handlers.onQuestionMessage({
@@ -114,9 +114,9 @@ export class KafkaManager {
       },
     });
 
-    await this.consumer2.subscribe({ topic: ROOM_CREATED_TOPIC, fromBeginning: false });
+    await this.consumer_of_room_created_topic.subscribe({ topic: ROOM_CREATED_TOPIC, fromBeginning: false });
 
-    this.consumer2.run({
+    this.consumer_of_room_created_topic.run({
       eachMessage: async ({ topic, message }: EachMessagePayload) => {
         if (topic === ROOM_CREATED_TOPIC && handlers.onRoomCreatedMessage) {
           await handlers.onRoomCreatedMessage({
@@ -187,8 +187,8 @@ export class KafkaManager {
   }
 
   async disconnect(): Promise<void> {
-    try { await this.consumer.disconnect(); } catch {}
-    try { await this.consumer2.disconnect(); } catch {}
+    try { await this.consumer_of_question_topic.disconnect(); } catch {}
+    try { await this.consumer_of_room_created_topic.disconnect(); } catch {}
     try { await this.producer.disconnect(); } catch {}
     try { await this.admin.disconnect(); } catch {}
   }

backend/matching-service/src/workers/matchingWorker.ts

@@ -238,7 +238,6 @@ export async function handleQuestionMessage(message: { key?: string | null; valu
       matchId: matchId,
       questionId: roomObject.questionId,
       userIds: userIds,
-      programmingLanguage: 'python'
     };
 
     const producer = kafkaManager.getProducer();

docker-compose.yml

@@ -3,6 +3,7 @@ version: '3.9'
 services:
   redis:
     image: redis:7-alpine
+    container_name: redis
     ports:
       - "6379:6379"
     volumes:
@@ -25,17 +26,22 @@ services:
       - cs3219-peerprep-network
   zookeeper:
     image: confluentinc/cp-zookeeper:7.6.1
+    container_name: zookeeper
     environment:
       ZOOKEEPER_CLIENT_PORT: 2181
       ZOOKEEPER_TICK_TIME: 2000
     ports: ['2181:2181']
-    networks: [cs3219-peerprep-network]
+    networks: 
+      - cs3219-peerprep-network
 
   kafka:
     image: confluentinc/cp-kafka:7.6.1
+    container_name: kafka
     ports:
       - "9092:9092"
       - "29092:29092"
+    depends_on:
+      - zookeeper
     environment:
       KAFKA_BROKER_ID: 1
       KAFKA_ZOOKEEPER_CONNECT: zookeeper:2181
@@ -44,7 +50,8 @@ services:
       KAFKA_LISTENER_SECURITY_PROTOCOL_MAP: PLAINTEXT:PLAINTEXT,PLAINTEXT_HOST:PLAINTEXT
       KAFKA_INTER_BROKER_LISTENER_NAME: PLAINTEXT
       KAFKA_OFFSETS_TOPIC_REPLICATION_FACTOR: 1
-    networks: [cs3219-peerprep-network]
+    networks: 
+      - cs3219-peerprep-network
 
   matching-service:
     build:
@@ -70,7 +77,7 @@ services:
       - KAFKA_HOST=kafka
       - KAFKA_PORT=9092
       - KAFKA_BROKERS=kafka:9092
-      - DEBUG_MODE=false
+      - DEBUG_MODE=true
       - DEBUG_MATCHING=false
     depends_on:
       - redis