HT-29 Added the toll operator functionality

server/.nyc_output/processinfo/index.json

@@ -1 +1 @@
-{"processes":{"50560bfc-9d99-4dfb-92f6-1329d287dafe":{"parent":null,"children":[]}},"files":{"E:\\UniWork\\CSSD\\CSSD-Assignment\\server\\app.js":["50560bfc-9d99-4dfb-92f6-1329d287dafe"],"E:\\UniWork\\CSSD\\CSSD-Assignment\\server\\database\\index.js":["50560bfc-9d99-4dfb-92f6-1329d287dafe"],"E:\\UniWork\\CSSD\\CSSD-Assignment\\server\\config\\db.config.js":["50560bfc-9d99-4dfb-92f6-1329d287dafe"],"E:\\UniWork\\CSSD\\CSSD-Assignment\\server\\models\\journey.model.js":["50560bfc-9d99-4dfb-92f6-1329d287dafe"],"E:\\UniWork\\CSSD\\CSSD-Assignment\\server\\models\\bill.model.js":["50560bfc-9d99-4dfb-92f6-1329d287dafe"],"E:\\UniWork\\CSSD\\CSSD-Assignment\\server\\utilities.js":["50560bfc-9d99-4dfb-92f6-1329d287dafe"],"E:\\UniWork\\CSSD\\CSSD-Assignment\\server\\models\\location.model.js":["50560bfc-9d99-4dfb-92f6-1329d287dafe"],"E:\\UniWork\\CSSD\\CSSD-Assignment\\server\\models\\user.model.js":["50560bfc-9d99-4dfb-92f6-1329d287dafe"],"E:\\UniWork\\CSSD\\CSSD-Assignment\\server\\routes\\auth.routes.js":["50560bfc-9d99-4dfb-92f6-1329d287dafe"],"E:\\UniWork\\CSSD\\CSSD-Assignment\\server\\controllers\\auth.controller.js":["50560bfc-9d99-4dfb-92f6-1329d287dafe"],"E:\\UniWork\\CSSD\\CSSD-Assignment\\server\\business\\user.business.js":["50560bfc-9d99-4dfb-92f6-1329d287dafe"],"E:\\UniWork\\CSSD\\CSSD-Assignment\\server\\datalayer\\mongo.js":["50560bfc-9d99-4dfb-92f6-1329d287dafe"],"E:\\UniWork\\CSSD\\CSSD-Assignment\\server\\routes\\bill.routes.js":["50560bfc-9d99-4dfb-92f6-1329d287dafe"],"E:\\UniWork\\CSSD\\CSSD-Assignment\\server\\middleware\\auth\\authJwt.js":["50560bfc-9d99-4dfb-92f6-1329d287dafe"],"E:\\UniWork\\CSSD\\CSSD-Assignment\\server\\controllers\\bill.controller.js":["50560bfc-9d99-4dfb-92f6-1329d287dafe"],"E:\\UniWork\\CSSD\\CSSD-Assignment\\server\\business\\bill.business.js":["50560bfc-9d99-4dfb-92f6-1329d287dafe"]},"externalIds":{}}
+{"processes":{"076bf10b-2570-48ae-ba89-4c94269b643b":{"parent":null,"children":[]}},"files":{"E:\\UniWork\\CSSD\\CSSD-Assignment\\server\\app.js":["076bf10b-2570-48ae-ba89-4c94269b643b"],"E:\\UniWork\\CSSD\\CSSD-Assignment\\server\\database\\index.js":["076bf10b-2570-48ae-ba89-4c94269b643b"],"E:\\UniWork\\CSSD\\CSSD-Assignment\\server\\config\\db.config.js":["076bf10b-2570-48ae-ba89-4c94269b643b"],"E:\\UniWork\\CSSD\\CSSD-Assignment\\server\\models\\journey.model.js":["076bf10b-2570-48ae-ba89-4c94269b643b"],"E:\\UniWork\\CSSD\\CSSD-Assignment\\server\\models\\bill.model.js":["076bf10b-2570-48ae-ba89-4c94269b643b"],"E:\\UniWork\\CSSD\\CSSD-Assignment\\server\\utilities.js":["076bf10b-2570-48ae-ba89-4c94269b643b"],"E:\\UniWork\\CSSD\\CSSD-Assignment\\server\\models\\location.model.js":["076bf10b-2570-48ae-ba89-4c94269b643b"],"E:\\UniWork\\CSSD\\CSSD-Assignment\\server\\models\\user.model.js":["076bf10b-2570-48ae-ba89-4c94269b643b"],"E:\\UniWork\\CSSD\\CSSD-Assignment\\server\\routes\\auth.routes.js":["076bf10b-2570-48ae-ba89-4c94269b643b"],"E:\\UniWork\\CSSD\\CSSD-Assignment\\server\\controllers\\auth.controller.js":["076bf10b-2570-48ae-ba89-4c94269b643b"],"E:\\UniWork\\CSSD\\CSSD-Assignment\\server\\business\\user.business.js":["076bf10b-2570-48ae-ba89-4c94269b643b"],"E:\\UniWork\\CSSD\\CSSD-Assignment\\server\\datalayer\\mongo.js":["076bf10b-2570-48ae-ba89-4c94269b643b"],"E:\\UniWork\\CSSD\\CSSD-Assignment\\server\\routes\\bill.routes.js":["076bf10b-2570-48ae-ba89-4c94269b643b"],"E:\\UniWork\\CSSD\\CSSD-Assignment\\server\\middleware\\auth\\authJwt.js":["076bf10b-2570-48ae-ba89-4c94269b643b"],"E:\\UniWork\\CSSD\\CSSD-Assignment\\server\\controllers\\bill.controller.js":["076bf10b-2570-48ae-ba89-4c94269b643b"],"E:\\UniWork\\CSSD\\CSSD-Assignment\\server\\business\\bill.business.js":["076bf10b-2570-48ae-ba89-4c94269b643b"],"E:\\UniWork\\CSSD\\CSSD-Assignment\\server\\routes\\user.routes.js":["076bf10b-2570-48ae-ba89-4c94269b643b"],"E:\\UniWork\\CSSD\\CSSD-Assignment\\server\\controllers\\user.controller.js":["076bf10b-2570-48ae-ba89-4c94269b643b"]},"externalIds":{}}

