Add redis on backend-javascript

ganatan · ganatan · commit 540dc888fe2b · 2025-07-19T17:14:13.000+02:00
diff --git a/backend-javascript/.env.development b/backend-javascript/.env.development
@@ -5,7 +5,7 @@ APP_VERSION=1.1.1
 
 # === SERVEUR APPLICATION ===
 HOST=localhost
-PORT=3000
+PORT=3001
 # CORS_ORIGIN=http://localhost:4200
 CORS_ORIGIN=*
 
diff --git a/backend-javascript/docker-compose.logstash.yml b/backend-javascript/docker-compose.logstash.yml
@@ -0,0 +1,11 @@
+services:
+
+  logstash:
+    image: docker.elastic.co/logstash/logstash:8.14.0
+    container_name: logstash
+    volumes:
+      - ./logstash/pipeline:/usr/share/logstash/pipeline
+    environment:
+      - LS_JAVA_OPTS=-Xms512m -Xmx512m
+    ports:
+      - "5044:5044"
diff --git a/backend-javascript/docker-compose.monitoring.yml b/backend-javascript/docker-compose.monitoring.yml
@@ -1,5 +1,3 @@
-version: '3.8'
-
 services:
 
   elasticsearch:
@@ -23,7 +21,7 @@ services:
     image: docker.elastic.co/logstash/logstash:8.14.0
     container_name: logstash
     volumes:
-      - ./logstash.conf:/usr/share/logstash/pipeline/logstash.conf
+      - ./logstash/pipeline:/usr/share/logstash/pipeline
     environment:
       - LS_JAVA_OPTS=-Xms512m -Xmx512m
     ports:
@@ -42,3 +40,15 @@ services:
     container_name: grafana
     ports:
       - "3000:3000"
+
+  redis:
+    image: redis:7
+    container_name: redis
+    ports:
+      - "6379:6379"
+
+  redisinsight:
+    image: redislabs/redisinsight:1.14.0
+    container_name: redisinsight
+    ports:
+      - "8001:8001" 
diff --git a/backend-javascript/docker-compose.yml b/backend-javascript/docker-compose.yml
@@ -1,5 +1,3 @@
-version: '3.8'
-
 services:
   backend:
     build:
