Skip to content

Commit

Permalink
Merge pull request #3138 from HHS/OPS-3111/update-user-role
Browse files Browse the repository at this point in the history 
Ops 3111/update user role
  • Loading branch information
@johndeange
johndeange authored Dec 2, 2024
2 parents 38ca21f + e59cc31 commit f226c1c
Show file tree
Hide file tree
Showing 16 changed files with 42 additions and 564 deletions.
65 changes: 11 additions & 54 deletions backend/data_tools/data/user_data.json5
View file
Original file line number Diff line number Diff line change
Expand Up @@ -111,28 +111,19 @@
"PATCH_UPLOAD_DOCUMENT",
],
},
{ // 2 User
name: "user",
{ // 2 Viewer/Editor
name: "VIEWER_EDITOR",
permissions: [
"GET_AGREEMENT",
"PUT_AGREEMENT",
"PATCH_AGREEMENT",
"POST_AGREEMENT",

"GET_BUDGET_LINE_ITEM",
"PUT_BUDGET_LINE_ITEM",
"PATCH_BUDGET_LINE_ITEM",
"POST_BUDGET_LINE_ITEM",

"GET_SERVICES_COMPONENT",
"PUT_SERVICES_COMPONENT",
"PATCH_SERVICES_COMPONENT",
"POST_SERVICES_COMPONENT",

"GET_BLI_PACKAGE",
"PUT_BLI_PACKAGE",
"PATCH_BLI_PACKAGE",
"POST_BLI_PACKAGE",

"GET_CAN",

Expand All @@ -150,6 +141,7 @@
"GET_USER",
"PUT_USER",
"PATCH_USER",

"GET_HISTORY",

"GET_WORKFLOW",
Expand All @@ -165,15 +157,7 @@
"PATCH_UPLOAD_DOCUMENT"
],
},
{ // 3 Unassigned (new user)
name: "unassigned",
permissions: [
"GET_USER",
"PUT_USER",
"PATCH_USER",
],
},
{ // 4 Division Director
{ // 3 Division Director
name: "division-director",
permissions: [
"GET_AGREEMENT",
Expand Down Expand Up @@ -237,13 +221,13 @@
"PATCH_UPLOAD_DOCUMENT"
]
},
{ // 5 User Admin
{ // 4 User Admin
name: "USER_ADMIN",
permissions: [
"POST_USER",
],
},
{ // 6 Budget Team Member
{ // 5 Budget Team Member
name: "BUDGET_TEAM",
permissions: [
"GET_AGREEMENT",
Expand Down Expand Up @@ -309,23 +293,6 @@
]
}
],
group: [
{ // 1
name: "Budget Team",
},
{ // 2
name: "Admins",
},
{ // 3
name: "Division Directors",
},
{ // 4
name: "COR Users",
},
{ // 5
name: "Users",
}
],
ops_user: [
{ // 500
first_name: "Chris",
Expand Down Expand Up @@ -360,8 +327,7 @@
division: 2,
email: "[email protected]",
oidc_id: "00000000-0000-1111-a111-000000000004",
roles: [{"tablename": "role", "id": 1}, {"tablename": "role", "id": 5}],
groups: [{"tablename": "group", "id": 1}],
roles: [{"tablename": "role", "id": 1}, {"tablename": "role", "id": 4}],
status: "ACTIVE"
},
{ // 504
Expand Down Expand Up @@ -439,7 +405,6 @@
//oidc_id: "e5711101-bc3e-41e5-a6a2-000000000000",
oidc_id: "e5711101-bc3e-41e5-a6a2-051874b307ca",
roles: [{"tablename": "role", "id": 1}],
groups: [{"tablename": "group", "id": 2}],
status: "ACTIVE"
},
{ // 513
Expand All @@ -449,7 +414,6 @@
email: "[email protected]",
oidc_id: "838861c4-8bee-427d-8b49-0892875483ba",
roles: [{"tablename": "role", "id": 1}],
groups: [{"tablename": "group", "id": 2}],
status: "ACTIVE"
},
{ // 514
Expand All @@ -459,7 +423,6 @@
email: "[email protected]",
oidc_id: "3e4c46ae-0ff9-4dd7-8671-b9801460a052",
roles: [{"tablename": "role", "id": 1}],
groups: [{"tablename": "group", "id": 2}],
status: "ACTIVE"
},
{ // 515
Expand All @@ -469,7 +432,6 @@
email: "[email protected]",
oidc_id: "c8102694-a707-418d-9698-1d33db337b86",
roles: [{"tablename": "role", "id": 1}],
groups: [{"tablename": "group", "id": 2}],
status: "INACTIVE"
},
{ // 516
Expand All @@ -479,7 +441,6 @@
email: "[email protected]",
oidc_id: "7716138a-dec6-4976-9f31-e30fade3254d",
roles: [{"tablename": "role", "id": 1}],
groups: [{"tablename": "group", "id": 2}],
status: "ACTIVE"
},
{ // 517
Expand All @@ -489,7 +450,6 @@
email: "[email protected]",
oidc_id: "48f7db91-1861-4d4b-813c-a6221cb61b60",
roles: [{"tablename": "role", "id": 1}],
groups: [{"tablename": "group", "id": 2}],
status: "ACTIVE"
},
{ // 518
Expand All @@ -499,7 +459,6 @@
email: "[email protected]",
oidc_id: "6e672c19-15bc-4901-8cee-b57cd8c6d0c1",
roles: [{"tablename": "role", "id": 1}],
groups: [{"tablename": "group", "id": 2}],
status: "ACTIVE"
},
{ // 519
Expand All @@ -509,7 +468,6 @@
email: "[email protected]",
oidc_id: "b5f7598b-e5e6-4b11-8321-b3acabc780f7",
roles: [{"tablename": "role", "id": 1}],
groups: [{"tablename": "group", "id": 2}],
status: "ACTIVE"
},
{ // 520 User is used in E2E tests
Expand All @@ -536,8 +494,7 @@
division: 1,
email: "[email protected]",
oidc_id: "00000000-0000-1111-a111-000000000020",
roles: [{"tablename": "role", "id": 4}],
groups: [{"tablename": "group", "id": 3}],
roles: [{"tablename": "role", "id": 3}],
status: "ACTIVE"
},
{ // 523
Expand All @@ -546,7 +503,7 @@
division: 1,
email: "[email protected]",
oidc_id: "00000000-0000-1111-a111-000000000021",
roles: [{"tablename": "role", "id": 5}, {"tablename": "role", "id": 6}],
roles: [{"tablename": "role", "id": 4}, {"tablename": "role", "id": 5}],
groups: [],
status: "ACTIVE"
},
Expand All @@ -564,7 +521,7 @@
last_name: "Derrek",
division: 6,
email: "[email protected]",
roles: [{"tablename": "role", "id": 4}],
roles: [{"tablename": "role", "id": 3}],
oidc_id: "00000000-0000-1111-a111-000000000022",
groups: [],
status: "ACTIVE"
Expand All @@ -587,7 +544,7 @@
first_name: "Sheila",
last_name: "Celentano",
email: "[email protected]",
roles: [{"tablename": "role", "id": 1}, {"tablename": "role", "id": 5}, {"tablename": "role", "id": 6}],
roles: [{"tablename": "role", "id": 1}, {"tablename": "role", "id": 4}, {"tablename": "role", "id": 5}],
status: "ACTIVE"
}
],
Expand Down
11 changes: 5 additions & 6 deletions backend/data_tools/initial_data/003-role.sql
View file
Original file line number Diff line number Diff line change
@@ -1,6 +1,5 @@
INSERT INTO ops.role (id, name, permissions, created_by, updated_by, created_on, updated_on) VALUES (1, 'SYSTEM_OWNER', '{GET_AGREEMENT,PUT_AGREEMENT,PATCH_AGREEMENT,DELETE_AGREEMENT,POST_AGREEMENT,GET_BUDGET_LINE_ITEM,PUT_BUDGET_LINE_ITEM,PATCH_BUDGET_LINE_ITEM,POST_BUDGET_LINE_ITEM,DELETE_BUDGET_LINE_ITEM,GET_SERVICES_COMPONENT,PUT_SERVICES_COMPONENT,PATCH_SERVICES_COMPONENT,POST_SERVICES_COMPONENT,GET_BLI_PACKAGE,PUT_BLI_PACKAGE,PATCH_BLI_PACKAGE,POST_BLI_PACKAGE,GET_CAN,POST_CAN,PATCH_CAN,PUT_CAN,DELETE_CAN,GET_DIVISION,PUT_DIVISION,PATCH_DIVISION,POST_DIVISION,DELETE_DIVISION,GET_NOTIFICATION,PUT_NOTIFICATION,PATCH_NOTIFICATION,GET_PORTFOLIO,PUT_PORTFOLIO,PATCH_PORTFOLIO,POST_PORTFOLIO,DELETE_PORTFOLIO,GET_RESEARCH_PROJECT,POST_RESEARCH_PROJECT,GET_USER,PUT_USER,PATCH_USER,GET_HISTORY,GET_WORKFLOW,PUT_WORKFLOW,PATCH_WORKFLOW,POST_WORKFLOW,GET_CHANGE_REQUEST,PATCH_CHANGE_REQUEST,POST_CHANGE_REQUEST,GET_CHANGE_REQUEST_REVIEW,PATCH_CHANGE_REQUEST_REVIEW,POST_CHANGE_REQUEST_REVIEW,GET_UPLOAD_DOCUMENT,POST_UPLOAD_DOCUMENT,PATCH_UPLOAD_DOCUMENT}', current_timestamp, current_timestamp);
INSERT INTO ops.role (id, name, permissions, created_on, updated_on) VALUES (2, 'user', '{GET_AGREEMENT,PUT_AGREEMENT,PATCH_AGREEMENT,POST_AGREEMENT,GET_BUDGET_LINE_ITEM,PUT_BUDGET_LINE_ITEM,PATCH_BUDGET_LINE_ITEM,POST_BUDGET_LINE_ITEM,GET_SERVICES_COMPONENT,PUT_SERVICES_COMPONENT,PATCH_SERVICES_COMPONENT,POST_SERVICES_COMPONENT,GET_BLI_PACKAGE,PUT_BLI_PACKAGE,PATCH_BLI_PACKAGE,POST_BLI_PACKAGE,GET_CAN,GET_DIVISION,GET_NOTIFICATION,PUT_NOTIFICATION,PATCH_NOTIFICATION,GET_PORTFOLIO,GET_RESEARCH_PROJECT,POST_RESEARCH_PROJECT,GET_USER,GET_USERS,GET_HISTORY,GET_WORKFLOW,GET_CHANGE_REQUEST,PATCH_CHANGE_REQUEST,POST_CHANGE_REQUEST,GET_CHANGE_REQUEST_REVIEW}', current_timestamp, current_timestamp);
INSERT INTO ops.role (id, name, permissions, created_on, updated_on) VALUES (3, 'unassigned', '{GET_USER,POST_USER,PUT_USER,PATCH_USER}', current_timestamp, current_timestamp);
INSERT INTO ops.role (id, name, permissions, created_on, updated_on) VALUES (4, 'division-director', '{GET_AGREEMENT,PUT_AGREEMENT,PATCH_AGREEMENT,POST_AGREEMENT,GET_BUDGET_LINE_ITEM,PUT_BUDGET_LINE_ITEM,PATCH_BUDGET_LINE_ITEM,POST_BUDGET_LINE_ITEM,GET_SERVICES_COMPONENT,PUT_SERVICES_COMPONENT,PATCH_SERVICES_COMPONENT,POST_SERVICES_COMPONENT,GET_BLI_PACKAGE,PUT_BLI_PACKAGE,PATCH_BLI_PACKAGE,POST_BLI_PACKAGE,GET_CAN,GET_DIVISION,GET_NOTIFICATION,PUT_NOTIFICATION,PATCH_NOTIFICATION,GET_PORTFOLIO,GET_RESEARCH_PROJECT,POST_RESEARCH_PROJECT,GET_USER,GET_USERS,GET_HISTORY,GET_WORKFLOW,PUT_WORKFLOW,PATCH_WORKFLOW,POST_WORKFLOW,GET_CHANGE_REQUEST,PATCH_CHANGE_REQUEST,POST_CHANGE_REQUEST,GET_CHANGE_REQUEST_REVIEW,PATCH_CHANGE_REQUEST_REVIEW,POST_CHANGE_REQUEST_REVIEW}', current_timestamp, current_timestamp);
INSERT INTO ops.role (id, name, permissions, created_on, updated_on) VALUES (5, 'USER_ADMIN', '{POST_USER}', current_timestamp, current_timestamp);
INSERT INTO ops.role (id, name, permissions, created_on, updated_on) VALUES (6, 'BUDGET_TEAM', '{GET_AGREEMENT,PUT_AGREEMENT,PATCH_AGREEMENT,POST_AGREEMENT,GET_BUDGET_LINE_ITEM,PUT_BUDGET_LINE_ITEM,PATCH_BUDGET_LINE_ITEM,POST_BUDGET_LINE_ITEM,GET_SERVICES_COMPONENT,PUT_SERVICES_COMPONENT,PATCH_SERVICES_COMPONENT,POST_SERVICES_COMPONENT,GET_BLI_PACKAGE,PUT_BLI_PACKAGE,PATCH_BLI_PACKAGE,POST_BLI_PACKAGE,GET_CAN,PUT_CAN,PATCH_CAN,POST_CAN,DELETE_CAN,GET_DIVISION,GET_NOTIFICATION,PUT_NOTIFICATION,PATCH_NOTIFICATION,GET_PORTFOLIO,PUT_PORTFOLIO,PATCH_PORTFOLIO,POST_PORTFOLIO,GET_RESEARCH_PROJECT,POST_RESEARCH_PROJECT,PUT_RESEARCH_PROJECT,POST_RESEARCH_PROJECT,GET_USER,GET_HISTORY,GET_CHANGE_REQUEST,PUT_CHANGE_REQUEST,PATCH_CHANGE_REQUEST,POST_CHANGE_REQUEST,GET_CHANGE_REQUEST_REVIEW,PUT_CHANGE_REQUEST_REVIEW,PATCH_CHANGE_REQUEST_REVIEW,POST_CHANGE_REQUEST_REVIEW,GET_UPLOAD_DOCUMENT,POST_UPLOAD_DOCUMENT}', current_timestamp, current_timestamp);
INSERT INTO ops.role (id, name, permissions, created_on, updated_on) VALUES (1, 'SYSTEM_OWNER', '{GET_AGREEMENT,PUT_AGREEMENT,PATCH_AGREEMENT,DELETE_AGREEMENT,POST_AGREEMENT,GET_BUDGET_LINE_ITEM,PUT_BUDGET_LINE_ITEM,PATCH_BUDGET_LINE_ITEM,POST_BUDGET_LINE_ITEM,DELETE_BUDGET_LINE_ITEM,GET_SERVICES_COMPONENT,PUT_SERVICES_COMPONENT,PATCH_SERVICES_COMPONENT,POST_SERVICES_COMPONENT,GET_BLI_PACKAGE,PUT_BLI_PACKAGE,PATCH_BLI_PACKAGE,POST_BLI_PACKAGE,GET_CAN,POST_CAN,PATCH_CAN,PUT_CAN,DELETE_CAN,GET_DIVISION,PUT_DIVISION,PATCH_DIVISION,POST_DIVISION,DELETE_DIVISION,GET_NOTIFICATION,PUT_NOTIFICATION,PATCH_NOTIFICATION,GET_PORTFOLIO,PUT_PORTFOLIO,PATCH_PORTFOLIO,POST_PORTFOLIO,DELETE_PORTFOLIO,GET_RESEARCH_PROJECT,POST_RESEARCH_PROJECT,GET_USER,PUT_USER,PATCH_USER,GET_HISTORY,GET_WORKFLOW,PUT_WORKFLOW,PATCH_WORKFLOW,POST_WORKFLOW,GET_CHANGE_REQUEST,PATCH_CHANGE_REQUEST,POST_CHANGE_REQUEST,GET_CHANGE_REQUEST_REVIEW,PATCH_CHANGE_REQUEST_REVIEW,POST_CHANGE_REQUEST_REVIEW,GET_UPLOAD_DOCUMENT,POST_UPLOAD_DOCUMENT,PATCH_UPLOAD_DOCUMENT}', current_timestamp, current_timestamp);
INSERT INTO ops.role (id, name, permissions, created_on, updated_on) VALUES (2, 'VIEWER_EDITOR', '{GET_AGREEMENT,PUT_AGREEMENT,PATCH_AGREEMENT,POST_AGREEMENT,GET_BUDGET_LINE_ITEM,GET_SERVICES_COMPONENT,GET_BLI_PACKAGE,GET_CAN,GET_DIVISION,GET_NOTIFICATION,PUT_NOTIFICATION,PATCH_NOTIFICATION,GET_PORTFOLIO,GET_RESEARCH_PROJECT,POST_RESEARCH_PROJECT,GET_USER,PUT_USER,PATCH_USER,GET_HISTORY,GET_WORKFLOW,GET_CHANGE_REQUEST,PATCH_CHANGE_REQUEST,POST_CHANGE_REQUEST,GET_CHANGE_REQUEST_REVIEW,GET_UPLOAD_DOCUMENT,POST_UPLOAD_DOCUMENT,PATCH_UPLOAD_DOCUMENT}', current_timestamp, current_timestamp);
INSERT INTO ops.role (id, name, permissions, created_on, updated_on) VALUES (3, 'division-director', '{GET_AGREEMENT,PUT_AGREEMENT,PATCH_AGREEMENT,POST_AGREEMENT,DELETE_AGREEMENT,GET_BUDGET_LINE_ITEM,PUT_BUDGET_LINE_ITEM,PATCH_BUDGET_LINE_ITEM,POST_BUDGET_LINE_ITEM,DELETE_BUDGET_LINE_ITEM,GET_SERVICES_COMPONENT,PUT_SERVICES_COMPONENT,PATCH_SERVICES_COMPONENT,POST_SERVICES_COMPONENT,GET_BLI_PACKAGE,PUT_BLI_PACKAGE,PATCH_BLI_PACKAGE,POST_BLI_PACKAGE,GET_CAN,GET_DIVISION,GET_NOTIFICATION,PUT_NOTIFICATION,PATCH_NOTIFICATION,GET_PORTFOLIO,GET_RESEARCH_PROJECT,POST_RESEARCH_PROJECT,GET_USER,PUT_USER,PATCH_USER,GET_HISTORY,GET_WORKFLOW,PUT_WORKFLOW,PATCH_WORKFLOW,POST_WORKFLOW,GET_CHANGE_REQUEST,PATCH_CHANGE_REQUEST,POST_CHANGE_REQUEST,GET_CHANGE_REQUEST_REVIEW,PATCH_CHANGE_REQUEST_REVIEW,POST_CHANGE_REQUEST_REVIEW,GET_UPLOAD_DOCUMENT,POST_UPLOAD_DOCUMENT,PATCH_UPLOAD_DOCUMENT}', current_timestamp, current_timestamp);
INSERT INTO ops.role (id, name, permissions, created_on, updated_on) VALUES (4, 'USER_ADMIN', '{POST_USER}', current_timestamp, current_timestamp);
INSERT INTO ops.role (id, name, permissions, created_on, updated_on) VALUES (5, 'BUDGET_TEAM', '{GET_AGREEMENT,PUT_AGREEMENT,PATCH_AGREEMENT,POST_AGREEMENT,GET_BUDGET_LINE_ITEM,PUT_BUDGET_LINE_ITEM,PATCH_BUDGET_LINE_ITEM,POST_BUDGET_LINE_ITEM,GET_SERVICES_COMPONENT,PUT_SERVICES_COMPONENT,PATCH_SERVICES_COMPONENT,POST_SERVICES_COMPONENT,GET_BLI_PACKAGE,PUT_BLI_PACKAGE,PATCH_BLI_PACKAGE,POST_BLI_PACKAGE,GET_CAN,PUT_CAN,PATCH_CAN,POST_CAN,DELETE_CAN,GET_DIVISION,GET_NOTIFICATION,PUT_NOTIFICATION,PATCH_NOTIFICATION,GET_PORTFOLIO,PUT_PORTFOLIO,PATCH_PORTFOLIO,POST_PORTFOLIO,GET_RESEARCH_PROJECT,POST_RESEARCH_PROJECT,PUT_RESEARCH_PROJECT,POST_RESEARCH_PROJECT,GET_USER,PUT_USER,PATCH_USER,GET_HISTORY,GET_CHANGE_REQUEST,PUT_CHANGE_REQUEST,PATCH_CHANGE_REQUEST,POST_CHANGE_REQUEST,GET_CHANGE_REQUEST_REVIEW,PUT_CHANGE_REQUEST_REVIEW,PATCH_CHANGE_REQUEST_REVIEW,POST_CHANGE_REQUEST_REVIEW,GET_UPLOAD_DOCUMENT,POST_UPLOAD_DOCUMENT}', current_timestamp, current_timestamp);
Loading

0 comments on commit f226c1c

Please sign in to comment.