1 files changed, 26 insertions, 4 deletions
diff --git a/interface/controllers/citizens.controller.js b/interface/controllers/citizens.controller.js
index b50ee74..9eaf153 100644
--- a/interface/controllers/citizens.controller.js
+++ b/interface/controllers/citizens.controller.js
@@ -1,21 +1,43 @@
+const req = require("express/lib/request");
 const db = require("../models");
 const citizens = db.citizens;
+const village_master = db.village_master;
+const {QueryTypes} = require('sequelize');
+const { sequelize } = require("../models");
+
 
 // Retrieve all citizens from the database. Limit the number of citizens returned to 10.
 exports.findXCitizens = () => {
+  /**
+   * select c.first_name, c.last_name, c.address, c.mobile_num, c.dob, c.gender, c.marital_status, v.village_name  
+    from citizens c
+    join village_master v
+    on c.village_id = v.village_id
+    limit 10
+   */   
   const limit = 10;
-  return citizens.findAll({
-    limit: limit,
-  });
+  // Raw query in Sequelize 
+
+  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
+            limit 10`
+
+  return sequelize.query(query, { type: QueryTypes.SELECT })
 };
 
+
+
+
+
 // Get total number of male and female citizens
 exports.findGenderDistribution = () => {
   // group by the 'gender' column
 
   /**
    * This code is equivalent to the following SQL query:
-   * select count(gender), gender from citizens group by gender;
+   * select count(gender), gender from citizens group by gender ;
    */
 
   return citizens.findAll({