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

env vars from singleton service class

Browse source
This commit is contained in:
Kfir Dayan 2023-07-09 00:31:55 +03:00
parent 6989288471
commit 74f6fdcf0f
3 changed files with 39 additions and 39 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

9
notification-service/src/mongodb/MongoDb.ts
View file

@ -1,19 +1,20 @@
import { MongoClient, ObjectId } from "mongodb"; import { MongoClient, ObjectId } from "mongodb";
import { ITodo } from "../interfaces/ITodo"; import { ITodo } from "../interfaces/ITodo";
import { EnvService } from "../services/EnvService";
const env = require("dotenv").config().parsed;
export class MongoDbModel { export class MongoDbModel {
client: MongoClient; client: MongoClient;
envSerivce: EnvService;
constructor() { constructor() {
this.client = new MongoClient(env.DATABASE_URL); this.envSerivce = EnvService.getInstance();
this.client = new MongoClient(this.envSerivce.getEnvVariable('DATABASE_URL'));
} }
public updateTodoStatus = async (todo: ITodo) => { public updateTodoStatus = async (todo: ITodo) => {
try { try {
await this.client.connect(); await this.client.connect();
const db = this.client.db(env.MONGO_DB_NAME); const db = this.client.db(this.envSerivce.getEnvVariable('MONGO_DB_NAME'));
const todosCollection = db.collection("todos"); const todosCollection = db.collection("todos");
const result = await todosCollection.updateOne( const result = await todosCollection.updateOne(
{ _id: new ObjectId(todo._id) }, { _id: new ObjectId(todo._id) },

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

@ -1,8 +1,7 @@
import amqp, { ConsumeMessage } 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";
import { EnvService } from "../services/EnvService";
const env = require("dotenv").config().parsed;
export class RabbitMQ { export class RabbitMQ {
channel: amqp.Channel; channel: amqp.Channel;
@ -10,8 +9,11 @@ export class RabbitMQ {
exchangeName: string; exchangeName: string;
mongoClient: MongoDbModel; mongoClient: MongoDbModel;
envService: EnvService;
constructor() { constructor() {
this.queueName = env.RABBITMQ_QUEUE_NAME; this.envService = EnvService.getInstance();
this.queueName = this.envService.getEnvVariable('RABBITMQ_QUEUE_NAME');
this.mongoClient = new MongoDbModel(); this.mongoClient = new MongoDbModel();
@ -28,10 +30,10 @@ export class RabbitMQ {
try { try {
const connection = await amqp.connect({ const connection = await amqp.connect({
protocol: "amqp", protocol: "amqp",
hostname: env.RABBITMQ_HOST, hostname: this.envService.getEnvVariable('RABBITMQ_HOST'),
port: parseInt(env.RABBITMQ_PORT), port: parseInt(this.envService.getEnvVariable('RABBITMQ_PORT')),
username: env.RABBITMQ_USERNAME, username: this.envService.getEnvVariable('RABBITMQ_USERNAME'),
password: env.RABBITMQ_PASSWORD, password: this.envService.getEnvVariable('RABBITMQ_PASSWORD'),
}); });
this.channel = await connection.createChannel(); this.channel = await connection.createChannel();
@ -74,32 +76,4 @@ export class RabbitMQ {
} }
}); });
} }
// 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);
// }
} }

25
notification-service/src/services/EnvService.ts Normal file
View file

@ -0,0 +1,25 @@
import dotenv from "dotenv";
// Load environment variables from .env file
dotenv.config();
export class EnvService {
private static instance: EnvService;
private env: any;
private constructor() {
// Get the parsed environment variables
this.env = dotenv.config().parsed;
}
public static getInstance(): EnvService {
if (!EnvService.instance) {
EnvService.instance = new EnvService();
}
return EnvService.instance;
}
public getEnvVariable(name: string): string | undefined {
return this.env[name];
}
}