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.

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

DMP-4616: Flyway Updates : Add new role MEDIA_IN_PERPETUITY #2461

Open
wants to merge 12 commits into
base: master
Choose a base branch
from
+34 −6
Open

DMP-4616: Flyway Updates : Add new role MEDIA_IN_PERPETUITY #2461

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
12 commits
Select commit Hold shift + click to select a range
980a79f
Added new security role
Ben-Edwards-cgi Jan 21, 2025
a1b2249
Merge branch 'master' into DMP-4616
Ben-Edwards-cgi Jan 21, 2025
1b0b1c4
Renamed migration
Ben-Edwards-cgi Jan 21, 2025
ec8a5a0
Merge branch 'master' into DMP-4616
Ben-Edwards-cgi Jan 21, 2025
8e4045d
Fixed tests
Ben-Edwards-cgi Jan 21, 2025
fd1e272
Review comments
Ben-Edwards-cgi Jan 21, 2025
9630757
Merge branch 'master' into DMP-4616
Ben-Edwards-cgi Jan 21, 2025
59112c0
Merge branch 'master' into DMP-4616
Ben-Edwards-cgi Jan 22, 2025
b0e92a8
Fixed tests
Ben-Edwards-cgi Jan 22, 2025
8027803
Merge branch 'master' into DMP-4616
Ben-Edwards-cgi Jan 22, 2025
148f190
Updated some tests
Ben-Edwards-cgi Jan 22, 2025
8efcd0f
Merge branch 'master' into DMP-4616
Ben-Edwards-cgi Jan 22, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions src/functionalTest/java/uk/gov/hmcts/darts/usermanagement/SecurityGroupFunctionalTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -137,8 +137,8 @@ void shouldGetSecurityGroups() throws JsonProcessingException {
checkGroup(staticGroups.get(6), "hmcts_staff_4", false, 4, true, 127);
checkGroup(staticGroups.get(7), "hmcts_staff_5", true, 5, true, 127);
checkGroup(staticGroups.get(8), "hmcts_staff_6", true, 6, true, 127);
checkGroup(staticGroups.get(9), "MEDIA_IN_PERPETUITY", false, 10, true, null);
checkGroup(staticGroups.get(10), "MID_TIER", true, 14, false, null);
checkGroup(staticGroups.get(9), "MID_TIER", true, 14, false, null);
checkGroup(staticGroups.get(10), "MEDIA_IN_PERPETUITY", false, 10, true, null);
checkGroup(staticGroups.get(11), "SUPER_ADMIN", true, 8, true, null);
checkGroup(staticGroups.get(12), "SUPER_USER", true, 7, true, null);
checkGroup(staticGroups.get(13), "XHIBIT", true, 11, false, null);
Expand Down
8 changes: 7 additions & 1 deletion src/functionalTest/java/uk/gov/hmcts/darts/usermanagement/SecurityRoleFunctionalTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -80,7 +80,7 @@ void shouldGetSecurityRoles() {
"id": 9,
"role_name": "MEDIA_ACCESSOR",
"display_name": "Media Accessor",
"display_state": true
"display_state": false
},
{
"id": 10,
Expand Down Expand Up @@ -111,6 +111,12 @@ void shouldGetSecurityRoles() {
"role_name": "MID_TIER",
"display_name": "Mid Tier",
"display_state": false
},
{
"id": 15,
"role_name": "MEDIA_IN_PERPETUITY",
"display_name": "Media in Perpetuity",
"display_state": true
}
]
""",
Expand Down
2 changes: 1 addition & 1 deletion ...integrationTest/java/uk/gov/hmcts/darts/common/repository/SecurityRoleRepositoryTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -43,7 +43,7 @@ void closeHibernateSession() {
@Test
void shouldFindAllSecurityRoles() {
List<SecurityRoleEntity> securityRoleEntityList = securityRoleRepository.findAll();
assertEquals(14, securityRoleEntityList.size());
assertEquals(15, securityRoleEntityList.size());
}

@Test
Expand Down
8 changes: 7 additions & 1 deletion ...Test/java/uk/gov/hmcts/darts/usermanagement/controller/SecurityRoleControllerIntTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -98,7 +98,7 @@ void getSecurityRolesShouldSucceedAndReturnAllRoles() throws Exception {
"id": 9,
"role_name": "MEDIA_ACCESSOR",
"display_name": "Media Accessor",
"display_state": true
"display_state": false
},
{
"id": 10,
Expand Down Expand Up @@ -129,6 +129,12 @@ void getSecurityRolesShouldSucceedAndReturnAllRoles() throws Exception {
"role_name": "MID_TIER",
"display_name": "Mid Tier",
"display_state": false
},
{
"id": 15,
"role_name": "MEDIA_IN_PERPETUITY",
"display_name": "Media in Perpetuity",
"display_state": true
}
]
""";
Expand Down
2 changes: 1 addition & 1 deletion ...s/usermanagement/SecurityGroupControllerGetTest/securityGroupsGetEndpointAllReturned.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -147,6 +147,6 @@
"courthouse_ids": [],
"name": "MEDIA_IN_PERPETUITY",
"display_name": "MEDIA_IN_PERPETUITY",
"security_role_id": 10
"security_role_id": 15
}
]
16 changes: 16 additions & 0 deletions src/main/resources/db/migration/common/V1_431__added_role_MEDIA_IN_PERPETUITY.sql
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,16 @@
insert into security_role (rol_id, role_name, display_name, display_state)
values (nextval('rol_seq'), 'MEDIA_IN_PERPETUITY', 'Media in Perpetuity', TRUE);


update security_group
set rol_id = (select rol_id from security_role where role_name = 'MEDIA_IN_PERPETUITY')
where grp_id = (select grp_id from security_group where group_name = 'MEDIA_IN_PERPETUITY');

update security_role
set display_state = FALSE
where role_name = 'MEDIA_ACCESSOR';





Loading