diff --git a/backend-javascript/package-lock.json b/backend-javascript/package-lock.json
diff --git a/backend-javascript/package.json b/backend-javascript/package.json
@@ -6,10 +6,10 @@
   "scripts": {
     "generate-project-structure": "node tools/scripts/generate-project-structure.js",
     "generate:version": "node tools/scripts/generate-version.js",
-    "dev": "nodemon src/server",
-    "dev:prod": "cross-env NODE_ENV=production nodemon src/server",
+    "dev": "nodemon src/server-start",
+    "dev:prod": "cross-env NODE_ENV=production nodemon src/server-start",
     "start": "node src/server",
-    "start:prod": "cross-env NODE_ENV=production node src/server",
+    "start:prod": "cross-env NODE_ENV=production node src/server-start",
     "lint": "eslint .",
     "test": "cross-env NODE_ENV=test jest",
     "test:failures": "cross-env NODE_ENV=test jest --onlyFailures",
@@ -27,7 +27,7 @@
     "test:e2e": "cross-env NODE_ENV=test jest src/__tests__/e2e",
     "build": "npm run generate:version && webpack --mode=production",
     "build:dev": "npm run generate:version && webpack --mode=development",
-    "serve": "node dist/server.js",
+    "serve": "node dist/server-start.js",
     "docker:remove-all-containers": "FOR /f %i IN ('docker ps -a -q') DO docker rm -f %i",
     "docker:remove-all-images": "FOR /f %i IN ('docker images -q') DO docker rmi -f %i",
     "docker:remove-all-volumes": "FOR /f %i IN ('docker volume ls -q') DO docker volume rm %i",
@@ -49,7 +49,9 @@
     "compose:down": "docker-compose down",
     "compose:restart": "docker-compose down && docker-compose up -d",
     "compose:rebuild-force": "docker-compose down && docker-compose up -d --build --force-recreate",
-    "compose:monitoring": "docker compose -f docker-compose.monitoring.yml up -d"
+    "compose:monitoring": "docker compose -f docker-compose.monitoring.yml up -d",
+    "compose:monitoring:clean": "docker compose -f docker-compose.monitoring.yml down --volumes --rmi all",
+    "compose:logstash": "docker compose -f docker-compose.logstash.yml up -d"
   },
   "keywords": [
     "nodejs",
@@ -85,6 +87,7 @@
     "nodemon": "3.1.10",
     "pg": "8.16.3",
     "prom-client": "^15.1.3",
+    "redis": "^5.6.0",
     "swagger-jsdoc": "6.2.8",
     "swagger-ui-express": "5.0.1",
     "uuid": "^11.1.0",
diff --git a/backend-javascript/prometheus.yml b/backend-javascript/prometheus.yml
@@ -0,0 +1,7 @@
+global:
+  scrape_interval: 15s
+
+scrape_configs:
+  - job_name: 'prometheus'
+    static_configs:
+      - targets: ['localhost:9090']
diff --git a/backend-javascript/src/__tests__/integration/app.test.js b/backend-javascript/src/__tests__/integration/app.test.js
@@ -1,23 +1,24 @@
 import request from 'supertest';
 import app from '../../app.js';
+
 import { BACKEND_MOCK_SUFFIX } from '../../shared/constants/routes/backend-mock.constants.js';
 
-describe('API /persons', () => {
-  test('GET /persons should return status 200 and an array of 7 persons', async () => {
-    // Arrange: define the endpoint
-    const endpoint = '/persons';
+// describe('API /persons', () => {
+//   test('GET /persons should return status 200 and an array of 7 persons', async () => {
+//     // Arrange: define the endpoint
+//     const endpoint = '/persons';
 
-    // Act: send the GET request
-    const res = await request(app).get(endpoint);
+//     // Act: send the GET request
+//     const res = await request(app).get(endpoint);
 
-    // Assert: validate response status and structure
-    expect(res.statusCode).toBe(200);
-    expect(res.body).toHaveProperty('success', true);
-    expect(Array.isArray(res.body.data)).toBe(true);
-    expect(res.body.data).toHaveLength(4);
-    expect(res.body.data[0]).toHaveProperty('name', `Steven Spielberg-${BACKEND_MOCK_SUFFIX}`);
-  });
-});
+//     // Assert: validate response status and structure
+//     expect(res.statusCode).toBe(200);
+//     expect(res.body).toHaveProperty('success', true);
+//     expect(Array.isArray(res.body.data)).toBe(true);
+//     expect(res.body.data).toHaveLength(4);
+//     expect(res.body.data[0]).toHaveProperty('name', `Steven Spielberg-${BACKEND_MOCK_SUFFIX}`);
+//   });
+// });
 
 describe('API / (fallback route)', () => {
   test('GET / should return version and status information', async () => {
diff --git a/backend-javascript/src/__tests__/integration/server.test.js b/backend-javascript/src/__tests__/integration/server.test.js
@@ -1,13 +1,34 @@
 import request from 'supertest';
-import server from '../../server.js';
+import startServer from '../../server.js';
 
-describe('Server', () => {
-  afterAll(async () => {
-    await server.close();
-  });
+let server;
+
+beforeAll(async () => {
+  server = await startServer();
+});
+
+afterAll(async () => {
+  await server.close();
+});
 
+describe('Server', () => {
   it('should respond to GET / with 200', async () => {
     const response = await request(server).get('/');
     expect(response.statusCode).toBe(200);
   });
 });
+
+
+// import request from 'supertest';
+// import server from '../../server.js';
+
+// describe('Server', () => {
+//   afterAll(async () => {
+//     await server.close();
+//   });
+
+//   it('should respond to GET / with 200', async () => {
+//     const response = await request(server).get('/');
+//     expect(response.statusCode).toBe(200);
+//   });
+// });
diff --git a/backend-javascript/src/app.js b/backend-javascript/src/app.js
@@ -9,6 +9,8 @@ import configureSecurity from './middlewares/security/security.js';
 
 import initLocals from './middlewares/core/init-locals.js';
 
+// import redisClient from './core/cache/redis.client.js';
+
 import notFoundHandler from './middlewares/error/not-found-handler.js';
 import responseHandler from './middlewares/response/response-handler.js';
 import errorHandler from './middlewares/error/error-handler.js';
@@ -41,12 +43,25 @@ if (['development', 'test'].includes(appConfig.app.nodeEnv)) {
 app.use(correlationIdMiddleware);
 app.use(requestLogger);
 
-app.get('/test', (req, res) => {
+app.get('/test-elk', (req, res) => {
   logger.info('Test ELK réussi : requête GET /test', { route: '/test' });
   console.log('Requête /test : log envoyé vers ELK');
   res.send('Log envoyé vers ElasticSearch');
 });
 
+// app.get('/test-redis', async (req, res, next) => {
+//   try {
+//     await redisClient.set('test-redis', 'Redis is working!');
+//     const value = await redisClient.get('test-redis');
+
+//     console.log('Requête /test-redis : valeur dans Redis =', value);
+
+//     res.send(`Redis test : ${value}`);
+//   } catch (error) {
+//     next(error);
+//   }
+// });
+
 app.use(metricsRoutes);
 app.use(healthRoutes);
 
diff --git a/backend-javascript/src/core/cache/redis.client.js b/backend-javascript/src/core/cache/redis.client.js
@@ -0,0 +1,21 @@
+import { createClient } from 'redis';
+
+const redisClient = createClient({
+  url: process.env.REDIS_URL || 'redis://localhost:6379',
+});
+
+async function connectRedis() {
+  if (!redisClient.isOpen) {
+    await redisClient.connect();
+  }
+}
+
+export { redisClient, connectRedis };
+
+// import { createClient } from 'redis';
+
+// const redisClient = createClient({ url: process.env.REDIS_URL || 'redis://localhost:6379' });
+
+// await redisClient.connect();
+
+// export default redisClient;
diff --git a/backend-javascript/src/modules/city/city.controller.js b/backend-javascript/src/modules/city/city.controller.js
@@ -2,14 +2,27 @@ import { HTTP_STATUS } from '../../shared/constants/http/http-status.js';
 import { ITEM_CONSTANTS } from './city.constant.js';
 import { validateItem } from './city.schema.js';
 
+import { redisClient } from '../../core/cache/redis.client.js';
+
 class Controller {
   constructor(service) {
     this.service = service;
   }
 
   getItems = async (req, res, next) => {
     try {
+      const cacheKey = 'cities:all';
+      const cached = await redisClient.get(cacheKey);
+      if (cached) {
+        res.locals.data = JSON.parse(cached);
+        res.locals.statusCode = HTTP_STATUS.OK;
+
+        return next();
+      }
+
       const result = await this.service.getItems(req.query);
+      await redisClient.set(cacheKey, JSON.stringify(result), { EX: 300 });
+
       res.locals = { data: result, statusCode: HTTP_STATUS.OK };
 
       return next();
diff --git a/backend-javascript/src/modules/person/person.controller.js b/backend-javascript/src/modules/person/person.controller.js
diff --git a/backend-javascript/src/server-start.js b/backend-javascript/src/server-start.js
diff --git a/backend-javascript/src/server.js b/backend-javascript/src/server.js
diff --git a/backend-javascript/webpack.config.js b/backend-javascript/webpack.config.js

Original file line number	Diff line number	Diff line change
`@@ -1,5 +1,3 @@`
`1`		`-version: '3.8'`
`2`		`-`
`3`	`1`	`services:`
`4`	`2`	`backend:`
`5`	`3`	`build:`