Merge pull request #55 from andela/hotfix-routes-167474497

#167474497 Routes hotfix

src/routes/v1/article.route.js

@@ -1,5 +1,6 @@
 import { Router } from 'express';
 import ArticleController from '../../controllers/article.controller';
+import RatingsController from '../../controllers/rating.controller';
 import authMiddleware from '../../middleware/auth.middleware';
 import articleMiddleware from '../../middleware/article.middleware';
 import validationMiddleware from '../../middleware/validation.middleware';
@@ -74,4 +75,12 @@ router.get(
   ArticleController.fetchSpecificArticle
 );
 
+router.patch(
+  '/:articleId/ratings',
+  authMiddleware,
+  validateRequest,
+  articleMiddleware,
+  RatingsController.rateArticles
+);
+
 export default router;

src/routes/v1/auth.route.js

@@ -4,8 +4,23 @@ import '../../helpers/passport/google';
 import '../../helpers/passport/facebook';
 import { respondCallback } from '../../helpers/passport/callback';
 import responseGenerator from '../../helpers/responseGenerator';
+import validationMiddleware from '../../middleware/validation.middleware';
+import authMiddleware from '../../middleware/auth.middleware';
+import UserController from '../../controllers/user.controller';
 
 const router = express.Router();
+const validateRequest = validationMiddleware();
+
+router.post('/signup', validateRequest, UserController.createAccount);
+
+router.post('/login', validateRequest, UserController.loginUser);
+
+router.patch(
+  '/verify/:token',
+  validateRequest,
+  authMiddleware,
+  UserController.verifyUser
+);
 
 router.get(
   '/google',

src/routes/v1/index.js

@@ -1,18 +1,15 @@
 import authRoutes from './auth.route';
 import userRoutes from './user.route';
 import articleRoutes from './article.route';
-import ratingRoutes from './rating.route';
 import searchRoute from './search.route';
 import noitificationsRoute from './notification.route';
 import tagRoutes from './tag.route';
 
 export default app => {
-  app.use('/auth', authRoutes);
+  app.use('/api/v1/auth', authRoutes);
   app.use('/api/v1/users', userRoutes);
-  app.use('/api/v1/auth', userRoutes);
   app.use('/api/v1/articles', articleRoutes);
-  app.use('/api/v1/articles', ratingRoutes);
-  app.use('/api/v1', searchRoute);
+  app.use('/api/v1/search', searchRoute);
   app.use('/api/v1/notifications', noitificationsRoute);
   app.use('/api/v1/tags', tagRoutes);
 };

src/routes/v1/search.route.js

@@ -3,6 +3,6 @@ import SearchController from '../../controllers/search.controller';
 
 const router = Router();
 
-router.get('/search', SearchController.generateSearchQuery);
+router.get('/', SearchController.generateSearchQuery);
 
 export default router;

src/routes/v1/user.route.js

@@ -9,10 +9,6 @@ import superAdminCheck from '../../middleware/permission.middleware';
 const router = Router();
 const validateRequest = validationMiddleware();
 
-router.post('/signup', validateRequest, UserController.createAccount);
-
-router.post('/login', validateRequest, UserController.loginUser);
-
 router.put(
   '/:id',
   validateRequest,
@@ -34,13 +30,6 @@ router.get(
   UserController.getFollowings
 );
 
-router.patch(
-  '/verify/:token',
-  validateRequest,
-  authMiddleware,
-  UserController.verifyUser
-);
-
 router.get('/', paginationValidations, UserController.listUsers);
 
 router.patch(

src/test/oauth.spec.js

@@ -11,7 +11,7 @@ describe('SOCIAL LOGIN', () => {
       .get('/auth/facebook')
       .reply(200, { message: 'hit the route' });
 
-    const res = await chai.request(app).get('/auth/facebook');
+    const res = await chai.request(app).get('/api/v1/auth/facebook');
     expect(res.body.message).to.include('hit the route');
     expect(res.status).to.eql(200);
   });
@@ -22,7 +22,7 @@ describe('SOCIAL LOGIN', () => {
       .get('/auth/facebook/callback')
       .reply(200, { message: 'hit the route' });
 
-    const res = await chai.request(app).get('/auth/facebook/callback');
+    const res = await chai.request(app).get('/api/v1/auth/facebook/callback');
     expect(res.body.message).to.include('hit the route');
     expect(res.status).to.eql(200);
   });
@@ -33,7 +33,7 @@ describe('SOCIAL LOGIN', () => {
       .get('/auth/google')
       .reply(200, { message: 'hit the route' });
 
-    const res = await chai.request(app).get('/auth/google');
+    const res = await chai.request(app).get('/api/v1/auth/google');
     expect(res.body.message).to.include('hit the route');
     expect(res.status).to.eql(200);
   });
@@ -44,7 +44,7 @@ describe('SOCIAL LOGIN', () => {
       .get('/auth/google/callback')
       .reply(200, { message: 'hit the route' });
 
-    const res = await chai.request(app).get('/auth/google/redirect');
+    const res = await chai.request(app).get('/api/v1/auth/google/redirect');
     expect(res.body.message).to.include('hit the route');
     expect(res.status).to.eql(200);
   });
@@ -54,7 +54,7 @@ describe('SOCIAL LOGIN', () => {
       .get('/auth/github')
       .reply(200, 'hit the route');
 
-    const res = await chai.request(app).get('/auth/github');
+    const res = await chai.request(app).get('/api/v1/auth/github');
     expect(res.body).to.an('object');
   });
 
@@ -63,7 +63,7 @@ describe('SOCIAL LOGIN', () => {
       .get('/auth/github/callback')
       .reply(200, { message: 'hit the route' });
 
-    const res = await chai.request(app).get('/auth/github/callback');
+    const res = await chai.request(app).get('/api/v1/auth/github/callback');
     expect(res.body).to.an('object');
   });
 });