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.

Sign up for GitHub

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

Jump to bottom

#167730643 User Role Settings #39

Open

OmoloyinA wants to merge 26 commits into develop from ft-user-role-settings-#167730643

Collaborator

OmoloyinA commented Sep 15, 2019

What does this PR do?

Have super-admin get the privilege to assign roles to users

Description of Task to be completed?

Modify users table to contain all roles
Create an endpoint for assigning users roles
Ensure that only super admins can access this endpoint

How should this be manually tested?

Any background context you want to provide?

What are the relevant pivotal tracker stories?

Screenshots (if appropriate)

Questions:

OmoloyinA and others added 26 commits

September 13, 2019 13:37


          updated travis and test

50645bb


          feature(notify-request): notify manager of travel request

5d29574

- Create a  table
- Install dependencies  and

[Start #167730641]


          pop-up of stashed commits

a398362


          declaring server as a function in the entry point

e16b72e


          setting up the project

7b1af3a


          updating the controller and test files with line-spacing

ce3ea15


          updating the .env file to hold values for sendGrid

5e8e023


          created service and routes files

1e22bad


          installing @sendgrid/mail package from npm

46c79b7


          Checking out the socket.io client and server side

ebbf9d9


          refactoring codes

82d0ddc


          edited the entry point and routes to test with postman

4ebc6b7


          updating the database models, migrations and seeders files

d412bd2


          reconfigured local project to be in sync with develop

2bba6ea


          updating the database

250f35d


          changing folder structure

41bb90f


          feature(approve-travel-request):enable manager to approve travel request

3fae104

- enable a manager to approve a travel request of his/her direct report
- test the endpoint to ensure it works, even on Postman
- add Mock data for testing in the test folder

[Finishes #168437115]


          brute force of merged PR

6f9953b


          implementation of notification features

a6a3cfc


          Merge branch 'develop' into ft-notify-new-travel-167730641

b7a3902


          feature(notify-new-request): new travel requests

d8ecdcf

- The push notification
- The email notification
Create a notifications table
Install dependencies socket.io and auto-bind
Prepare the server
Set-up the project
Display New travel Requests
Add Notifications
Send Push and Email Notifications
[Finishes: #167730641]


          feature(notify-new-request): new travel requests

db6cfba

- The push notification
- The email notification
Create a notifications table
Install dependencies socket.io and auto-bind
Prepare the server
Set-up the project
Display New travel Requests
Add Notifications
Send Push and Email Notifications
[Finishes: #167730641]


          feature(notify-new-request): new travel requests

a64e64c

- The push notification
- The email notification
- Create a notifications table
- Install dependencies socket.io and auto-bind
- Prepare the server
- Set-up the project
- Display New travel Requests
- Add Notifications
- Send Push and Email Notifications
[Finishes: #167730641]


          feature(notify-new-request): new travel requests

63b4184

- The push notification
- The email notification
- Create a notifications table
- Install dependencies socket.io and auto-bind
- Prepare the server
- Set-up the project
- Display New travel Requests
- Add Notifications
- Send Push and Email Notifications
[Finishes: #167730641]


          feature(role-setting): user role settings

47bf0c3


          feature(role-settings): user role set-up

b275058

[Starts: #167730643]

OmoloyinA added the work-in-progress label

hound bot reviewed

View reviewed changes

src/services/travelServices.js

+                      return await travel_requests.update({ approval_status: 'accepted' }, { returning: true, where: { id } });
+                  } catch (err) {
+                      throw err;
+                  }

hound bot Sep 15, 2019

Expected indentation of 2 spaces but found 4 indent

src/services/travelServices.js

+                  try {
+                      return await travel_requests.update({ approval_status: 'accepted' }, { returning: true, where: { id } });
+                  } catch (err) {
+                      throw err;

hound bot Sep 15, 2019

Expected indentation of 4 spaces but found 8 indent

src/services/travelServices.js

+              export const approveTravel = async(id) => {
+                  try {
+                      return await travel_requests.update({ approval_status: 'accepted' }, { returning: true, where: { id } });
+                  } catch (err) {

hound bot Sep 15, 2019

Expected indentation of 2 spaces but found 4 indent

src/services/travelServices.js

-                }
+              export const approveTravel = async(id) => {
+                  try {
+                      return await travel_requests.update({ approval_status: 'accepted' }, { returning: true, where: { id } });

hound bot Sep 15, 2019

Expected indentation of 4 spaces but found 8 indent

src/services/travelServices.js

-                  throw error;
-                }
+              export const approveTravel = async(id) => {
+                  try {

hound bot Sep 15, 2019

Expected indentation of 2 spaces but found 4 indent

src/services/travelServices.js

+                  try {
+                      return await travel_requests.findAll({
+                          where: {
+                              user_id: userId,

hound bot Sep 15, 2019

Expected indentation of 8 spaces but found 16 indent

src/services/travelServices.js

+              export const showUsertravelsStatus = async(userId) => {
+                  try {
+                      return await travel_requests.findAll({
+                          where: {

hound bot Sep 15, 2019

Expected indentation of 6 spaces but found 12 indent

src/services/travelServices.js

-                }
+              export const showUsertravelsStatus = async(userId) => {
+                  try {
+                      return await travel_requests.findAll({

hound bot Sep 15, 2019

Expected indentation of 4 spaces but found 8 indent

src/services/travelServices.js

-                  throw err;
-                }
+              export const showUsertravelsStatus = async(userId) => {
+                  try {

hound bot Sep 15, 2019

Expected indentation of 2 spaces but found 4 indent

src/services/travelServices.js

-                } catch (err) {
-                  throw err;
-                }
+              export const showUsertravelsStatus = async(userId) => {

hound bot Sep 15, 2019

Missing space before function parentheses space-before-function-paren

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

work-in-progress