Ht 14 create bill endpoints

.github/workflows/node.js.yml

@@ -1,11 +1,9 @@
 # This workflow will do a clean installation of node dependencies, cache/restore them, build the source code and run tests across different versions of node
 # For more information see: https://help.github.com/actions/language-and-framework-guides/using-nodejs-with-github-actions
 
-name: Node.js CI
+name: Build-Test-Deploy Pipeline
 
 on:
-  push:
-    branches: [ develop ]
   pull_request:
     branches: [ develop ]
 
@@ -36,25 +34,26 @@ jobs:
         cd server
         npm ci
         npm run build --if-present
-    - name: Server - run tests    
-      run: |
-        cd server
-        npm test
     - name: UI - run build
       run: |
         cd ui
         npm ci
         npm run build --if-present
+    - name: Server - run tests    
+      run: |
+        cd server
+        npm test
     - name: UI - run tests    
       run: |
         cd ui
         npm test
     - name: Code Coverage
       uses: romeovs/lcov-reporter-action@v0.2.16
       with:
-        lcov-file: ./coverage/lcov.info
+        lcov-file: ./server/coverage/lcov.info
+        github-token: ${{ secrets.GITHUB_TOKEN }}
     - name: Deploy
       uses: JamesIves/github-pages-deploy-action@v4.2.3
       with:
         branch: gh-pages
-        folder: develop
+        folder: ./ui/dist/

.gitignore

@@ -4,6 +4,7 @@ node_modules
 /dist
 server/.nyc_output/*.json
 server/.nyc_output/processinfo/*.json
+server/coverage/lcov-report
 
 # local env files
 .env.local
@@ -22,5 +23,4 @@ pnpm-debug.log*
 *.ntvs*
 *.njsproj
 *.sln
-*.sw?
-*.env
+*.sw?

server/.env

@@ -0,0 +1 @@
+TOKEN_SECRET=test

server/.nyc_output/processinfo/index.json

@@ -1 +1 @@
-{"processes":{"ecd4285b-d9dc-4104-b850-fcf81a763c89":{"parent":null,"children":[]}},"files":{"C:\\Users\\Jarrod\\Documents\\AAF\\CSSD\\server\\app.js":["ecd4285b-d9dc-4104-b850-fcf81a763c89"],"C:\\Users\\Jarrod\\Documents\\AAF\\CSSD\\server\\database\\index.js":["ecd4285b-d9dc-4104-b850-fcf81a763c89"],"C:\\Users\\Jarrod\\Documents\\AAF\\CSSD\\server\\config\\db.config.js":["ecd4285b-d9dc-4104-b850-fcf81a763c89"],"C:\\Users\\Jarrod\\Documents\\AAF\\CSSD\\server\\models\\user.model.js":["ecd4285b-d9dc-4104-b850-fcf81a763c89"],"C:\\Users\\Jarrod\\Documents\\AAF\\CSSD\\server\\routes\\auth.routes.js":["ecd4285b-d9dc-4104-b850-fcf81a763c89"],"C:\\Users\\Jarrod\\Documents\\AAF\\CSSD\\server\\controllers\\auth.controller.js":["ecd4285b-d9dc-4104-b850-fcf81a763c89"],"C:\\Users\\Jarrod\\Documents\\AAF\\CSSD\\server\\business\\user.business.js":["ecd4285b-d9dc-4104-b850-fcf81a763c89"],"C:\\Users\\Jarrod\\Documents\\AAF\\CSSD\\server\\datalayer\\mongo.js":["ecd4285b-d9dc-4104-b850-fcf81a763c89"]},"externalIds":{}}
+{"processes":{"4d150775-f277-4c3e-a138-a2031d24611b":{"parent":null,"children":[]}},"files":{"C:\\Projects\\CSSD-Assignment\\server\\app.js":["4d150775-f277-4c3e-a138-a2031d24611b"],"C:\\Projects\\CSSD-Assignment\\server\\database\\index.js":["4d150775-f277-4c3e-a138-a2031d24611b"],"C:\\Projects\\CSSD-Assignment\\server\\config\\db.config.js":["4d150775-f277-4c3e-a138-a2031d24611b"],"C:\\Projects\\CSSD-Assignment\\server\\models\\journey.model.js":["4d150775-f277-4c3e-a138-a2031d24611b"],"C:\\Projects\\CSSD-Assignment\\server\\models\\bill.model.js":["4d150775-f277-4c3e-a138-a2031d24611b"],"C:\\Projects\\CSSD-Assignment\\server\\utilities.js":["4d150775-f277-4c3e-a138-a2031d24611b"],"C:\\Projects\\CSSD-Assignment\\server\\models\\location.model.js":["4d150775-f277-4c3e-a138-a2031d24611b"],"C:\\Projects\\CSSD-Assignment\\server\\models\\user.model.js":["4d150775-f277-4c3e-a138-a2031d24611b"],"C:\\Projects\\CSSD-Assignment\\server\\routes\\auth.routes.js":["4d150775-f277-4c3e-a138-a2031d24611b"],"C:\\Projects\\CSSD-Assignment\\server\\controllers\\auth.controller.js":["4d150775-f277-4c3e-a138-a2031d24611b"],"C:\\Projects\\CSSD-Assignment\\server\\business\\user.business.js":["4d150775-f277-4c3e-a138-a2031d24611b"],"C:\\Projects\\CSSD-Assignment\\server\\datalayer\\mongo.js":["4d150775-f277-4c3e-a138-a2031d24611b"],"C:\\Projects\\CSSD-Assignment\\server\\routes\\bill.routes.js":["4d150775-f277-4c3e-a138-a2031d24611b"],"C:\\Projects\\CSSD-Assignment\\server\\controllers\\bill.controller.js":["4d150775-f277-4c3e-a138-a2031d24611b"],"C:\\Projects\\CSSD-Assignment\\server\\business\\bill.business.js":["4d150775-f277-4c3e-a138-a2031d24611b"]},"externalIds":{}}

server/app.js

@@ -8,7 +8,7 @@ const cookieParser = require("cookie-parser");
 require("./database");
 require("dotenv").config();
 
-var app = express();
+const app = express();
 
 app.use(
     cookieSession({
@@ -24,8 +24,8 @@ app.use(cors({ origin: "http://localhost:8080", credentials: true }));
 /**
  * Router setup
  */
