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

APS-1641 Remove OOSB permissions from CRU Member #2847

Merged
merged 1 commit into from
Jan 23, 2025
+11 −13
Merged

APS-1641 Remove OOSB permissions from CRU Member #2847

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
2 changes: 0 additions & 2 deletions src/main/kotlin/uk/gov/justice/digital/hmpps/approvedpremisesapi/jpa/entity/UserRole.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,6 @@ private object Constants {
UserPermission.CAS1_APPLICATION_WITHDRAW_OTHERS,
UserPermission.CAS1_BOOKING_CHANGE_DATES,
UserPermission.CAS1_BOOKING_WITHDRAW,
UserPermission.CAS1_OUT_OF_SERVICE_BED_CREATE,
UserPermission.CAS1_PREMISES_VIEW,
UserPermission.CAS1_REQUEST_FOR_PLACEMENT_WITHDRAW_OTHERS,
UserPermission.CAS1_SPACE_BOOKING_LIST,
Expand All @@ -22,7 +21,6 @@ private object Constants {
UserPermission.CAS1_USER_LIST,
UserPermission.CAS1_VIEW_CRU_DASHBOARD,
UserPermission.CAS1_VIEW_MANAGE_TASKS,
UserPermission.CAS1_VIEW_OUT_OF_SERVICE_BEDS,
)
}