server/app.js

@@ -28,8 +28,9 @@ app.use(cors({ origin: "http://localhost:8080", credentials: true }));
  */
 const authRouter = require("./routes/auth.routes");
 const billRouter = require("./routes/bill.routes");
+const userRouter = require("./routes/user.routes");
 app.get('/api-docs/swagger.json', (req, res) => res.json(swaggerDocument));
-app.use('/api-docs', swaggerUi.serve, swaggerUi.setup(swaggerDocument))
+app.use('/api-docs', swaggerUi.serve, swaggerUi.setup(swaggerDocument));
 
 /**
  * View Engine setup
@@ -45,6 +46,7 @@ app.use(cookieParser());
 
 // Configuring the main routes
 app.use("/auth", authRouter);
-app.use("/bill", billRouter)
+app.use("/bill", billRouter);
+app.use("/user", userRouter);
 
 module.exports = app;

server/business/user.business.js

@@ -47,7 +47,8 @@ module.exports = class UserBusiness {
                     id: user._id,
                 };
             })
-            .catch(() => {throw httpError(401, "Your email or password is incorrect.");
+            .catch(() => {
+                throw httpError(401, "Your email or password is incorrect.");
             });
     }
 
@@ -102,7 +103,22 @@ module.exports = class UserBusiness {
                 throw httpError(404, error.message);
             });
     }
-}
+
+    /*
+     *  Find all users and apply any filters
+     */
+    async findAllUsers(queryString) {
+        const filter = {
+            offset: queryString.offset,
+            limit: queryString.limit,
+            type: queryString.type,
+        };
+
+        return this.dataLayer.findAll(filter).catch((error) => {
+            throw httpError(500, error.message);
+        });
+    }
+};
 
 /**
  *  Validates the data in a User.

server/controllers/auth.controller.js

@@ -10,13 +10,13 @@ exports.login = async (req, res) => {
         .then((data) => {
             req.session.token = data.token;
             req.session.username = data.username;
-            req.session.role = data.role;
+            req.session.type = data.type;
             req.session.id = data.id;
 
             res.status(200).send({
                 message: "Successfully logged in.",
                 username: data.username,
-                role: data.role,
+                type: data.type,
                 id: data.id,
             });
         })

server/controllers/user.controller.js

@@ -0,0 +1,13 @@
+const UserBusiness = require("../business/user.business");
+const userBusiness = new UserBusiness();
+
+/**
+ * Get all users
+ */
+exports.getAllUsers = async (req, res) => {
+ userBusiness.findAllUsers(req.query)
+   .then((data) => {return res.status(200).send(data)})
+   .catch((error) => {
+    res.status(error.status).send({message: error.message})
+   })
+}