-var authRouter = require("./routes/auth.routes");
-
+const authRouter = require("./routes/auth.routes");
+const billRouter = require("./routes/bill.routes");
 /**
  * View Engine setup
  */
@@ -40,5 +40,6 @@ app.use(cookieParser());
 
 // Configuring the main routes
 app.use("/auth", authRouter);
+app.use("/bill", billRouter)
 
 module.exports = app;

server/business/bill.business.js

@@ -0,0 +1,39 @@
+const DataLayer = require("../datalayer/mongo");
+const Utilities = require("../utilities")
+const model = require("../database").getModel("bill");
+const httpError = require("http-errors");
+
+module.exports = class BillBusiness {
+ constructor() {
+  // Create an instance of the data layer.
+  this.dataLayer = new DataLayer(model);
+ }
+
+ /**
+  *  Get all bills.
+  */
+ async getAllBills(queryString) {
+  const filter = {
+   driver: queryString.driver,
+   paid: queryString.paid,
+   limit: queryString.limit ?? 10,
+   offset: queryString.offset ?? 0
+  }
+  return this.dataLayer
+    .findAllAndPopulate(filter, [{ path: 'journey', populate: { path: 'entryLocation exitLocation' }}, {path: 'driver', select: 'username type email'}])
+    .catch((error) => { 
+     throw httpError(500, error.message)})
+ }
+
+ /**
+  *  Get a bill by ID.
+  */
+ async payBill(id) {
+  const record = {
+   paid: true
+  }
+  return this.dataLayer.update(id, record)
+    .catch((error) => {throw httpError(404, error.message)
+  })
+ }
+}

server/business/user.business.js

@@ -4,7 +4,7 @@ const httpError = require("http-errors");
 const jwt = require("jsonwebtoken");
 const bcrypt = require("bcryptjs");
 
-class UserBusiness {
+module.exports = class UserBusiness {
     constructor() {
         // Create an instance of the data layer.
         this.dataLayer = new DataLayer(model);
@@ -47,8 +47,7 @@ class UserBusiness {
                     id: user._id,
                 };
             })
-            .catch(() => {
-                throw httpError(400, "Your email or password is incorrect.");
+            .catch(() => {throw httpError(400, "Your email or password is incorrect.");
             });
     }
 
@@ -104,15 +103,10 @@ class UserBusiness {
             });
     }
 }
-module.exports = UserBusiness;
 
 /**
  *  Validates the data in a User.
  */
 function isUserDataValid(user) {
-    if (!user || !user.username || !user.email || !user.password) {
-        return false;
-    } else {
-        return true;
-    }
+    return !(!user || !user.username || !user.email || !user.password);
 }

server/controllers/bill.controller.js

@@ -0,0 +1,23 @@
+const BillBusiness = require("../business/bill.business");
+const billBusiness = new BillBusiness();
+
+/**
+ * Get all bills
+ */
+exports.getAllBills = async (req, res) => {
+ billBusiness.getAllBills(req.query)
+   .then((data) => {return res.status(200).send(data)})
+   .catch((error) => {
+    res.status(error.status).send({message: error.message})
+   })
+
+}
+
+/**
+ * Pay bill
+ */
+exports.payBill = async (req, res) => {
+ billBusiness.payBill(req.params.id)
+   .then(() => {res.status(200).send({message: "Bill paid."})})
+   .catch((error) => {res.status(error.status).send({message: error.message})})
+}