add search travel request #33

t4christ · 2019-09-13T09:23:41Z

What does this PR do?

This PR allows users to search for travel request.

Description of Task to be completed

 Search for travel request based on origin and destination

How should this be manually tested?

  Using postman

What are the relevant pivotal tracker stories?

  #167730650

hound · 2019-09-13T09:23:47Z

src/validation/travelValidation.js

+		}
+		return next();
+	}
+


Too many blank lines at the end of file. Max of 1 allowed no-multiple-empty-lines

hound · 2019-09-13T09:23:48Z

src/validation/travelValidation.js

+            return errorResponse(res, statusCode.badRequest, error);
+		}
+		return next();
+	}


Expected indentation of 0 spaces but found 1 tab indent
Missing semicolon semi

hound · 2019-09-13T09:23:48Z

src/validation/travelValidation.js

+            });
+            return errorResponse(res, statusCode.badRequest, error);
+		}
+		return next();


Expected indentation of 2 spaces but found 2 tabs indent

hound · 2019-09-13T09:23:48Z

src/validation/travelValidation.js

+                error.push(err.msg);
+            });
+            return errorResponse(res, statusCode.badRequest, error);
+		}


Expected indentation of 2 spaces but found 2 tabs indent

hound · 2019-09-13T09:23:48Z

src/validation/travelValidation.js

+            errors.array().forEach((err) => {
+                error.push(err.msg);
+            });
+            return errorResponse(res, statusCode.badRequest, error);


Expected indentation of 4 spaces but found 12 indent

hound · 2019-09-13T09:23:50Z

src/validation/travelValidation.js

+        .withMessage(message.lettersAlone)
+    ]
+
+export const validateTravelResult  = (req, res, next) => {


Multiple spaces found before '=' no-multi-spaces

hound · 2019-09-13T09:23:50Z

src/validation/travelValidation.js

+        .withMessage(message.lettersAlone),
+        check('destination').not().isInt()
+        .withMessage(message.lettersAlone)
+    ]


Expected indentation of 0 spaces but found 4 indent
Missing semicolon semi

hound · 2019-09-13T09:23:50Z

src/validation/travelValidation.js

+        check('origin').not().isInt()
+        .withMessage(message.lettersAlone),
+        check('destination').not().isInt()
+        .withMessage(message.lettersAlone)


Expected indentation of 4 spaces but found 8 indent

hound · 2019-09-13T09:23:50Z

src/validation/travelValidation.js

