@ministryofjustice/hmpps-prison-permissions-lib 2.4.0 → 2.5.0

package/CHANGELOG.md

@@ -2,6 +2,14 @@
 
 Please use this to capture reasoning behind changes:
 
+## 2.5.0
+
+Restricted diet and allergy read access for global search and updated dependencies.
+
+## 2.4.1
+
+Fixed duplicate record conditional upgrade and updated dependencies.
+
 ## 2.4.0
 
 The Connect DPS team have been supporting a request to make duplicate prisoner records more visible to users.

package/dist/contractTests/prisonerProfile/scenarios/domains/person/personHealthAndMedication/dietRead/DietReadScenarios.d.ts

@@ -0,0 +1,2 @@
+import { TestScenarios } from '../../../../../../../testUtils/TestScenario';
+export declare const dietReadScenarios: TestScenarios;

package/dist/index.cjs

@@ -1068,6 +1068,15 @@ function personProtectedCharacteristicsCheck(context) {
     };
 }
 
+const dietReadCheck = matchBaseCheckAnd({
+    ifRestrictedPatient: (user, prisoner) => isInUsersCaseLoad(prisoner.supportingPrisonId, user)
+        ? exports.PermissionCheckStatus.OK
+        : exports.PermissionCheckStatus.RESTRICTED_PATIENT,
+    ifReleasedPrisoner: () => exports.PermissionCheckStatus.PRISONER_IS_RELEASED,
+    ifTransferringPrisoner: () => exports.PermissionCheckStatus.PRISONER_IS_TRANSFERRING,
+    ifPrisonNotInCaseload: () => exports.PermissionCheckStatus.NOT_IN_CASELOAD,
+});
+
 const dietEditCheck = inActiveCaseLoadAndUserHasRole(exports.Role.DietAndAllergiesEdit);
 
 function personHealthAndMedicationCheck(context) {
@@ -1077,7 +1086,7 @@ function personHealthAndMedicationCheck(context) {
         ...check(exports.PersonHealthAndMedicationPermission.edit_pregnancy, prisonerProfileEditCheck),
         ...check(exports.PersonHealthAndMedicationPermission.read_smoker, baseCheck),
         ...check(exports.PersonHealthAndMedicationPermission.edit_smoker, prisonerProfileEditCheck),
-        ...check(exports.PersonHealthAndMedicationPermission.read_diet, baseCheck),
+        ...check(exports.PersonHealthAndMedicationPermission.read_diet, dietReadCheck),
         ...check(exports.PersonHealthAndMedicationPermission.edit_diet, dietEditCheck),
     };
 }
@@ -1256,10 +1265,7 @@ class PermissionsService {
             prisoner,
             requestDependentOn,
         });
-        if (requestDependentOn.length > 0) {
-            return this.upgradePermissionsFromDuplicateRecords(prisoner, prisonerPermissions, duplicateRecords, user, requestDependentOn);
-        }
-        return prisonerPermissions;
+        return this.upgradePermissionsFromDuplicateRecords(prisoner, prisonerPermissions, duplicateRecords, user, requestDependentOn);
     }
     calculatePrisonerPermissions({ user, prisoner, requestDependentOn, readOnly = false, }) {
         const context = {