From d504f6417584384fce75c2f69bde0f1938ee452d Mon Sep 17 00:00:00 2001
From: vincentoti <v.oti@capshalltechnologies.com>
Date: Tue, 30 Aug 2022 09:58:37 +0100
Subject: [PATCH] Modified the getVisitorsByFullname endpoint

---
 api/users/user.service.js | 325 +++++++++++++++++++-------------------
 1 file changed, 162 insertions(+), 163 deletions(-)

diff --git a/api/users/user.service.js b/api/users/user.service.js
index 030a7f9..6236e49 100644
--- a/api/users/user.service.js
+++ b/api/users/user.service.js
@@ -2,7 +2,7 @@ const pool = require('../../config/database');  //importing the pool we created
 
 
 module.exports = {
-    getUsers: callBack => {
+  getUsers: callBack => {
     pool.query(
       `select * from users`,
       [],
@@ -13,8 +13,8 @@ module.exports = {
         return callBack(null, results);
       }
     );
-    },
-    createUsers: (data, callBack) => {
+  },
+  createUsers: (data, callBack) => {
     console.log(data)
     pool.query(
       `insert into users (username,  email, first_name, last_name, phone_number, gender_id, department_id, password ) 
@@ -31,36 +31,36 @@ module.exports = {
       ],
       (error, results, field) => {
         if (error) {
-           return callBack(error);
+          return callBack(error);
         }
         return callBack(null, results);
       }
     );
-    },
-    createVisitors: (data, callBack) => {
-        pool.query(
-          `insert into visitors(fullname, user_id, purpose_id, address) values(?,?,?,?)`,
-          [
-            data.fullname,
-            data.user_id,
-            data.purpose_id,
-            data.address
-          ],
-          (error, results, field) => {
-            if (error) {
-               return callBack(error);
-            }
-            signInVisitor(results);
-            return callBack(null, results);
-          }
+  },
+  createVisitors: (data, callBack) => {
+    pool.query(
+      `insert into visitors(fullname, user_id, purpose_id, address) values(?,?,?,?)`,
+      [
+        data.fullname,
+        data.user_id,
+        data.purpose_id,
+        data.address
+      ],
+      (error, results, field) => {
+        if (error) {
+          return callBack(error);
+        }
+        signInVisitor(results);
+        return callBack(null, results);
+      }
+
 
-          
-        );
-    },
+    );
+  },
 
-    getVisitors: callBack => {
-      pool.query(
-        `
+  getVisitors: callBack => {
+    pool.query(
+      `
         select v.id as id, v.fullname as fullname, v.purpose_id as purpose, v.date_added as date_added, v.address as address,
         c.time_in as time_in, c.time_out as time_out,u.first_name as first_name, u.last_name as last_name
         from clock_in c
@@ -68,164 +68,163 @@ module.exports = {
         join users u on u.id = v.user_id
         where date(c.time_in) = current_date
         `,
-        [],
-        (error, results, fields) => {
-          if (error) {
-            return callBack(error);
-          }
-          return callBack(null, results);
+      [],
+      (error, results, fields) => {
+        if (error) {
+          return callBack(error);
         }
-      );
-    },
-    getAllVisitors: callBack => {
-      pool.query(
-        `
+        return callBack(null, results);
+      }
+    );
+  },
+  getAllVisitors: callBack => {
+    pool.query(
+      `
         select v.id as id, v.fullname as fullname, v.purpose_id as purpose, v.date_added as date_added, v.address as address,
         c.time_in as time_in, c.time_out as time_out,u.first_name as first_name, u.last_name as last_name
         from visitors v
         join clock_in c on v.id = c.visitor_id
         join users u on u.id = v.user_id
         `,
-        [],
-        (error, results, fields) => {
-          if (error) {
-            return callBack(error);
-          }
-          return callBack(null, results);
+      [],
+      (error, results, fields) => {
+        if (error) {
+          return callBack(error);
         }
-      );
-    },
-    getVisitorPurpose: callBack => {
-      pool.query(
-        `select id, purpose from purpose`,
-        [],
-        (error, results, fields) => {
-          if (error) {
-            return callBack(error);
-          }
-          return callBack(null, results);
+        return callBack(null, results);
+      }
+    );
+  },
+  getVisitorPurpose: callBack => {
+    pool.query(
+      `select id, purpose from purpose`,
+      [],
+      (error, results, fields) => {
+        if (error) {
+          return callBack(error);
         }
-      );
-    },
-    getUserByUserId: (id, callBack) => {
-      pool.query(
-        `select username,  email, first_name, last_name, phone_number, gender_id, department_id from users where id=?`,
-        [id],
-        (error, results, fields) => {
-          if (error) {
-            callBack(error);
-          }
-          return callBack(null, results[0]);
+        return callBack(null, results);
+      }
+    );
+  },
+  getUserByUserId: (id, callBack) => {
+    pool.query(
+      `select username,  email, first_name, last_name, phone_number, gender_id, department_id from users where id=?`,
+      [id],
+      (error, results, fields) => {
+        if (error) {
+          callBack(error);
         }
-      );
-    },
-    updateUser: (data, callBack) => {
-      pool.query(
-        `update  users set username=?,  email=?, first_name=?, last_name=?, phone_number=?, gender_id=?, department_id=? where id = ?`,
-        [
-          data.username,
-          data.email,
-          data.first_name,
-          data.last_name,
-          data.phone_number,
-          data.gender_id,
-          data.department_id,
-          data.id
-        ],
-        (error, results, fields) =>{
-          if (error) {
-            callBack(error);
-          }
-          return callBack(null, results);
+        return callBack(null, results[0]);
+      }
+    );
+  },
+  updateUser: (data, callBack) => {
+    pool.query(
+      `update  users set username=?,  email=?, first_name=?, last_name=?, phone_number=?, gender_id=?, department_id=? where id = ?`,
+      [
+        data.username,
+        data.email,
+        data.first_name,
+        data.last_name,
+        data.phone_number,
+        data.gender_id,
+        data.department_id,
+        data.id
+      ],
+      (error, results, fields) => {
+        if (error) {
+          callBack(error);
         }
-      );
-    },
-    deleteUser: (data, callBack) => {
-      pool.query(
-        `delete from users where id = ?`,
-        [data.id],
-        (error, results, fields) => {
-          if (error) {
-            return callBack(error);
-          }   
-          return callBack(null, results[0]);
+        return callBack(null, results);
+      }
+    );
+  },
+  deleteUser: (data, callBack) => {
+    pool.query(
+      `delete from users where id = ?`,
+      [data.id],
+      (error, results, fields) => {
+        if (error) {
+          return callBack(error);
         }
-      );
-    },
-    getVisitorsByVisitorId: (id, callBack) => {
-      pool.query(
-        `select fullname, user_id, purpose_id, date_added, address from visitors  where id=?`,
-        [id],
-        (error, results, fields) => {
-          if (error) {
-            callBack(error);
-          }
-          return callBack(null, results[0]);
+        return callBack(null, results[0]);
+      }
+    );
+  },
+  getVisitorsByVisitorId: (id, callBack) => {
+    pool.query(
+      `select fullname, user_id, purpose_id, date_added, address from visitors  where id=?`,
+      [id],
+      (error, results, fields) => {
+        if (error) {
+          callBack(error);
         }
-      );
-    },
-    getVisitorByFullname: (fullname, callBack) => {
-      pool.query(
-        `
-        select v.id as id, v.fullname as fullname, v.purpose_id as purpose, v.date_added as date_added, v.address as address,
+        return callBack(null, results[0]);
+      }
+    );
+  },
+  getVisitorByFullname: (fullname, callBack) => {
+    pool.query(
+      `select v.id as id, v.fullname as fullname, v.purpose_id as purpose, v.date_added as date_added, v.address as address,
         c.time_in as time_in, c.time_out as time_out,u.first_name as first_name, u.last_name as last_name
         from clock_in c
         join visitors v on v.id = c.visitor_id
         join users u on u.id = v.user_id
         where v.fullname like '%${fullname}%'
         `,
-        [fullname],
-        (error, results, fields) => {
-          if (error) {
-            callBack(error);
-          }
-          return callBack(null, results[0]);
+      [fullname],
+      (error, results, fields) => {
+        if (error) {
+          callBack(error);
         }
-      );
-    },
-    updateVisitors: (data, callBack) => {
-      pool.query(
-        `update visitors set fullname=?, user_id=?, purpose_id=?, date_added=?, address=? where id=?`,
-        [
-          data.fullname,
-          data.user_id,
-          data.purpose_id,
-          data.date_added,
-          data.address,
-          data.id
-        ],
-        (error, results, fields) =>{
-          if (error) {
-            callBack(error);
-          }
-          return callBack(null, results);
+        return callBack(null, results);
+      }
+    );
+  },
+  updateVisitors: (data, callBack) => {
+    pool.query(
+      `update visitors set fullname=?, user_id=?, purpose_id=?, date_added=?, address=? where id=?`,
+      [
+        data.fullname,
+        data.user_id,
+        data.purpose_id,
+        data.date_added,
+        data.address,
+        data.id
+      ],
+      (error, results, fields) => {
+        if (error) {
+          callBack(error);
         }
-      );
-    },
-    deleteVisitors: (data, callBack) => {
-      pool.query(
-        `delete from visitors where id = ?`,
-        [data.id],
-        (error, results, fields) => {
-          if (error) {
-            return callBack(error);
-          }   
-          return callBack(null, results[0]);
+        return callBack(null, results);
+      }
+    );
+  },
+  deleteVisitors: (data, callBack) => {
+    pool.query(
+      `delete from visitors where id = ?`,
+      [data.id],
+      (error, results, fields) => {
+        if (error) {
+          return callBack(error);
         }
-      );
-    },
-    getUserByUserEmail: (email, callBack) => {
-      pool.query(
-        `select * from users where email = ?`,
-        [email],
-        (error, results, fields) => {
-          if (error) {
-            callBack(error);
-          }
-          return callBack(null, results[0]);
+        return callBack(null, results[0]);
+      }
+    );
+  },
+  getUserByUserEmail: (email, callBack) => {
+    pool.query(
+      `select * from users where email = ?`,
+      [email],
+      (error, results, fields) => {
+        if (error) {
+          callBack(error);
         }
-      );
-    }
+        return callBack(null, results[0]);
+      }
+    );
+  }
 };
 
 
@@ -243,5 +242,5 @@ signInVisitor = (results) => {
       console.log(results);
       return results;
     }
-  )  
+  )
 }
\ No newline at end of file