Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

#167727662-Re-Confirm-Travel-Requests #47

Merged
merged 2 commits into from
Sep 5, 2019

Conversation

gmemmy
Copy link
Collaborator

@gmemmy gmemmy commented Sep 3, 2019

What does this PR do

It implements a confirmation feature for a line manager to confirm an approved travel request.

Description of Task to be completed?

  • Create a feature that allows a line manager to confirm the request of his/her direct report.

How should this be manually tested?

  • Clone the repo and cd into the project directory
  • Run yarn install to install the project's dependency
  • Run yarn start to start the app
  • Access the route for approving a request and fill in the required fields.

What are the relevant pivotal tracker stories?

#167727662

Any background context you want to add?

@gmemmy gmemmy added the W.I.P The PR is still being worked on label Sep 3, 2019
src/utils/helperMethod.js Outdated Show resolved Hide resolved
src/utils/helperMethod.js Outdated Show resolved Hide resolved
src/controllers/RequestController.js Outdated Show resolved Hide resolved
src/controllers/RequestController.js Outdated Show resolved Hide resolved
src/controllers/RequestController.js Outdated Show resolved Hide resolved
src/controllers/RequestController.js Show resolved Hide resolved
@gmemmy gmemmy force-pushed the ft-reconfirm-travel-requests-167727662 branch 2 times, most recently from b3abbfb to 04bd48e Compare September 3, 2019 16:33
@gmemmy gmemmy force-pushed the ft-reconfirm-travel-requests-167727662 branch from 04bd48e to 257326d Compare September 3, 2019 16:35
@gmemmy gmemmy added Ready-for-review The PR is ready to be reviewed by teammates and removed W.I.P The PR is still being worked on labels Sep 3, 2019
@gmemmy gmemmy force-pushed the ft-reconfirm-travel-requests-167727662 branch 4 times, most recently from 79ed639 to e3ea728 Compare September 3, 2019 18:46
src/utils/helperMethod.js Outdated Show resolved Hide resolved
src/utils/helperMethod.js Outdated Show resolved Hide resolved
@gmemmy gmemmy force-pushed the ft-reconfirm-travel-requests-167727662 branch from e3ea728 to 77a0ec7 Compare September 3, 2019 18:55
@Daymorelah
Copy link
Contributor

Please, re-implement this feature. create a separate route handler for this feature in implement the logic for this feature in the route handler you will create.

@gmemmy gmemmy force-pushed the ft-reconfirm-travel-requests-167727662 branch from 6c77078 to 6c80f92 Compare September 4, 2019 09:32
src/validation/index.js Outdated Show resolved Hide resolved
src/validation/index.js Outdated Show resolved Hide resolved
src/controllers/RequestController.js Outdated Show resolved Hide resolved
src/controllers/RequestController.js Show resolved Hide resolved
src/controllers/RequestController.js Show resolved Hide resolved
src/controllers/RequestController.js Show resolved Hide resolved
@gmemmy gmemmy force-pushed the ft-reconfirm-travel-requests-167727662 branch 2 times, most recently from 2caf5eb to d5e3505 Compare September 4, 2019 10:32
src/models/Request.js Outdated Show resolved Hide resolved
src/migrations/03-create-requests.js Outdated Show resolved Hide resolved
@gmemmy gmemmy added the W.I.P The PR is still being worked on label Sep 5, 2019
@gmemmy gmemmy force-pushed the ft-reconfirm-travel-requests-167727662 branch 2 times, most recently from 7c8c877 to 0ecc161 Compare September 5, 2019 07:45
@gmemmy gmemmy removed the W.I.P The PR is still being worked on label Sep 5, 2019
* feature(request):add multi-city request route

Create feature to confirm approved travel requests

* feature(request):add multi-city request route
@gmemmy gmemmy force-pushed the ft-reconfirm-travel-requests-167727662 branch from 0ecc161 to 189c013 Compare September 5, 2019 12:31
src/test/unitTests/sendEmail.test.js Outdated Show resolved Hide resolved
src/test/unitTests/sendEmail.test.js Outdated Show resolved Hide resolved
src/test/unitTests/requestController.test.js Outdated Show resolved Hide resolved
src/test/unitTests/requestController.test.js Outdated Show resolved Hide resolved
src/test/integrationTests/userController.test.js Outdated Show resolved Hide resolved
src/routes/socialAuthRoute.js Outdated Show resolved Hide resolved
src/routes/index.js Outdated Show resolved Hide resolved
src/models/User.js Outdated Show resolved Hide resolved
src/models/User.js Outdated Show resolved Hide resolved
src/index.js Outdated Show resolved Hide resolved
@Daymorelah Daymorelah force-pushed the ft-reconfirm-travel-requests-167727662 branch from 92a1e31 to 4920eb6 Compare September 5, 2019 14:12
src/controllers/RequestController.js Show resolved Hide resolved
src/controllers/RequestController.js Outdated Show resolved Hide resolved
src/controllers/RequestController.js Outdated Show resolved Hide resolved
@Daymorelah Daymorelah force-pushed the ft-reconfirm-travel-requests-167727662 branch from 4920eb6 to eefce86 Compare September 5, 2019 14:26
'Could not confirm the request. Please try again', 400);
}
return HelperMethods.clientError(res,
'The request you are trying to confirm cannot be found', 404);
Copy link

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Expected a newline before ')' function-paren-newline

if (approvedRequest) {
if (approvedRequest.status === 'confirmed') {
return HelperMethods.clientError(res,
'This request has already been confirmed', 404);
Copy link

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Expected a newline before ')' function-paren-newline

});
if (approvedRequest) {
if (approvedRequest.status === 'confirmed') {
return HelperMethods.clientError(res,
Copy link

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Expected a newline after '(' function-paren-newline

@Daymorelah Daymorelah merged commit 26b7880 into develop Sep 5, 2019
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
Ready-for-review The PR is ready to be reviewed by teammates
Projects
None yet
Development

Successfully merging this pull request may close these issues.

None yet

2 participants