+export const validateTravelSearch = [
+        check('origin').not().isInt()
+        .withMessage(message.lettersAlone),
+        check('destination').not().isInt()


Expected indentation of 2 spaces but found 8 indent

hound · 2019-09-13T09:23:50Z

src/validation/travelValidation.js

+
+export const validateTravelSearch = [
+        check('origin').not().isInt()
+        .withMessage(message.lettersAlone),


Expected indentation of 4 spaces but found 8 indent

hound · 2019-09-13T09:56:52Z

src/validation/travelValidation.js

+    .not()
+    .isInt()
+    .withMessage(message.lettersAlone),
+  check("destination")


Strings must use singlequote quotes

hound · 2019-09-13T09:56:53Z

src/validation/travelValidation.js

+};
+
+export const validateTravelSearch = [
+  check("origin")


Strings must use singlequote quotes

hound · 2019-09-13T09:56:53Z

src/validation/travelValidation.js

+      .not()
+      .isEmpty()
+      .withMessage(message.emptyDepartureDate),
+    check("travel_purpose")


Strings must use singlequote quotes

hound · 2019-09-13T09:56:53Z

src/validation/travelValidation.js

      .withMessage(message.emptyDestination)
      .isAlpha()
      .withMessage(message.lettersAlone),
-    check('departure_date').not().isEmpty().withMessage(message.emptyDepartureDate),
-    check('travel_purpose').not().isEmpty().withMessage(message.emptyTravelPurpose),
+    check("departure_date")


Strings must use singlequote quotes

hound · 2019-09-13T09:56:53Z

src/validation/travelValidation.js

      .withMessage(message.emptyOrigin)
      .isAlpha()
      .withMessage(message.lettersAlone),
-    check('destination').not().isEmpty()
+    check("destination")


Strings must use singlequote quotes

hound · 2019-09-13T09:56:54Z

src/tests/travel.test.js

+    const searchTravelRequest = {
+      "origin":"NewYork, USA",
+      "destination":"Paris, France"
+      }


Expected indentation of 4 spaces but found 6 indent
Missing semicolon semi

hound · 2019-09-13T09:56:54Z

src/tests/travel.test.js

+  it('should return search result based on origin and destination', (done) => {
+    const searchTravelRequest = {
+      "origin":"NewYork, USA",
+      "destination":"Paris, France"


Missing space before value for key 'destination' key-spacing
Strings must use singlequote quotes
Unnecessarily quoted property 'destination' found quote-props

hound · 2019-09-13T09:56:54Z

src/tests/travel.test.js

+
+  it('should return search result based on origin and destination', (done) => {
+    const searchTravelRequest = {
+      "origin":"NewYork, USA",


Missing space before value for key 'origin' key-spacing
Strings must use singlequote quotes
Unnecessarily quoted property 'origin' found quote-props

hound · 2019-09-13T09:56:54Z

src/services/travelServices.js

+        return {
+          origin: body[key]
+        };
+      case "destination":


Strings must use singlequote quotes

hound · 2019-09-13T09:56:55Z

src/services/travelServices.js

+  const { limit, offset } = computeLimitAndOffset(page, perPage);
+  const searchValue = Object.keys(body).map(key => {
+    switch (key) {
+      case "origin":


Strings must use singlequote quotes

captainamiedi

nice work. i can see alot of hard work here but i can see console.log on your controller file

hound · 2019-09-13T10:42:39Z

src/routes/travelRoute.js

@@ -13,6 +14,7 @@ route.post('/onewaytrip', getToken, verifyToken, validateTravelRequest, validate

 // handles manager pending req approvals route
 route.get('/requests/pending/:manager', getToken, verifyToken, pendingManagerApproval);
+route.get('/search/travels',validateTravelSearch, validateTravelResult,searchTravels);


A space is required after ',' comma-spacing

hound · 2019-09-13T10:42:39Z

src/routes/travelRoute.js

 import { getToken, verifyToken } from '../middlewares/tokenMiddleware';
+import travelValidator,{validateTravelSearch, validateTravelResult} from '../validation/travelValidation';


A space is required after ',' comma-spacing
A space is required after '{' object-curly-spacing
A space is required before '}' object-curly-spacing

hound · 2019-09-13T10:42:39Z

src/routes/travelRoute.js

@@ -1,8 +1,9 @@
 import { Router } from 'express';

-import travelControllers from '../controllers/travelControllers';
-import travelValidator from '../validation/travelValidation';
+import travelControllers, {searchTravels} from '../controllers/travelControllers';


A space is required after '{' object-curly-spacing
A space is required before '}' object-curly-spacing

hound · 2019-09-13T10:42:39Z

src/controllers/travelControllers.js

+    const meta = paginate(page, perPage, count, rows);
+    return res.status(200).json({ success: { requests: rows, meta } });
+  } catch (error) {
+    return res.status(404).json({ error: error });


Expected property shorthand object-shorthand

@t4christ Excellent

There is a defined error handler in the utils folder, instead of res.status(404)..... and also a success response too... instead of res.status(200)....

hound · 2019-09-13T10:42:40Z

src/controllers/travelControllers.js

      } catch (error) {
+


Trailing spaces not allowed no-trailing-spaces

hound · 2019-09-13T10:42:40Z

src/controllers/travelControllers.js

-		} else {
+    if (role === 'admin') {
+      return errorResponse(res, statusCode.unauthorized, message.unauthorized);
+    } else {


Unnecessary 'else' after 'return' no-else-return

hound · 2019-09-13T10:42:40Z

src/controllers/travelControllers.js

-      const filteredRequests = requestsPending.filter(request => request['user.department.line_manager'] !== null);
+      const filteredRequests = requestsPending.filter(
+        request => request['user.department.line_manager'] !== null
+      );


Unexpected newline before ')' function-paren-newline

hound · 2019-09-13T10:42:40Z

src/controllers/travelControllers.js

@@ -46,29 +56,60 @@ export default {
    try {
      const requestsPending = await showManagerPendingAppr(manager);

-      const filteredRequests = requestsPending.filter(request => request['user.department.line_manager'] !== null);
+      const filteredRequests = requestsPending.filter(


Unexpected newline after '(' function-paren-newline

captainamiedi

I'm having difficulty using the GET verb to search using Post man.

t4christ · 2019-09-13T11:43:52Z

I'm having difficulty using the GET verb to search using Post man.

You have to add origin and destination in the body not as a parameter. When using a get request

Marshalheri

Nice work team mate.
Please do the following:

remove the bearer string you appended to your token value in your test file the token generator now appends it as we discussed.
also just like everything that involved authentication started with /auth make all that involves the travel to start with /travel for consistency

yeah. i was able to create a return trip. i have approve as well.

chuksjoe

Great work bro @t4christ, but I will like to bring to your attention that the users should be able to search based on the column headers which are: request ID, owner, destination, origin, duration, start date, request status, etc.
I will like to know if your implementation supports the above.

I already thought of it and i wanted to pass it accross the house that i think the only thing a user needs to search for is the origin and destination which will return the search result containing other components. A user will mostly be interested in the origin and destination of a travel

iakhator

still coding style everywhere

I don't understand what you mean sir

chuksjoe · 2019-09-13T13:57:39Z

Great work bro @t4christ, but I will like to bring to your attention that the users should be able to search based on the column headers which are: request ID, owner, destination, origin, duration, start date, request status, etc.
I will like to know if your implementation supports the above.

I already thought of it and i wanted to pass it accross the house that i think the only thing a user needs to search for is the origin and destination which will return the search result containing other components. A user will mostly be interested in the origin and destination of a travel

You can go through the PT story description to get the full details of the story so you don't miss the full picture of the task. As a user, I might want to get a list of my approved request or the likes.

OmoloyinA

Nice work you've done here bro. However, I will like you to resolve conflicts and I am good to go with your PR.

Kaytbode

@t4christ Appreciate what you did here

Left some comments for you while going through your code. Please attend to them, and get hound to stop dancing..

Marshalheri

Nice work team mate.
Please do effect the changes kayode recommended, so i can approve.
Your work is ok. Thanks.

add search travel request

e54a5cf

hound bot reviewed Sep 13, 2019

View reviewed changes

t4christ added 2 commits September 13, 2019 10:35

fix indentation spaces

2b9989f

fix conflicts

1b0da71

hound bot reviewed Sep 13, 2019

View reviewed changes

t4christ assigned chuksjoe, Kaytbode, iakhator, OmoloyinA, danoseun, coolbop1, Marshalheri and captainamiedi Sep 13, 2019

t4christ requested review from chuksjoe, Kaytbode, captainamiedi, OmoloyinA, coolbop1, danoseun, iakhator and Marshalheri September 13, 2019 09:59

captainamiedi reviewed Sep 13, 2019

View reviewed changes

removed uneccesary codes

5840b71

hound bot reviewed Sep 13, 2019

View reviewed changes

captainamiedi reviewed Sep 13, 2019

View reviewed changes

Marshalheri requested changes Sep 13, 2019

View reviewed changes

chuksjoe reviewed Sep 13, 2019

View reviewed changes

iakhator suggested changes Sep 13, 2019

View reviewed changes

OmoloyinA approved these changes Sep 13, 2019

View reviewed changes

Kaytbode requested changes Sep 14, 2019

View reviewed changes

Marshalheri requested changes Sep 17, 2019

View reviewed changes

		import { getToken, verifyToken } from '../middlewares/tokenMiddleware';
		import travelValidator,{validateTravelSearch, validateTravelResult} from '../validation/travelValidation';

add search travel request #33

Are you sure you want to change the base?

add search travel request #33

Conversation

t4christ commented Sep 13, 2019 • edited Loading

What does this PR do?

Description of Task to be completed

How should this be manually tested?

What are the relevant pivotal tracker stories?

hound bot Sep 13, 2019

Choose a reason for hiding this comment

hound bot Sep 13, 2019

Choose a reason for hiding this comment

hound bot Sep 13, 2019

Choose a reason for hiding this comment

hound bot Sep 13, 2019

Choose a reason for hiding this comment

hound bot Sep 13, 2019

Choose a reason for hiding this comment

hound bot Sep 13, 2019

Choose a reason for hiding this comment

hound bot Sep 13, 2019

Choose a reason for hiding this comment

hound bot Sep 13, 2019

Choose a reason for hiding this comment

hound bot Sep 13, 2019

Choose a reason for hiding this comment

hound bot Sep 13, 2019

Choose a reason for hiding this comment

hound bot Sep 13, 2019

Choose a reason for hiding this comment

hound bot Sep 13, 2019

Choose a reason for hiding this comment

hound bot Sep 13, 2019

Choose a reason for hiding this comment

hound bot Sep 13, 2019

Choose a reason for hiding this comment

hound bot Sep 13, 2019

Choose a reason for hiding this comment

hound bot Sep 13, 2019

Choose a reason for hiding this comment

hound bot Sep 13, 2019

Choose a reason for hiding this comment

hound bot Sep 13, 2019

Choose a reason for hiding this comment

hound bot Sep 13, 2019

Choose a reason for hiding this comment

hound bot Sep 13, 2019

Choose a reason for hiding this comment

captainamiedi left a comment

Choose a reason for hiding this comment

hound bot Sep 13, 2019

Choose a reason for hiding this comment

hound bot Sep 13, 2019

Choose a reason for hiding this comment

hound bot Sep 13, 2019

Choose a reason for hiding this comment

hound bot Sep 13, 2019

Choose a reason for hiding this comment

Kaytbode Sep 14, 2019

Choose a reason for hiding this comment

hound bot Sep 13, 2019

Choose a reason for hiding this comment

hound bot Sep 13, 2019

Choose a reason for hiding this comment

hound bot Sep 13, 2019

Choose a reason for hiding this comment

hound bot Sep 13, 2019

Choose a reason for hiding this comment

captainamiedi left a comment

Choose a reason for hiding this comment

t4christ commented Sep 13, 2019

Marshalheri left a comment • edited by captainamiedi Loading

Choose a reason for hiding this comment

chuksjoe left a comment • edited by t4christ Loading

Choose a reason for hiding this comment

iakhator left a comment • edited by t4christ Loading

Choose a reason for hiding this comment

chuksjoe commented Sep 13, 2019

OmoloyinA left a comment • edited Loading

t4christ commented Sep 13, 2019 •

edited

Loading

Marshalheri left a comment •

edited by captainamiedi

Loading

chuksjoe left a comment •

edited by t4christ

Loading

iakhator left a comment •

edited by t4christ

Loading

OmoloyinA left a comment •

edited

Loading