refactor: adaptar métodos de leitura de outros dados eleitorais com a…

… simplificação

backend/public/src/controllers/election-data.controller.js

@@ -2,35 +2,46 @@ const router = require('express').Router();
 const election_data_repository = require('../database/repository/election-data.repository');
 
 router.get("/find_by_merkletree_index_range", async  (req, res) => {
-  const data_name = req.query.data_name
+  const tree_name = req.query.tree_name
   const initial_index = req.query.initial_index
   const final_index = req.query.final_index
 
-  console.info(`[election-data.controller] GET /find_by_merkletree_index_range ${data_name} ${initial_index} ${final_index}`)
+  console.info(`[election-data.controller] GET /find_by_merkletree_index_range ${tree_name} ${initial_index} ${final_index}`)
 
-  const data = await election_data_repository.findByMerkletreeIndexRange(data_name, initial_index, final_index)
+  const data = await election_data_repository.findByMerkletreeIndexRange(tree_name, initial_index, final_index)
 
   res.json(data)
 })
 
 router.get("/find_by_id", async (req, res) => {
     const id = req.query.id
-    const data_name = req.query.data_name
+    const tree_name = req.query.tree_name
 
-    console.info(`[election-data.controller] GET /find_by_id ${data_name} ${id}`)
+    console.info(`[election-data.controller] GET /find_by_id ${tree_name} ${id}`)
 
-    const data = await election_data_repository.findById(data_name, id)
+    const data = await election_data_repository.findById(tree_name, id)
+
+    res.json(data)
+})
+
+router.get("/find_by_filename", async (req, res) => {
+    const filename = req.query.filename
+    const tree_name = req.query.tree_name
+
+    console.info(`[election-data.controller] GET /find_by_filename ${tree_name} ${filename}`)
+
+    const data = await election_data_repository.findByFilename(tree_name, filename)
 
     res.json(data)
 })
 
 router.get("/download", async (req, res) => {
     const id = req.query.id
-    const data_name = req.query.data_name
+    const tree_name = req.query.tree_name
 
-    console.info(`[election-data.controller] GET /download ${data_name} ${id}`)
+    console.info(`[election-data.controller] GET /download ${tree_name} ${id}`)
 
-    const data = await election_data_repository.findById(data_name, id)
+    const data = await election_data_repository.findById(tree_name, id)
 
     if (!data) {
       res.status(404).send('Not Found')

backend/public/src/database/models/election-data.model.js

@@ -2,15 +2,12 @@ const mongoose = require("mongoose");
 const {merkletree_info} = require("./merkletree-info.model");
 
 const schema_election_data = new mongoose.Schema({
-    data_name: String,
-    filename: String,
+    file_name: String,
     data: Buffer,
     merkletree_info: { type: Object, of: merkletree_info },
-    zona: Number,
-    secao: Number,
-    eleicoes: [Number],
 });
 
+schema_election_data.index({ "file_name": 1 });
 schema_election_data.index({ "merkletree_info.$**": 1 });
 
 module.exports = { schema_election_data }

backend/public/src/database/repository/election-data.repository.js

@@ -2,8 +2,8 @@ const mongoose = require("mongoose");
 const { schema_election_data } = require("../models/election-data.model")
 
 
-exports.findById = async (data_name, id) => {
-    const repository = mongoose.model(data_name, schema_election_data, data_name);
+exports.findById = async (tree_name, id) => {
+    const repository = mongoose.model(tree_name, schema_election_data, tree_name);
     return await repository.findOne({ _id: id })
     .then((data) => {
         data._doc.data = Buffer.from(data.data, 'base64').toString('base64')
@@ -14,13 +14,25 @@ exports.findById = async (data_name, id) => {
     })
 }
 
-exports.findByMerkletreeIndexRange = async (data_name, initial_index, final_index) => {
-    const repository = mongoose.model(data_name, schema_election_data, data_name);
+exports.findByMerkletreeIndexRange = async (tree_name, initial_index, final_index) => {
+    const repository = mongoose.model(tree_name, schema_election_data, tree_name);
     return await repository.find({ "merkletree_info.index": { $gte: parseInt(initial_index), $lte: parseInt(final_index) } }, { data: 0 })
         .then((data) => {
             return data;
         })
         .catch((err) => {
             console.error(`[ERROR][election-data.repository] ${err}`);
         });
-};
+};
+
+exports.findByFilename = async (tree_name, filename) => {
+    const repository = mongoose.model(tree_name, schema_election_data, tree_name);
+    return await repository.findOne({ file_name: filename })
+        .then((data) => {
+            data._doc.data = Buffer.from(data.data, 'base64').toString('base64')
+            return data
+        })
+        .catch((err) => {
+            console.error(`[ERROR][election-data.repository] ${err}`)
+        })
+}