Expand Down
22 changes: 11 additions & 11 deletions ...gov/justice/digital/hmpps/approvedpremisesapi/integration/cas1/Cas1OutOfServiceBedTest.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -127,7 +127,7 @@ class Cas1OutOfServiceBedTest : InitialiseDatabasePerClassTestBase() {
@ParameterizedTest
@EnumSource(
value = UserRole::class,
names = [ "CAS1_FUTURE_MANAGER", "CAS1_CRU_MEMBER", "CAS1_CRU_MEMBER_FIND_AND_BOOK_BETA", "CAS1_CRU_MEMBER_ENABLE_OUT_OF_SERVICE_BEDS", "CAS1_JANITOR" ],
names = [ "CAS1_FUTURE_MANAGER", "CAS1_CRU_MEMBER_ENABLE_OUT_OF_SERVICE_BEDS", "CAS1_JANITOR" ],
)
fun `Get All Out-Of-Service Beds returns OK with correct body when user has the correct role`(role: UserRole) {
givenAUser(roles = listOf(role)) { user, jwt ->
Expand Down Expand Up @@ -457,7 +457,7 @@ class Cas1OutOfServiceBedTest : InitialiseDatabasePerClassTestBase() {

@Test
fun `Returns the latest revision information for an out of service bed when all temporalities are requested`() {
givenAUser(roles = listOf(UserRole.CAS1_CRU_MEMBER)) { user, jwt ->
givenAUser(roles = listOf(UserRole.CAS1_FUTURE_MANAGER)) { user, jwt ->

initialiseOosBedsForAllTemporalities(user)

Expand All @@ -483,7 +483,7 @@ class Cas1OutOfServiceBedTest : InitialiseDatabasePerClassTestBase() {

@Test
fun `Returns no out of service bed when specified temporality is past and latest revision is not in the past`() {
givenAUser(roles = listOf(UserRole.CAS1_CRU_MEMBER)) { user, jwt ->
givenAUser(roles = listOf(UserRole.CAS1_FUTURE_MANAGER)) { user, jwt ->

initialiseOosBedsForAllTemporalities(user)

Expand All @@ -505,7 +505,7 @@ class Cas1OutOfServiceBedTest : InitialiseDatabasePerClassTestBase() {

@Test
fun `Returns no out of service bed when specified temporality is current and the latest revision is not current`() {
givenAUser(roles = listOf(UserRole.CAS1_CRU_MEMBER)) { user, jwt ->
givenAUser(roles = listOf(UserRole.CAS1_FUTURE_MANAGER)) { user, jwt ->

initialiseOosBedsForAllTemporalities(user)

Expand All @@ -527,7 +527,7 @@ class Cas1OutOfServiceBedTest : InitialiseDatabasePerClassTestBase() {

@Test
fun `Returns out of service bed when specified temporality is future and the latest revision is the future`() {
givenAUser(roles = listOf(UserRole.CAS1_CRU_MEMBER)) { user, jwt ->
givenAUser(roles = listOf(UserRole.CAS1_FUTURE_MANAGER)) { user, jwt ->

initialiseOosBedsForAllTemporalities(user)

Expand Down Expand Up @@ -762,7 +762,7 @@ class Cas1OutOfServiceBedTest : InitialiseDatabasePerClassTestBase() {
@ParameterizedTest
@EnumSource(
value = UserRole::class,
names = [ "CAS1_FUTURE_MANAGER", "CAS1_CRU_MEMBER", "CAS1_CRU_MEMBER_FIND_AND_BOOK_BETA", "CAS1_CRU_MEMBER_ENABLE_OUT_OF_SERVICE_BEDS", "CAS1_JANITOR" ],
names = [ "CAS1_FUTURE_MANAGER", "CAS1_CRU_MEMBER_ENABLE_OUT_OF_SERVICE_BEDS", "CAS1_JANITOR" ],
)
fun `Get All Out-Of-Service Beds On Premises returns OK with correct body when user has correct role`(role: UserRole) {
givenAUser(roles = listOf(role)) { user, jwt ->
Expand Down Expand Up @@ -865,7 +865,7 @@ class Cas1OutOfServiceBedTest : InitialiseDatabasePerClassTestBase() {

@Test
fun `Get Out-Of-Service Bed for non-existent premises returns 404`() {
givenAUser(roles = listOf(UserRole.CAS1_CRU_MEMBER)) { _, jwt ->
givenAUser(roles = listOf(UserRole.CAS1_CRU_MEMBER_ENABLE_OUT_OF_SERVICE_BEDS)) { _, jwt ->
webTestClient.get()
.uri("/cas1/premises/9054b6a8-65ad-4d55-91ee-26ba65e05488/out-of-service-beds")
.header("Authorization", "Bearer $jwt")
Expand Down Expand Up @@ -896,7 +896,7 @@ class Cas1OutOfServiceBedTest : InitialiseDatabasePerClassTestBase() {
@ParameterizedTest
@EnumSource(
value = UserRole::class,
names = [ "CAS1_FUTURE_MANAGER", "CAS1_CRU_MEMBER", "CAS1_CRU_MEMBER_FIND_AND_BOOK_BETA", "CAS1_CRU_MEMBER_ENABLE_OUT_OF_SERVICE_BEDS", "CAS1_JANITOR" ],
names = [ "CAS1_FUTURE_MANAGER", "CAS1_CRU_MEMBER_ENABLE_OUT_OF_SERVICE_BEDS", "CAS1_JANITOR" ],
)
fun `Get Out-Of-Service Bed returns OK with correct body when user has the correct role`(role: UserRole) {
givenAUser(roles = listOf(role)) { user, jwt ->
Expand Down Expand Up @@ -1051,7 +1051,7 @@ class Cas1OutOfServiceBedTest : InitialiseDatabasePerClassTestBase() {
@ParameterizedTest
@EnumSource(
value = UserRole::class,
names = [ "CAS1_FUTURE_MANAGER", "CAS1_CRU_MEMBER", "CAS1_CRU_MEMBER_FIND_AND_BOOK_BETA", "CAS1_CRU_MEMBER_ENABLE_OUT_OF_SERVICE_BEDS", "CAS1_JANITOR" ],
names = [ "CAS1_FUTURE_MANAGER", "CAS1_CRU_MEMBER_ENABLE_OUT_OF_SERVICE_BEDS", "CAS1_JANITOR" ],
)
fun `Create Out-Of-Service Beds returns OK with correct body when user has correct roles`(role: UserRole) {
givenAUser(roles = listOf(role)) { user, jwt ->
Expand Down Expand Up @@ -1574,7 +1574,7 @@ class Cas1OutOfServiceBedTest : InitialiseDatabasePerClassTestBase() {
@ParameterizedTest
@EnumSource(
value = UserRole::class,
names = [ "CAS1_FUTURE_MANAGER", "CAS1_CRU_MEMBER", "CAS1_CRU_MEMBER_FIND_AND_BOOK_BETA", "CAS1_CRU_MEMBER_ENABLE_OUT_OF_SERVICE_BEDS", "CAS1_JANITOR" ],
names = [ "CAS1_FUTURE_MANAGER", "CAS1_CRU_MEMBER_ENABLE_OUT_OF_SERVICE_BEDS", "CAS1_JANITOR" ],
)
fun `Update Out-Of-Service Beds returns OK with correct body when user the correct role`(role: UserRole) {
givenAUser(roles = listOf(role)) { user, jwt ->
Expand Down Expand Up @@ -2206,7 +2206,7 @@ class Cas1OutOfServiceBedTest : InitialiseDatabasePerClassTestBase() {
@ParameterizedTest
@EnumSource(
value = UserRole::class,
names = [ "CAS1_FUTURE_MANAGER", "CAS1_CRU_MEMBER", "CAS1_CRU_MEMBER_FIND_AND_BOOK_BETA", "CAS1_CRU_MEMBER_ENABLE_OUT_OF_SERVICE_BEDS", "CAS1_JANITOR" ],
names = [ "CAS1_FUTURE_MANAGER", "CAS1_CRU_MEMBER_ENABLE_OUT_OF_SERVICE_BEDS", "CAS1_JANITOR" ],
)
fun `Cancel Out-Of-Service Bed returns OK with correct body when user has the correct roles`(role: UserRole) {
givenAUser(roles = listOf(role)) { user, jwt ->
Expand Down
Loading