kfir/TodoSystemMicroService-NodeJS
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

done with consumer

Browse source
This commit is contained in:
Kfir Dayan 2023-07-08 22:35:20 +03:00
parent 9ffc77e95c
commit a0334bf886
5 changed files with 97 additions and 72 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

84
notification-service/src/rabbitmq/RabbitMQ.ts
View file

@ -1,26 +1,20 @@
import amqp from 'amqplib'; import amqp, { ConsumeMessage } from 'amqplib';
import { ITodo } from '../interfaces/ITodo'; import { ITodo } from '../interfaces/ITodo';
import { MongoDbModel } from '../mongodb/MongoDb'; import { MongoDbModel } from '../mongodb/MongoDb';
const env = require('dotenv').config().parsed; const env = require('dotenv').config().parsed;
export class RabbitMQ { export class RabbitMQ {
channel: amqp.Channel; channel: amqp.Channel;
queueName: string; queueName: string;
mongoClient: MongoDbModel; exchangeName: string;
exchange: string;
queue: string;
routingKey: string;
mongoClient: MongoDbModel;
constructor() { constructor() {
this.queueName = env.RABBITMQ_QUEUE_NAME;
this.mongoClient = new MongoDbModel(); this.mongoClient = new MongoDbModel();
this.exchange = 'delayed_exchange';
this.queue = 'delayed_queue';
this.routingKey = 'delayed_routing_key'
this.queueName = env.RABBITMQ_QUEUE_NAME;
this.connect().then(() => { this.connect().then(() => {
console.log('RabbitMQ connected'); console.log('RabbitMQ connected');
}).catch((error) => { }).catch((error) => {
@ -29,6 +23,7 @@ export class RabbitMQ {
} }
async connect() { async connect() {
try {
const connection = await amqp.connect({ const connection = await amqp.connect({
protocol: 'amqp', protocol: 'amqp',
hostname: env.RABBITMQ_HOST, hostname: env.RABBITMQ_HOST,
@ -36,10 +31,14 @@ export class RabbitMQ {
username: env.RABBITMQ_USERNAME, username: env.RABBITMQ_USERNAME,
password: env.RABBITMQ_PASSWORD, password: env.RABBITMQ_PASSWORD,
}); });
this.channel = await connection.createChannel(); this.channel = await connection.createChannel();
await this.channel.assertExchange(this.exchange, 'x-delayed-message', { durable: true, autoDelete: false, arguments: { 'x-delayed-type': 'direct' } }); await this.channel.assertQueue(this.queueName);
await this.channel.bindQueue(this.queueName, this.exchange, this.routingKey); console.log('Channel and queue asserted successfully #####');
await this.channel.assertQueue(this.queueName, { durable: true }); } catch (error) {
console.error('Error connecting to RabbitMQ:', error);
throw error;
}
} }
async create(payload: ITodo, delayTimeForQueue: number) { async create(payload: ITodo, delayTimeForQueue: number) {
@ -56,32 +55,43 @@ export class RabbitMQ {
} }
async startConsumer() { async startConsumer() {
try { this.channel.assertQueue(this.queueName);
console.log('Consumer started, waiting for messages...'); console.log("Consuming");
this.channel.consume(this.queueName, async (message) => { this.channel.consume(this.queueName, (message: ConsumeMessage | null) => {
if (message) { if (message) {
const { payload, delayTimeForQueue } = JSON.parse(message.content.toString()) as { const todo = JSON.parse(message.content.toString());
payload: ITodo;
delayTimeForQueue: number;
};
console.log('Received notification:', payload);
try {
await this.mongoClient.updateTodoStatus(payload);
console.log('Updated todo status in the DB');
} catch {
await this.create(payload, delayTimeForQueue);
this.channel.ack(message);
console.log('Published new message with delay, THE DB IS DOWN!: ', delayTimeForQueue);
return;
}
this.channel.ack(message); this.channel.ack(message);
console.log('Received notification:', todo);
} }
}); });
} catch (error) {
console.error('Error consuming messages from RabbitMQ:', error);
}
} }
// try {
// console.log('Consumer started, waiting for messages...');
// this.channel.consume(this.queueName, async (message) => {
// if (message) {
// const { payload, delayTimeForQueue } = JSON.parse(message.content.toString()) as {
// payload: ITodo;
// delayTimeForQueue: number;
// };
// console.log('Received notification:', payload);
// try {
// await this.mongoClient.updateTodoStatus(payload);
// console.log('Updated todo status in the DB');
// } catch {
// await this.create(payload, delayTimeForQueue);
// this.channel.ack(message);
// console.log('Published new message with delay, THE DB IS DOWN!: ', delayTimeForQueue);
// return;
// }
// this.channel.ack(message);
// }
// });
// } catch (error) {
// console.error('Error consuming messages from RabbitMQ:', error);
// }
} }

4
request.http
View file

@ -7,9 +7,9 @@ POST http://localhost:3000/todo
Content-Type: application/json Content-Type: application/json
{ {
"title": "Go to the gymNEW!!!", "title": "-2!!!!NEW!!!!",
"description": "Go to the gym at 8pm", "description": "Go to the gym at 8pm",
"due_date": "2023-07-08T19:00:00.891Z" "due_date": "2023-07-09T19:00:00.891Z"
} }
### update request ### update request

5
todo-service/package.json
View file

@ -15,11 +15,14 @@
"aws-sdk": "^2.1413.0", "aws-sdk": "^2.1413.0",
"dotenv": "^16.3.1", "dotenv": "^16.3.1",
"express": "^4.18.2", "express": "^4.18.2",
"luxon": "^3.3.0",
"moment": "^2.29.4", "moment": "^2.29.4",
"moment-timezone": "^0.5.43",
"mongoose": "^7.3.1" "mongoose": "^7.3.1"
}, },
"devDependencies": { "devDependencies": {
"@types/amqplib": "^0.10.1", "@types/amqplib": "^0.10.1",
"@types/express": "^4.17.17" "@types/express": "^4.17.17",
"@types/luxon": "^3.3.0"
} }
} }

1
todo-service/src/middleware/createTodoMiddleWare.ts
View file

@ -1,6 +1,7 @@
import { Request, Response, NextFunction } from 'express'; import { Request, Response, NextFunction } from 'express';
import { ApiError } from '../utils/ApiError'; import { ApiError } from '../utils/ApiError';
import { DateTime } from 'luxon'; import { DateTime } from 'luxon';
import moment from 'moment-timezone';
const createTodoMiddleWare = async (req: Request, res: Response, next: NextFunction) => { const createTodoMiddleWare = async (req: Request, res: Response, next: NextFunction) => {
const { title, description, due_date } = req.body; const { title, description, due_date } = req.body;

47
todo-service/src/rabbitmq/RabbitMQ.ts
View file

@ -1,14 +1,19 @@
import amqp, { Options } from 'amqplib'; import amqp, { Options, ConsumeMessage, Channel } from 'amqplib';
import { ITodo } from '../schemas/todoSchema'; import { ITodo } from '../schemas/todoSchema';
const env = require('dotenv').config().parsed; const env = require('dotenv').config().parsed;
export class RabbitMQ { export class RabbitMQ {
connection: amqp.Connection;
channel: amqp.Channel; channel: amqp.Channel;
queueName: string; queue: string;
exchange: string;
constructor() { constructor() {
this.queueName = env.RABBITMQ_QUEUE_NAME; this.queue = env.RABBITMQ_QUEUE_NAME;
this.exchange = 'delayed_exchange';
this.connect().then(() => { this.connect().then(() => {
console.log('RabbitMQ connected'); console.log('RabbitMQ connected');
}).catch((error) => { }).catch((error) => {
@ -18,17 +23,25 @@ export class RabbitMQ {
async connect() { async connect() {
try { try {
const connection = await amqp.connect({ this.connection = await amqp.connect({
protocol: 'amqp', protocol: 'amqp',
hostname: env.RABBITMQ_HOST, hostname: env.RABBITMQ_HOST,
port: parseInt(env.RABBITMQ_PORT), port: parseInt(env.RABBITMQ_PORT),
username: env.RABBITMQ_USERNAME, username: env.RABBITMQ_USERNAME,
password: env.RABBITMQ_PASSWORD, password: env.RABBITMQ_PASSWORD,
}); });
this.channel = await connection.createChannel();
await this.channel.assertExchange(this.queueName, 'x-delayed-message', { durable: true, autoDelete: false, arguments: { 'x-delayed-type': 'direct' } }); this.channel = await this.connection.createChannel();
await this.channel.assertQueue(this.queueName); await this.channel.assertQueue(this.queue);
console.log('Channel and queue asserted successfully'); await this.channel.assertExchange(this.exchange, 'x-delayed-message', {
durable: true,
arguments: {
'x-delayed-type': 'direct'
}
});
await this.channel.bindQueue(this.queue, this.exchange, this.queue);
console.log('Channel and queue asserted successfully #####');
} catch (error) { } catch (error) {
console.error('Error connecting to RabbitMQ:', error); console.error('Error connecting to RabbitMQ:', error);
throw error; throw error;
@ -38,26 +51,24 @@ export class RabbitMQ {
async create(payload: ITodo) { async create(payload: ITodo) {
const delayTimeForQueue = this.calculateDelayTimeForQueue(payload); const delayTimeForQueue = this.calculateDelayTimeForQueue(payload);
console.log("The Queue will be delayed for: ", delayTimeForQueue, " ms"); console.log("The Queue will be delayed for: ", delayTimeForQueue, " ms");
const message = JSON.stringify({ payload }); const message = JSON.stringify({ payload });
const options: Options.Publish = { persistent: true, headers: { 'x-delay': delayTimeForQueue } }; const options: Options.Publish = { headers: { 'x-delay': delayTimeForQueue } };
console.log("Options: ");
console.log(options);
try { try {
await this.channel.sendToQueue(this.queueName, Buffer.from(message), options); await this.channel.publish(this.exchange, this.queue, Buffer.from(message),
console.log('Message sent to the queue'); options
)
console.log(`Queue name is: ${this.queue}`)
} catch (error) { } catch (error) {
console.error('Error sending message to RabbitMQ:', error); console.error('Error sending message to RabbitMQ:', error);
throw error; throw error;
} }
} }
calculateDelayTimeForQueue(payload: ITodo) { calculateDelayTimeForQueue(payload: ITodo) {
const delayTime = payload.due_date.getTime() - Date.now();
const delayTimeForQueue = payload.due_date.getTime() - Date.now(); return delayTime;
return 30000;
// return delayTimeForQueue;
} }
} }