#163421750 Delete meetup

package.json

@@ -45,6 +45,7 @@
     "eslint-plugin-import": "^2.14.0",
     "istanbul": "^0.4.5",
     "mocha": "^5.2.0",
+    "nodemon": "^1.18.9",
     "nyc": "^13.1.0",
     "supertest": "^3.3.0"
   },
@@ -63,6 +64,7 @@
     "moment": "^2.23.0",
     "morgan": "^1.9.1",
     "pg": "^7.8.0",
-    "uuid": "^3.3.2"
+    "uuid": "^3.3.2",
+    "validatorjs": "^3.15.1"
   }
-}
+}

server/app.js

@@ -7,47 +7,37 @@ import bodyParser from 'body-parser';
 
 // Set up express app
 const app = express();
-import expressValidation from 'express-validation';
-import userRoutes from './routes/user';
-import AdminRoutes from './routes/admin';
-import meetupRoutes from './routes/meetups';
-import questionsRoute from './routes/questions';
-// import commentRoutes from './routes/comments';
+import routes from './routes';
 
 // Log requests to the console
 app.use(logger('dev'));
 
-
 // Parse incoming request data
 app.use(bodyParser.json());
 app.use(bodyParser.urlencoded({
   extended: false,
 }));
 
-app.use('/api/v1/admin', AdminRoutes);
-app.use('/api/v1', userRoutes);
-app.use('/api/v1/meetups', meetupRoutes);
-app.use('/api/v1/questions', questionsRoute);
-// app.use('api/v1/comments', commentRoutes);
+app.use('/api/v1', routes);
+
+app.all('/api/v1', (req, res) => {
+  res.status(200).json({
+    status: 200,
+    message: 'Welcome to the Questioner API.',
+  });
+});
+
+app.all('/*', (req, res) => res.status(404).json({
+  status: 404,
+  message: 'This route does not exist you might want to check your route specification on postman.',
+}));
 
 app.use((req, res, next) => {
   const error = new Error('Invalid route');
   error.status = 404;
   next(error);
 });
 
