Merge pull request #12 from vitabletech/develop

Develop

Author: msrajawat298

app/Validations/addEventsValidation.js

@@ -0,0 +1,29 @@
+import Joi from 'joi';
+
+const addEventValidation = (req, res, next) => {
+  // Define validation schema
+  const schema = Joi.object({
+    eventName: Joi.string().min(3).max(30).required(),
+    eventDate: Joi.date().iso().required(),
+    eventTime: Joi.string()
+      .regex(/^\d{2}:\d{2}$/)
+      .required(),
+    eventLocation: Joi.string().required()
+    // You can add more validation rules as needed
+  });
+
+  // Validate data against schema
+  const { error } = schema.validate(req.body);
+
+  if (error) {
+    return res.status(400).send({ message: error.details[0].message });
+  }
+  return next();
+
+};
+
+const validate = {
+  addEventValidation
+};
+
+export default validate;

app/controllers/eventController.js

@@ -0,0 +1,88 @@
+import db from '../models/index.js';
+
+const { events: Event } = db;
+
+export const addEvent = (req, res) => {
+  try {
+    const event = new Event({ ...req.body, userId: req.userId, eventStatus: 11 });
+    event.save();
+    res.status(200).send({ message: 'Event added successfully' });
+  } catch (err) {
+    res.status(500).send({ message: err.message });
+  }
+};
+
+export const getEvent = async (req, res) => {
+  try {
+    const {userId} = req;
+    const events = await Event.findAll({ userId });
+    res.status(200).send({ message: 'Request completed', event: events });
+  } catch (err) {
+    res.status(500).send({ message: err.message });
+  }
+};
+
+export const getEventByid = async (req, res) => {
+  try {
+    const {userId} = req;
+    const {eventId} = req.query;
+    // Check if userId and eventId are provided
+    if (!eventId) {
+      throw new Error('eventId is required');
+    }
+
+    const events = await Event.findOne({ where: { userId, eventId } });
+
+    if (!events || userId !== events.userId) {
+      throw new Error('Data not found');
+    }
+
+    res.status(200).send({ message: 'Request completed', event: events });
+  } catch (err) {
+    res.status(500).send({ message: err.message });
+  }
+};
+
+export const updateStatus = async (req, res) => {
+  try {
+    const {userId} = req;
+    const {eventId} = req.body;
+    const {status} = req.body;
+    // Check if userId and eventId are provided
+    if (!eventId) {
+      throw new Error('eventId is required');
+    }
+    const events = await Event.update(
+      { eventStatus: status },
+      { where: { userId, eventId } }
+    );
+
+    if (!events || userId !== events.userId) {
+      throw new Error('Data not found');
+    }
+
+    res.status(200).send({ message: 'Request completed' });
+  } catch (err) {
+    res.status(500).send({ message: err.message });
+  }
+};
+
+export const deleteById = async (req, res) => {
+  try {
+    const {userId} = req;
+    const {eventId} = req.query;
+    // Check if userId and eventId are provided
+    if (!eventId) {
+      throw new Error('eventId is required');
+    }
+    const events = await Event.destroy({ where: { userId, eventId } });
+
+    if (!events || userId !== events.userId) {
+      throw new Error('Data not found');
+    }
+
+    res.status(200).send({ message: 'Request completed' });
+  } catch (err) {
+    res.status(500).send({ message: err.message });
+  }
+};

app/models/Event.js

@@ -0,0 +1,42 @@
+export default (sequelize, Sequelize) => {
+  const Event = sequelize.define(
+    'events',
+    {
+      eventId: {
+        type: Sequelize.INTEGER,
+        autoIncrement: true,
+        primaryKey: true
+      },
+      userId: {
+        type: Sequelize.INTEGER,
+        allowNull: false
+      },
+      eventName: {
+        type: Sequelize.STRING,
+        allowNull: false
+      },
+      eventDate: {
+        type: Sequelize.STRING,
+        allowNull: false
+      },
+      eventTime: {
+        type: Sequelize.STRING,
+        allowNull: false
+      },
+      eventLocation: {
+        type: Sequelize.STRING,
+        allowNull: false
+      },
+      eventStatus: {
+        type: Sequelize.STRING,
+        allowNull: false,
+        Comment: '11 => Pending, 22 => On-going, 33 => Completed, 44=> Cancelled'
+      }
+    },
+    {
+      timestamps: true
+    }
+  );
+
+  return Event;
+};

app/models/index.js

@@ -1,17 +1,19 @@
 import Sequelize from 'sequelize';
-import config from '../../config/db.config.js';
+import DB_CONFIG from '../../config/db.config.js';
 import createUserModel from './User.js';
 import createRoleModel from './Role.js';
 import createGuestModel from './Guest.js';
+import createEventModel from './Event.js';
 
-const sequelize = new Sequelize({...config});
+const sequelize = new Sequelize({...DB_CONFIG});
 
 const db = {
   Sequelize,
   sequelize,
   user: createUserModel(sequelize, Sequelize),
   role: createRoleModel(sequelize, Sequelize),
   guests: createGuestModel(sequelize, Sequelize),
+  events: createEventModel(sequelize, Sequelize),
   ROLES: ['user', 'admin']
 };
 

app/routes/Router.js

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

app/routes/event.route.js

@@ -0,0 +1,23 @@
+import express from 'express';
+import {
+  addEvent,
+  getEvent,
+  getEventByid,
+  deleteById,
+  updateStatus
+} from '../controllers/eventController.js';
+import authJwt from '../middleware/authJwt.js';
+import validate from '../Validations/addEventsValidation.js';
+
+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('/add-event', [authJwt.verifyToken, validate.addEventValidation], addEvent);
+  app.get('/get-event', [authJwt.verifyToken], getEvent);
+  app.get('/get-event-by-id', [authJwt.verifyToken], getEventByid);
+  app.get('/delete-event-by-id', [authJwt.verifyToken], deleteById);
+  app.post('/update-status', [authJwt.verifyToken], updateStatus);
+}

app/routes/guest.routes.js

@@ -1,4 +1,4 @@
-import express from 'express'; // Import express
+import express from 'express';
 import { addGuest, deleteGuest, updateGuest } from '../controllers/guestController.js'; // Import addGuest function
 
 export default function guestRoutes(app) {
@@ -13,5 +13,4 @@ export default function guestRoutes(app) {
   app.post('/addguest', addGuest);
   app.delete('/deleteguest', deleteGuest);
   app.put('/updateguest',updateGuest);
-  
 }

app/server.js

@@ -1,6 +1,9 @@
 import express from 'express';
+import { config } from 'dotenv';
 import applyRouter from './routes/index.js';
 
+config();
+
 const app = express();
 
 // Set up the router

config/auth.config.js

@@ -1,3 +1,7 @@
+import { config } from 'dotenv';
+
+config();
+
 export default {
   secret: process.env.JWT_SECRET,
   jwtOptions: {

config/db.config.js

@@ -1,4 +1,8 @@
-const config = {
+import { config } from 'dotenv';
+
+config();
+
+const DB_CONFIG = {
   host: process.env.DB_HOST,
   username: process.env.DB_USER,
   password: process.env.DB_PASSWORD,
@@ -11,4 +15,4 @@ const config = {
     idle: parseInt(process.env.DB_POOL_IDLE, 10)
   }
 };
-export default config;
+export default DB_CONFIG;