Merge pull request #6 from luciferreeves/main

wowowow

5 files changed, 27 insertions, 23 deletions

diff --git a/interface/controllers/citizens.controller.js b/interface/controllers/citizens.controller.js
index 0e45a13..3bec103 100644
--- a/interface/controllers/citizens.controller.js
+++ b/interface/controllers/citizens.controller.js
@@ -5,23 +5,26 @@ const { sequelize } = require("../models");
 
 
 // Retrieve all citizens from the database. Limit the number of citizens returned to 10.
-exports.findXCitizens = () => {
-  query = `select c.citizen_id, c.first_name, c.last_name, c.address, c.mobile_num, c.dob, c.gender, c.marital_status, c.village_id, v.village_name  
+exports.findXCitizens = (limit, offset) => {
+  const query = `select c.citizen_id, c.first_name, c.last_name, c.address, c.mobile_num, c.dob, c.gender, c.marital_status, c.village_id, v.village_name  
             from citizens c
             join village_master v
             on c.village_id = v.village_id
-            order by citizen_id limit 10;`;
+            order by citizen_id limit ${limit} offset ${offset};`;
 
   return sequelize.query(query, { type: QueryTypes.SELECT })
 };
 
+exports.getCountOfCitizens = () => {
+  const query = `select count(*) as count from citizens;`;
+  return sequelize.query(query, { type: QueryTypes.SELECT })
+}
 
-exports.deleteCitizenbyId = (citizen_id) =>{
 
+exports.deleteCitizenbyId = (citizen_id) =>{
   return citizens.destroy({
     where: { citizen_id }
   })
-
 };
 
 exports.editCitizen = (citizen_id, address, mobile_num, dob, marital_status) => {
diff --git a/interface/controllers/district.controller.js b/interface/controllers/district.controller.js
index 5b21530..468d5fb 100644
--- a/interface/controllers/district.controller.js
+++ b/interface/controllers/district.controller.js
@@ -10,10 +10,10 @@ exports.allDistricts = () => {
 
 exports.allDistrictsByStateId = (state_id) => {
     const query =`SELECT * FROM district_master WHERE state_id = ${state_id}`;
-    return db.sequelize.query(query, { type: db.sequelize.QueryTypes.SELECT });
+    return db.sequelize.query(query, { type: db.sequelize.QueryTypes.SELECT }).then(districts => {
+        if (districts) {
+            return districts;
+        }
+        return null;
+    });
 };
-
-
-
-
-
diff --git a/interface/controllers/mandal.controller.js b/interface/controllers/mandal.controller.js
index 43842fe..5e4d287 100644
--- a/interface/controllers/mandal.controller.js
+++ b/interface/controllers/mandal.controller.js
@@ -11,6 +11,10 @@ exports.allMandals = () => {
 
 exports.allMandalsByDistrictId = (district_id) => {
     const query =`SELECT * FROM mandal_master WHERE district_id = ${district_id}`;
-    return db.sequelize.query(query, { type: db.sequelize.QueryTypes.SELECT });
-    
+    return db.sequelize.query(query, { type: db.sequelize.QueryTypes.SELECT }).then(mandals => {
+        if (mandals) {
+            return mandals;
+        }
+        return null;
+    });
 };
diff --git a/interface/controllers/state.controller.js b/interface/controllers/state.controller.js
index 1a3a4ed..95bff0d 100644
--- a/interface/controllers/state.controller.js
+++ b/interface/controllers/state.controller.js
@@ -4,10 +4,5 @@ const state = db.state_master;
 // function to get all states
 exports.allStates = () => {
     const query = "SELECT * FROM state_master";
-    return db.sequelize.query(query, { type: db.sequelize.QueryTypes.SELECT });
-    
+    return db.sequelize.query(query, { type: db.sequelize.QueryTypes.SELECT });    
 };
-
-
-
-
diff --git a/interface/controllers/village.controller.js b/interface/controllers/village.controller.js
index 0a488d4..95372fa 100644
--- a/interface/controllers/village.controller.js
+++ b/interface/controllers/village.controller.js
@@ -11,8 +11,10 @@ exports.allVillages = () => {
 
 exports.allVillagesByMandalId = (mandal_id) => {
     const query =`SELECT * FROM village_master WHERE mandal_id = ${mandal_id}`;
-    return db.sequelize.query(query, { type: db.sequelize.QueryTypes.SELECT });
-    
+    return db.sequelize.query(query, { type: db.sequelize.QueryTypes.SELECT }).then(villages => {
+        if (villages) {
+            return villages;
+        }
+        return null;
+    });
 };
-
-