Merge pull request #7 from vitabletech/develop

Develop

Author: msrajawat298

Diff for: README.md

@@ -1,12 +1,13 @@
 # Node App Setup Guide
 
-This guide will help you set up and run the Node.js application along with PHPMyAdmin using Docker.
+This guide will help you set up and run the Node.js application along with PHPMyAdmin using Docker with the added convenience of a development container.
 
 ## Prerequisites
 
 - Git
-- Docker
-- Node.js
+- [Docker](https://www.docker.com/)
+- [Node.js](https://nodejs.org/en)
+- [Visual Studio Code (or any editor with DevContainer support)](https://code.visualstudio.com/)
 
 ## Installation
 
@@ -32,7 +33,7 @@ cd node-express-api-bootstrap
 docker-compose up -d
 ```
 
-2. Open your web browser and go to [http://localhost:8080](http://localhost:8080) to access PHPMyAdmin.
+2. Open your web browser and go to [http://localhost:8081](http://localhost:8081) to access PHPMyAdmin.
 
 3. Create a new database named `testdb` as specified in the `.env` file. If you made any changes to the database name, ensure to create it with the updated name.
 
@@ -52,7 +53,7 @@ This command will automatically create the required tables.
 
 6. Once the database synchronization is complete, you can start working on the application.
 
-7. Access the Node.js application at [http://localhost/](http://localhost/).
+7. Access the Node.js application at [http://localhost:8080](http://localhost:8080).
 
 ## Enjoy!
 
@@ -72,4 +73,4 @@ This repository provides a Node.js application for demonstrating JWT authenticat
 - Utilizes Sequelize ORM for database interactions
 - Supports MySQL for database storage
 
-## [Connect to us](https://topmate.io/vitabletech)
+## [Connect to us](https://topmate.io/vitabletech)

Diff for: app/controllers/guestController.js

@@ -0,0 +1,76 @@
+import db from '../models/index.js';
+
+const { guests: Guest } = db;
+
+// Method to add new guests
+export const addGuest = (req, res) => {
+  // Destructure required fields from the request body
+  const { name, contact, email, address } = req.body;
+
+  // Check if the required fields are provided
+  if (!name || !contact) {
+    return res.status(400).json({ error: 'Name and contact are mandatory fields.' });
+  }
+  
+  // Create a new Guest object with provided data
+  return Guest.create({
+    name,
+    contact,
+    email, // email not a mandatory parameter
+    address // It's okay if these are undefined
+  })
+    .then(savedGuest => 
+    // Respond with the saved guest object
+      res.status(200).json(savedGuest)
+    )
+    .catch(err => {
+      console.error('Error saving guest:', err);
+      return res.status(500).send('Error saving guest.');
+    });
+};
+
+// Method to delete a guest
+export const deleteGuest = (req, res) => {
+  const guestId = req.query.guestid;;
+
+  Guest.destroy({
+    where: { guestId }
+  })
+    .then(num => {
+      if (num === 1) {
+        res.send({ message: 'Guest was deleted successfully!' });
+      } else {
+        res.send({ message: `Cannot delete Guest with id=${guestId}. Maybe Guest was not found!` });
+      }
+    })
+    .catch(() => {
+      res.status(500).send({ message: `Could not delete Guest with id=${  guestId}` });
+    });
+};
+
+// Method to update details of an existing guest
+export const updateGuest = (req, res) => {
+  const { name, contact, email, address, guestId } = req.body;
+  const updateData = { name, contact };
+  if (email !== undefined) {
+    updateData.email = email;
+  }
+  if (address !== undefined) {
+    updateData.address = address;
+  }
+  Guest.update(
+    updateData,
+    { where: { guestId } }
+  )
+    .then(([affectedCount]) => {
+      if (affectedCount > 0) {
+        res.send({ message: 'Guest updated successfully!' });
+      } else {
+        res.send({ message: `Cannot update Guest with id=${guestId}. Maybe Guest was not found or req.body is empty!` });
+      }
+    })
+    .catch((err) => {
+      console.error('Error updating guest:', err);
+      res.status(500).send({ message: `Error updating Guest with id=${  guestId}` });
+    });
+};

Diff for: app/models/Guest.js

@@ -0,0 +1,24 @@
+export default (sequelize, Sequelize) => {
+  const Guest = sequelize.define('guests', {
+    guestId: {
+      type: Sequelize.INTEGER,
+      autoIncrement: true,
+      primaryKey: true
+    },
+    name: {
+      type: Sequelize.STRING
+      
+    },
+    contact: {
+      type: Sequelize.STRING
+    },
+    email: {
+      type: Sequelize.STRING
+    },
+    address: {
+      type: Sequelize.STRING
+    }
+  });
+
+  return Guest;
+};

Diff for: app/models/index.js

@@ -2,6 +2,7 @@ import Sequelize from 'sequelize';
 import config from '../config/db.config.js';
 import createUserModel from './User.js';
 import createRoleModel from './Role.js';
+import createGuestModel from './Guest.js';
 
 const { DB, USER, PASSWORD, HOST, DIALECT, pool } = config;
 
@@ -16,6 +17,7 @@ const db = {
   sequelize,
   user: createUserModel(sequelize, Sequelize),
   role: createRoleModel(sequelize, Sequelize),
+  guests: createGuestModel(sequelize, Sequelize),
   ROLES: ['user', 'admin']
 };
 

Diff for: app/routes/Router.js

@@ -1,5 +1,6 @@
 import authRoutes from './auth.routes.js';
 import userRoutes from './user.routes.js';
+import guestRoutes from './guest.routes.js';
 
 const applyRoutes = (app) => {
   // simple route
@@ -10,6 +11,7 @@ const applyRoutes = (app) => {
   // routes
   authRoutes(app);
   userRoutes(app);
+  guestRoutes(app);
 };
 
 export default applyRoutes;

Diff for: app/routes/guest.routes.js

@@ -0,0 +1,17 @@
+import express from 'express'; // Import express
+import { addGuest, deleteGuest, updateGuest } from '../controllers/guestController.js'; // Import addGuest function
+
+export default function guestRoutes(app) {
+  app.use((req, res, next) => {
+    res.header(
+      'Access-Control-Allow-Headers',
+      'x-access-token, Origin, Content-Type, Accept'
+    );
+    next();
+  });
+  app.use(express.json());
+  app.post('/addguest', addGuest);
+  app.delete('/deleteguest', deleteGuest);
+  app.put('/updateguest',updateGuest);
+  
+}

Diff for: coverage/lcov.info

@@ -76,6 +76,74 @@ BRF:6
 BRH:0
 end_of_record
 TN:
+SF:app/controllers/guestController.js
+FN:6,(anonymous_0)
+FN:22,(anonymous_1)
+FN:26,(anonymous_2)
+FN:33,(anonymous_3)
+FN:39,(anonymous_4)
+FN:46,(anonymous_5)
+FN:52,(anonymous_6)
+FN:65,(anonymous_7)
+FN:72,(anonymous_8)
+FNF:9
+FNH:0
+FNDA:0,(anonymous_0)
+FNDA:0,(anonymous_1)
+FNDA:0,(anonymous_2)
+FNDA:0,(anonymous_3)
+FNDA:0,(anonymous_4)
+FNDA:0,(anonymous_5)
+FNDA:0,(anonymous_6)
+FNDA:0,(anonymous_7)
+FNDA:0,(anonymous_8)
+DA:3,0
+DA:6,0
+DA:8,0
+DA:11,0
+DA:12,0
+DA:16,0
+DA:24,0
+DA:27,0
+DA:28,0
+DA:33,0
+DA:34,0
+DA:36,0
+DA:40,0
+DA:41,0
+DA:43,0
+DA:47,0
+DA:52,0
+DA:53,0
+DA:54,0
+DA:55,0
+DA:56,0
+DA:58,0
+DA:59,0
+DA:61,0
+DA:66,0
+DA:67,0
+DA:69,0
+DA:73,0
+DA:74,0
+LF:29
+LH:0
+BRDA:11,0,0,0
+BRDA:11,0,1,0
+BRDA:11,1,0,0
+BRDA:11,1,1,0
+BRDA:40,2,0,0
+BRDA:40,2,1,0
+BRDA:55,3,0,0
+BRDA:55,3,1,0
+BRDA:58,4,0,0
+BRDA:58,4,1,0
+BRDA:66,5,0,0
+BRDA:66,5,1,0
+BRF:12
+BRH:0
+end_of_record
+TN:
 SF:app/controllers/userController.js
 FN:1,(anonymous_0)
 FN:5,(anonymous_1)
@@ -177,6 +245,19 @@ BRF:8
 BRH:0
 end_of_record
 TN:
+SF:app/models/Guest.js
+FN:1,(anonymous_0)
+FNF:1
+FNH:0
+FNDA:0,(anonymous_0)
+DA:2,0
+DA:23,0
+LF:2
+LH:0
+BRF:0
+BRH:0
+end_of_record
+TN:
 SF:app/models/Role.js
 FN:1,(anonymous_0)
 FNF:1
@@ -206,31 +287,32 @@ TN:
 SF:app/models/index.js
 FNF:0
 FNH:0
-DA:6,0
-DA:8,0
-DA:14,0
-DA:22,0
-DA:25,0
-DA:29,0
+DA:7,0
+DA:9,0
+DA:15,0
+DA:24,0
+DA:27,0
+DA:31,0
 LF:6
 LH:0
 BRF:0
 BRH:0
 end_of_record
 TN:
 SF:app/routes/Router.js
-FN:4,(anonymous_0)
-FN:6,(anonymous_1)
+FN:5,(anonymous_0)
+FN:7,(anonymous_1)
 FNF:2
 FNH:0
 FNDA:0,(anonymous_0)
 FNDA:0,(anonymous_1)
-DA:4,0
-DA:6,0
+DA:5,0
 DA:7,0
-DA:11,0
+DA:8,0
 DA:12,0
-LF:5
+DA:13,0
+DA:14,0
+LF:6
 LH:0
 BRF:0
 BRH:0
@@ -255,6 +337,26 @@ BRF:0
 BRH:0
 end_of_record
 TN:
+SF:app/routes/guest.routes.js
+FN:4,guestRoutes
+FN:5,(anonymous_1)
+FNF:2
+FNH:0
+FNDA:0,guestRoutes
+FNDA:0,(anonymous_1)
+DA:5,0
+DA:6,0
+DA:10,0
+DA:12,0
+DA:13,0
+DA:14,0
+DA:15,0
+LF:7
+LH:0
+BRF:0
+BRH:0
+end_of_record
+TN:
 SF:app/routes/index.js
 FN:5,(anonymous_0)
 FN:12,(anonymous_1)

Diff for: package.json

@@ -1,7 +1,7 @@
 {
-  "name": "node-js-jwt-auth",
-  "version": "1.0.0",
-  "description": "Node.js Demo for JWT Authentication",
+  "name": "node-express-api-bootstrap",
+  "version": "2.0.0",
+  "description": "This repository provides a Node.js application for demonstrating JWT authentication and authorization. It includes features such as user registration, user login, and authorization process. The application is built using Express.js, JWT for authentication, Sequelize ORM for database interactions, and MySQL for database storage.",
   "main": "app/server.js",
   "type": "module",
   "scripts": {