From d71f3e4a007c062c1b88429f87b52c9a2f6e3837 Mon Sep 17 00:00:00 2001
From: Onja <onja.nmoh@gmail.com>
Date: Wed, 11 Oct 2023 15:35:24 +0300
Subject: [PATCH] Refactor event names in socket listeners to include event
 name from data

---
 src/assets/js/main.js           |  5 +++--
 src/subscribers/ioSubscriber.js | 14 +++++++-------
 2 files changed, 10 insertions(+), 9 deletions(-)

diff --git a/src/assets/js/main.js b/src/assets/js/main.js
index 6fecf74..73c7bc0 100644
--- a/src/assets/js/main.js
+++ b/src/assets/js/main.js
@@ -142,12 +142,13 @@ const initSocket = () => {
   ];
   for(let event of events) {
     socket.on(event, function(data) {
-      if (event.includes('error')) {
+      let eventName = data.event || event;
+      if (eventName.includes('error')) {
         toastr.error(data.message);
         return;
       }
 
-      if (event === 'parse.end' && data.generated) {
+      if (eventName === 'parse.end' && data.generated) {
         const $form__result = $('#form__result');
         $form__result.removeClass('d-none');
         $form__result.find('a').attr('href', `/csv/${data.generated}`)
diff --git a/src/subscribers/ioSubscriber.js b/src/subscribers/ioSubscriber.js
index f41d0dc..e4dcd2c 100644
--- a/src/subscribers/ioSubscriber.js
+++ b/src/subscribers/ioSubscriber.js
@@ -3,23 +3,23 @@ const emitter = require('../services/eventEmitter');
 const configure = (socket) => {
   // Create a new listener for the download.start event
   emitter.on('download.start', ({ url, filepath }) => {
-    socket.emit('download.start', { message: 'Début de téléchargement' });
+    socket.emit('download.start', { event: 'download.start', message: 'Début de téléchargement' });
   });
 
   // Create a new listener for the download.end event
   emitter.on('download.end', ({ url, filepath }) => {
-    socket.emit('download.end', { message: 'Téléchargement terminé' });
+    socket.emit('download.end', { event: 'download.end', message: 'Téléchargement terminé' });
   });
 
   // Create a new listener for the download.error event
   emitter.on('download.error', ({ url, filepath, error, type }) => {
-    socket.emit('download.error', { error, type, message: 'Erreur lors du téléchargement' });
+    socket.emit('download.error', { event: 'download.error', error, type, message: 'Erreur lors du téléchargement' });
   });
 
   // Create a new listener for the download.progress event
   emitter.on('download.progress', ({ url, filepath, downloaded }) => {
     downloaded = (Math.floor(downloaded / 1024 / 1024 * 100) / 100).toLocaleString();
-    socket.emit('download.progress', { downloaded, message: `[${downloaded} Mo] téléchargés` });
+    socket.emit('download.progress', { event: 'download.progress', downloaded, message: `[${downloaded} Mo] téléchargés` });
   });
 
 
@@ -27,17 +27,17 @@ const configure = (socket) => {
   
   // Create a new listener for the parse start event
   emitter.on('parse.start', ({ filepath, columns, headers, result }) => {
-    socket.emit('parse.start', { message: 'Début de traitement' });
+    socket.emit('parse.start', { event: 'parse.start', message: 'Début de traitement' });
   });
 
   // Create a new listener for the parse.end event
   emitter.on('parse.end', ({ filepath, columns, count, generated }) => {
-    socket.emit('parse.end', { message: 'Traitement terminé', generated });
+    socket.emit('parse.end', { event: 'parse.end', message: 'Traitement terminé', generated });
   });
 
   // Create a new listener for the parse.error event
   emitter.on('parse.error', ({ filepath, columns, error }) => {
-    socket.emit('parse.error', { message: 'Erreur lors du traitement' });
+    socket.emit('parse.error', { event: 'parse.error', message: 'Erreur lors du traitement' });
   });
 }