Merge pull request #6 from luciferreeves/main

wowowow

3 files changed, 125 insertions, 73 deletions

diff --git a/interface/routes/api/citizens.js b/interface/routes/api/citizens.js
index 40e0c16..c6c6425 100644
--- a/interface/routes/api/citizens.js
+++ b/interface/routes/api/citizens.js
@@ -3,78 +3,119 @@ const router = express.Router();
 
 const citizensController = require("../../controllers/citizens.controller");
 
-router.post('/edit', (req, res) => {
-    const { citizen_id, address, mobile_num, dob, marital_status } = req.body;
-    if (!citizen_id || !address || !mobile_num || !dob || !marital_status) {
-        res.status(400).json({ message: "Please fill in all fields" });
-    } else {
-        citizensController.editCitizen(citizen_id, address, mobile_num, dob, marital_status)
-            .then(() => {
-                res.status(200).json({ message: "Citizen updated successfully" });
-            })
-            .catch((err) => {
-                res.status(400).json({ message: err });
-            });
-    }
+router.get('/count', (req, res) => {
+  citizensController.getCountOfCitizens().then(count => {
+    res.json({ count });
+  });
 });
 
-
-router.post('/delete', (req, res) => {
-    const { citizen_id } = req.body;
-    if (!citizen_id) {
-        res.status(400).json({ message: "Please fill in all fields" });
-    } else {
-        citizensController.deleteCitizenbyId(citizen_id)
-            .then(() => {
-                res.status(200).json({ message: "Citizen deleted successfully" });
-            })
-            .catch((err) => {
-                res.status(400).json({ message: err });
-            });
-    }
-} );
-
-
-router.post('/validate', (req, res) => {
-    const { citizen_id } = req.body;
-    if (!citizen_id) {
-        res.status(400).json({ message: "Please fill in all fields" });
-    } else {
-        citizensController.checkCitizenId(citizen_id)
-            .then(( isValid ) => {
-                res.status(200).json({ isValid: !isValid });
-            }       
-    )
-    .catch((err) => {
-                res.status(400).json({ message: err });
-            });
-    }
+router.post("/edit", (req, res) => {
+  const { citizen_id, address, mobile_num, dob, marital_status } = req.body;
+  if (!citizen_id || !address || !mobile_num || !dob || !marital_status) {
+    res.status(400).json({ message: "Please fill in all fields" });
+  } else {
+    citizensController
+      .editCitizen(citizen_id, address, mobile_num, dob, marital_status)
+      .then(() => {
+        res.status(200).json({ message: "Citizen updated successfully" });
+      })
+      .catch((err) => {
+        res.status(400).json({ message: err });
+      });
+  }
 });
 
-
-router.post('/addnewcitizen', (req, res) => {
-    const { citizen_id, first_name, last_name, address, mobile_num, dob, gender, marital_status, disabled, disbaled_percentage, caste, village_id} = req.body;
-
-    if(!citizen_id && !first_name && !last_name && !address && !mobile_num && !dob && !gender && !marital_status && !disabled && !caste && !village_id){
-
-        res.status(400).json({ message: "Please fill in all fields" });
-
-    }else{
-        citizensController.addNewCitizen(citizen_id, first_name, last_name, address, mobile_num, dob, gender, marital_status, disabled, disbaled_percentage, caste, village_id).then(() => {
-            res.status(200).json({ message: "Citizen added successfully" });
-        }).catch((err) => {
-            res.status(400).json({ message: err });
-        });
-    }
-
+router.post("/delete", (req, res) => {
+  const { citizen_id } = req.body;
+  if (!citizen_id) {
+    res.status(400).json({ message: "Please fill in all fields" });
+  } else {
+    citizensController
+      .deleteCitizenbyId(citizen_id)
+      .then(() => {
+        res.status(200).json({ message: "Citizen deleted successfully" });
+      })
+      .catch((err) => {
+        res.status(400).json({ message: err });
+      });
+  }
 });
 
+router.post("/validate", (req, res) => {
+  const { citizen_id } = req.body;
+  if (!citizen_id) {
+    res.status(400).json({ message: "Please fill in all fields" });
+  } else {
+    citizensController
+      .checkCitizenId(citizen_id)
+      .then((isValid) => {
+        res.status(200).json({ isValid: !isValid });
+      })
+      .catch((err) => {
+        res.status(400).json({ message: err });
+      });
+  }
+});
 
+router.post("/addnewcitizen", (req, res) => {
+  let {
+    citizen_id,
+    first_name,
+    middle_name,
+    last_name,
+    address,
+    mobile_num,
+    dob,
+    gender,
+    marital_status,
+    disabled,
+    disbaled_percentage,
+    caste,
+    village_id,
+  } = req.body;
+
+  if (!disbaled_percentage) {
+    disbaled_percentage = 0.0;
+  }
+
+  if (
+    !citizen_id ||
+    !first_name ||
+    !last_name ||
+    !address ||
+    !mobile_num ||
+    !dob ||
+    !gender ||
+    !marital_status ||
+    !disabled ||
+    !caste ||
+    !village_id
+  ) {
+    res.status(400).json({ message: "Please fill in all fields" });
+  } else {
+    citizensController
+      .addNewCitizen(
+        citizen_id,
+        first_name,
+        last_name,
+        address,
+        mobile_num,
+        dob,
+        gender,
+        marital_status,
+        disabled,
+        disbaled_percentage,
+        caste,
+        village_id
+      )
+      .then(() => {
+        res.status(200).json({ message: "Citizen added successfully" });
+      })
+      .catch((err) => {
+        console.log(err);
+        res.status(400).json({ message: err });
+      });
+  }
+});
 
-
-
-    
-
-
-
-module.exports = router;
\ No newline at end of file
+module.exports = router;
diff --git a/interface/routes/api/geography.js b/interface/routes/api/geography.js
index 4667db8..58e3b84 100644
--- a/interface/routes/api/geography.js
+++ b/interface/routes/api/geography.js
@@ -9,27 +9,38 @@ const districtController = require("../../controllers/district.controller");
 router.get("/states", (req, res) => {
     stateController.allStates().then(states => {
         res.send(states);        
-        });
-
+    });
 });
 
 router.get("/districts/:state_id", (req, res) => {
     const state_id = req.params.state_id;
     districtController.allDistrictsByStateId(state_id).then(districts => {
-        res.send(districts);
+        if (districts) {
+            res.send(districts);
+        } else {
+            res.status(400).json({ message: "No districts found" });
+        }
     });
 });
 router.get("/mandals/:district_id", (req, res) => {
     const district_id = req.params.district_id;
     mandalController.allMandalsByDistrictId(district_id).then(mandals => {
-        res.send(mandals);
+        if (mandals) {
+            res.send(mandals);
+        } else {
+            res.status(400).json({ message: "No mandals found" });
+        }
     });
 });
 
 router.get("/villages/:mandal_id", (req, res) => {
     const mandal_id = req.params.mandal_id;
     villageController.allVillagesByMandalId(mandal_id).then(villages => {
-        res.send(villages);
+        if (villages) {
+            res.send(villages);
+        } else {
+            res.status(400).json({ message: "No villages found" });
+        }
     });
 });
 
diff --git a/interface/routes/api/index.js b/interface/routes/api/index.js
index f21720b..b8ae7ca 100644
--- a/interface/routes/api/index.js
+++ b/interface/routes/api/index.js
@@ -64,7 +64,7 @@ router.post("/login", (req, res) => {
         payload,
         process.env.JWT_SECRET,
         {
-          expiresIn: 3600,
+          expiresIn: 60 * 60 * 24 * 7,
         },
         (err, token) => {
           if (err) throw err;