-app.use((error, req, res, next) => {
-  if (error instanceof expressValidation.ValidationError) {
-    res.status(error.status).json(error);
-  } else {
-    res.status(500)
-      .json({
-        status: error.status,
-        message: error.messages,
-      });
-  }
-});
-
 app.use((error, req, res) => {
   res.status(error.status || 500);
   res.json({

server/controller/comments.js

@@ -1,24 +1,26 @@
 /* eslint-disable eol-last */
 // import CommentsModel from '../models/comments';
-// import QuestionModel from '../models/question';
+import QuestionModel from '../models/question';
 
-// const commentsController = {
+const commentsController = {
 
-//   async createComment(req, res) {
-//     const comment = req.body;
-//     const checkquestion = await QuestionModel.getcommentById(comment.commentId);
-//     if (!checkquestion) {
-//       res.status(404).json({
-//         status: 404,
-//         error: 'comment does not exist',
-//       });
+  async createComment(req, res) {
+    const comment = req.body;
+    const checkquestion = await QuestionModel.getcommentById(comment.commentId);
+    if (!checkquestion) {
+      res.status(404).json({
+        status: 404,
+        error: 'comment does not exist',
+      });
 
-//       comment.title = checkquestion.title;
-//       comment.body = checkquestion.body;
-//       comment.userid = req.user.id;
+      comment.title = checkquestion.title;
+      comment.body = checkquestion.body;
+      comment.userid = req.user.id;
 
-//       const newComment = new CommentsModel(comment);
-//       const createdComment = await CommentsModel.createComment(newComment);
-//     }
-//   },
-// };
+      const newComment = new CommentsModel(comment);
+      const createdComment = await CommentsModel.createComment(newComment);
+    }
+  },
+};
+
+export default commentsController;

server/controller/meetups.js

@@ -1,51 +1,27 @@
 /* eslint-disable eol-last */
 import MeetupModels from '../models/meetup';
+import {
+  errorResponse,
+  successResponse,
+} from '../utilities/responseformat';
 
 
 const MeetupController = {
 
   async createMeetup(req, res) {
-    const {
-      topic,
-      location,
-      date,
-      image,
-      tags,
-    } = req.body;
-
-    const formatedTags = tags.trim().split('');
-
-    const newMeetUp = {
-      topic,
-      location,
-      date,
-      image,
-      formatedTags,
-    };
-
-    const meetupData = new MeetupModels(newMeetUp);
+    const meetupData = new MeetupModels(req.body);
     const createdMeetup = await meetupData.createMeetup();
-    res.status(201).json({
-      status: 201,
-      message: 'Meetup created',
-      data: createdMeetup,
-    });
+    return successResponse(res, 201, 'Meetup created', createdMeetup);
   },
 
   async getAllMeetups(req, res) {
     const allMeetups = await MeetupModels.retrieveAllMeetups();
 
     if (allMeetups.length === 0) {
-      res.status(204).json({
-        status: 204,
-        error: 'Empty resource',
-      });
+      return errorResponse(res, 204, 'Empty Resource');
     }
 
-    return res.status(200).json({
-      status: 200,
-      data: allMeetups,
-    });
+    return successResponse(res, 200, 'All available meetups', allMeetups);
   },
 
   async getSingleMeetup(req, res) {
@@ -55,37 +31,35 @@ const MeetupController = {
     const retrievedMeetup = await MeetupModels.retrieveSingleMeetup(id);
 
     if (!retrievedMeetup) {
-      res.status(404).json({
-        status: 404,
-        error: 'Meetup not found',
-      });
+      return errorResponse(res, 404, 'Meetup not found');
     }
 
-    return res.status(200).json({
-      status: 200,
-      message: 'Meetup Found!',
-      data: retrievedMeetup,
-    });
+    return successResponse(res, 200, 'Meetup Found', retrievedMeetup);
   },
 
   async getUpcomingMeetups(req, res) {
-    const currentDate = new Date(Date.now() / 1000) + 39;
+    const currentDate = new Date(Date.now());
 
     const upcomingMeetups = await MeetupModels.retrieveUpcomingMeetups(currentDate);
 
     if (upcomingMeetups.length === 0) {
-      return res.status(404).json({
-        status: 404,
-        err0r: 'No upcoming meetups found',
-      });
+      return errorResponse(res, 404, 'No upcoming meetups');
     }
-    return res.status(200).json({
-      status: 200,
-      message: 'These are pending meetups',
-      data: upcomingMeetups,
-    });
+
+    return successResponse(res, 200, 'These are the upcoming meetups', upcomingMeetups);
   },
 
+
+  async deleteMeetup(req, res) {
+    const {
+      id,
+    } = req.params;
+    const meetup = await MeetupModels.retrieveSingleMeetup(id);
+
+    if (!meetup) return errorResponse(res, 404, 'Meetup not found.');
+    await MeetupModels.deleteMeetup(id);
+    return successResponse(res, 200, 'Meetup deleted successfully.', null);
+  },
 };
 
 

server/controller/questions.js

@@ -1,6 +1,10 @@
 /* eslint-disable eol-last */
 import Question from '../models/question';
 import Meetup from '../models/meetup';
+import {
+  errorResponse,
+  successResponse,
+} from '../utilities/responseformat';
 
 export default {
   async createQuestion(req, res) {
@@ -13,17 +17,10 @@ export default {
 
     const meetupExists = await Meetup.retrieveSingleMeetup(question.meetupid);
     if (!meetupExists) {
-      return res.status(404).json({
-        status: 404,
-        error: 'Meetup not found',
-      });
+      return errorResponse(res, 404, 'Meetup not found');
     }
 
     const newQuestion = await question.postQuestion();
-    return res.status(201).json({
-      status: 201,
-      message: 'Question created',
-      data: [newQuestion],
-    });
+    return successResponse(res, 201, 'Question created', newQuestion);
   },
 };