Add city and subdivision filtering to initiative fetching logic

DemocraciaEnRed · Feb 6, 2025 · e10ff5e · e10ff5e
1 parent 122e03e
commit e10ff5e
Show file tree

Hide file tree

Showing 3 changed files with 40 additions and 6 deletions.
diff --git a/controllers/initiativeController.js b/controllers/initiativeController.js
@@ -13,6 +13,8 @@ exports.fetch = async (req, res) => {
     const limit = parseInt(req.query.limit) || 20;
     const queryName = req.query.q || null;
     let dimension = req.query.dimension || null;
+    const city = req.query.city || null;
+    const subdivision = req.query.subdivision || null;
     let includeUnpublished = req.query.includeUnpublished || false;
     const isAdmin = UtilsHelper.isAdmin(req.user);
 
@@ -54,13 +56,13 @@ exports.fetch = async (req, res) => {
     if(dimension) {
       // if it's an array of 2 dimensions, we'll use the getInitiativeIdsByTwoDimensions
       if(Array.isArray(dimension) && dimension.length === 2) {
-        result = await InitiativeHelper.getIdsByTwoDimensions(dimension[0], dimension[1], queryName, includeUnpublished);
+        result = await InitiativeHelper.getIdsByTwoDimensions(dimension[0], dimension[1], queryName, includeUnpublished, city, subdivision);
       }
       else {
-        result = await InitiativeHelper.getInitiativeIdsByOneDimension(dimension, queryName, includeUnpublished);
+        result = await InitiativeHelper.getInitiativeIdsByOneDimension(dimension, queryName, includeUnpublished, city, subdivision);
       }
     } else {
-      result = await InitiativeHelper.getIdsWithoutFilteringByDimensions(queryName, includeUnpublished);
+      result = await InitiativeHelper.getIdsWithoutFilteringByDimensions(queryName, includeUnpublished, city, subdivision);
     }
 
     // get the ids from the result

diff --git a/helpers/initiativeHelper.js b/helpers/initiativeHelper.js
@@ -4,14 +4,16 @@ const { Op, QueryTypes } = require('sequelize');
 const dimension = require('../models/dimension');
 
 
-exports.getInitiativeIdsByOneDimension = async (dimensionId, initiativeName = null, includeUnpublished = false) => {
+exports.getInitiativeIdsByOneDimension = async (dimensionId, initiativeName = null, includeUnpublished = false, cityId = null, subdivisionId = null) => {
   try {
     console.log(dimensionId)
     console.log(initiativeName)
     console.log(includeUnpublished)
     let sqlQuery = `
       SELECT i.id
       FROM Initiatives as i
+      LEFT JOIN Subdivisions s on i.subdivisionId = s.id
+      LEFT JOIN Cities c on s.cityId = c.id
       JOIN InitiativeDimensions IniDim ON i.id = IniDim.initiativeId
       WHERE IniDim.dimensionId = :dimensionId AND :otherConditions
       `;
@@ -24,6 +26,14 @@ exports.getInitiativeIdsByOneDimension = async (dimensionId, initiativeName = nu
       otherConditionsArr.push(`i.name LIKE '%${initiativeName}%'`)
     }
 
+    if(subdivisionId) {
+      otherConditionsArr.push(`i.subdivisionId = ${subdivisionId}`)
+    } else {
+      if(cityId) {
+        otherConditionsArr.push(`c.id = ${cityId}`)
+      }
+    }
+
     if(!includeUnpublished) {
       otherConditionsArr.push(`i.publishedAt IS NOT NULL`)
     }
@@ -49,11 +59,13 @@ exports.getInitiativeIdsByOneDimension = async (dimensionId, initiativeName = nu
   }
 }
 
-exports.getIdsByTwoDimensions = async (dimensionId1, dimensionId2, initiativeName = null, includeUnpublished = false) => {
+exports.getIdsByTwoDimensions = async (dimensionId1, dimensionId2, initiativeName = null, includeUnpublished = false, cityId = null, subdivisionId = null) => {
   try {
     let sqlQuery = `
       SELECT i.id
       FROM Initiatives i
+      LEFT JOIN Subdivisions s on i.subdivisionId = s.id
+      LEFT JOIN Cities c on s.cityId = c.id
       JOIN InitiativeDimensions IniDim1 ON i.id = IniDim1.initiativeId
       JOIN InitiativeDimensions IniDim2 ON i.id = IniDim2.initiativeId
       WHERE IniDim1.dimensionId = :dimensionId1
@@ -74,6 +86,14 @@ exports.getIdsByTwoDimensions = async (dimensionId1, dimensionId2, initiativeNam
     if(initiativeName) {
       otherConditionsArr.push(`i.name LIKE '%${initiativeName}%'`)
     }
+
+    if(subdivisionId) {
+      otherConditionsArr.push(`i.subdivisionId = ${subdivisionId}`)
+    } else {
+      if(cityId) {
+        otherConditionsArr.push(`c.id = ${cityId}`)
+      }
+    }
 
     if(!includeUnpublished) {
       otherConditionsArr.push(`i.publishedAt IS NOT NULL`)
@@ -97,12 +117,14 @@ exports.getIdsByTwoDimensions = async (dimensionId1, dimensionId2, initiativeNam
   }
 }
 
-exports.getIdsWithoutFilteringByDimensions = async (initiativeName = null, includeUnpublished = false) => {
+exports.getIdsWithoutFilteringByDimensions = async (initiativeName = null, includeUnpublished = false, cityId = null, subdivisionId = null) => {
 
   try {
     let sqlQuery = `
       SELECT i.id
       FROM Initiatives as i
+      LEFT JOIN Subdivisions s on i.subdivisionId = s.id
+      LEFT JOIN Cities c on s.cityId = c.id
       WHERE :otherConditions
     `;  
 
@@ -113,6 +135,14 @@ exports.getIdsWithoutFilteringByDimensions = async (initiativeName = null, inclu
       otherConditionsArr.push(`i.name LIKE '%${initiativeName}%'`)
     }
 
+    if(subdivisionId) {
+      otherConditionsArr.push(`i.subdivisionId = ${subdivisionId}`)
+    } else {
+      if(cityId) {
+        otherConditionsArr.push(`c.id = ${cityId}`)
+      }
+    }
+
     if(!includeUnpublished) {
       otherConditionsArr.push(`i.publishedAt IS NOT NULL`)
     }

diff --git a/routes/initiative.js b/routes/initiative.js
@@ -24,6 +24,8 @@ router.get('/',
     query('limit').optional().isInt().withMessage(msg.validationError.integer),
     query('dimension.*').optional().isInt().withMessage(msg.validationError.integer),
     query('includeUnpublished').optional().isBoolean().withMessage(msg.validationError.string),
+    query('city').optional().isInt().withMessage(msg.validationError.integer),
+    query('subdivision').optional().isInt().withMessage(msg.validationError.string),
     query('q').optional().isString().withMessage(msg.validationError.string),
   ], 
   validate,