From ec022468ca26243ec7c09811e46ae2b594924a01 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Val=C3=A8re=20Pique?= Date: Tue, 11 Feb 2025 11:46:41 +0100 Subject: [PATCH] feat(tracking): move some code out of service --- packages/backend/src/helpers/tracking.js | 23 ++++++++++++++++++ .../backend/src/middlewares/trackBoUser.js | 2 +- packages/backend/src/middlewares/trackEig.js | 2 +- .../backend/src/middlewares/trackFoUser.js | 2 +- packages/backend/src/routes/bo-user.js | 2 +- packages/backend/src/routes/eig.js | 2 +- packages/backend/src/routes/user.js | 2 +- packages/backend/src/services/Tracking.js | 24 ------------------- 8 files changed, 29 insertions(+), 30 deletions(-) create mode 100644 packages/backend/src/helpers/tracking.js diff --git a/packages/backend/src/helpers/tracking.js b/packages/backend/src/helpers/tracking.js new file mode 100644 index 00000000..95a87dc7 --- /dev/null +++ b/packages/backend/src/helpers/tracking.js @@ -0,0 +1,23 @@ +const actions = { + creation: "CREATION", + deactivation: "DEACTIVATION", + deletion: "DELETION", + modification: "MODIFICATION", +}; + +module.exports.actions = actions; + +const entities = { + eig: "EIG", + userBack: "USER_BACK", + userFront: "USER_FRONT", +}; + +module.exports.entities = entities; + +const userTypes = { + back: "BACK", + front: "FRONT", +}; + +module.exports.userTypes = userTypes; diff --git a/packages/backend/src/middlewares/trackBoUser.js b/packages/backend/src/middlewares/trackBoUser.js index 234736c8..d3664a4d 100644 --- a/packages/backend/src/middlewares/trackBoUser.js +++ b/packages/backend/src/middlewares/trackBoUser.js @@ -1,4 +1,4 @@ -const { actions } = require("../services/Tracking"); +const { actions } = require("../helpers/tracking"); const boUser = require("../services/BoUser"); function trackFoUser({ action, userType, itself }) { diff --git a/packages/backend/src/middlewares/trackEig.js b/packages/backend/src/middlewares/trackEig.js index 25832f40..40b13c28 100644 --- a/packages/backend/src/middlewares/trackEig.js +++ b/packages/backend/src/middlewares/trackEig.js @@ -1,4 +1,4 @@ -const { actions } = require("../services/Tracking"); +const { actions } = require("../helpers/tracking"); const eigService = require("../services/eig"); function trackEig({ action, userType }) { diff --git a/packages/backend/src/middlewares/trackFoUser.js b/packages/backend/src/middlewares/trackFoUser.js index 435d288f..ef8804da 100644 --- a/packages/backend/src/middlewares/trackFoUser.js +++ b/packages/backend/src/middlewares/trackFoUser.js @@ -1,4 +1,4 @@ -const { actions } = require("../services/Tracking"); +const { actions } = require("../helpers/tracking"); const foUser = require("../services/User"); function trackFoUser({ action, userType, itself }) { diff --git a/packages/backend/src/routes/bo-user.js b/packages/backend/src/routes/bo-user.js index f5b0d798..414f0fa7 100644 --- a/packages/backend/src/routes/bo-user.js +++ b/packages/backend/src/routes/bo-user.js @@ -9,7 +9,7 @@ const checkTerrForAccountCreation = require("../middlewares/bo-check-terr-for-ac const getDepartements = require("../middlewares/getDepartements"); const trackBoUser = require("../middlewares/trackBoUser"); -const { actions, userTypes } = require("../services/Tracking"); +const { actions, userTypes } = require("../helpers/tracking"); const BOcheckRoleCompte = BOcheckRole(["Compte"]); diff --git a/packages/backend/src/routes/eig.js b/packages/backend/src/routes/eig.js index f156c09d..96bbd153 100644 --- a/packages/backend/src/routes/eig.js +++ b/packages/backend/src/routes/eig.js @@ -9,7 +9,7 @@ const boCheckRole = require("../middlewares/bo-check-role"); const boCheckJWT = require("../middlewares/bo-check-JWT"); const trackEig = require("../middlewares/trackEig"); -const { actions, userTypes } = require("../services/Tracking"); +const { actions, userTypes } = require("../helpers/tracking"); const { eigController } = require("../controllers"); const getDepartements = require("../middlewares/getDepartements"); diff --git a/packages/backend/src/routes/user.js b/packages/backend/src/routes/user.js index 859b3f6f..d646b2b5 100644 --- a/packages/backend/src/routes/user.js +++ b/packages/backend/src/routes/user.js @@ -5,7 +5,7 @@ const router = express.Router(); const checkJWT = require("../middlewares/checkJWT"); const userController = require("../controllers/user"); const trackFoUser = require("../middlewares/trackFoUser"); -const { actions, userTypes } = require("../services/Tracking"); +const { actions, userTypes } = require("../helpers/tracking"); // Gère une connexion via mot de passe. router.get("/me", checkJWT, userController.getMe); diff --git a/packages/backend/src/services/Tracking.js b/packages/backend/src/services/Tracking.js index 68b7dc7d..6f8c31b5 100644 --- a/packages/backend/src/services/Tracking.js +++ b/packages/backend/src/services/Tracking.js @@ -1,29 +1,5 @@ const pool = require("../utils/pgpool").getPool(); -const actions = { - creation: "CREATION", - deactivation: "DEACTIVATION", - deletion: "DELETION", - modification: "MODIFICATION", -}; - -module.exports.actions = actions; - -const entities = { - eig: "EIG", - userBack: "USER_BACK", - userFront: "USER_FRONT", -}; - -module.exports.entities = entities; - -const userTypes = { - back: "BACK", - front: "FRONT", -}; - -module.exports.userTypes = userTypes; - const query = { add: ` INSERT INTO tracking_actions (entity, entity_id, action, data, user_id, user_type)