[PRMP-1251] Add letters and docs config

adamwhitingnhs · adamwhitingnhs · commit 458d0215023e · 2026-01-19T17:30:44.000Z
diff --git a/app/src/components/blocks/_documentUpload/documentUploadCompleteStage/DocumentUploadCompleteStage.test.tsx b/app/src/components/blocks/_documentUpload/documentUploadCompleteStage/DocumentUploadCompleteStage.test.tsx
@@ -71,6 +71,15 @@ describe('DocumentUploadCompleteStage', () => {
 
         const expectedDob = getFormattedDate(new Date(patientDetails.birthDate));
         expect(screen.getByTestId('dob').textContent).toEqual('Date of birth: ' + expectedDob);
+
+        expect(
+            screen.queryByText(
+                'You are not the data controller',
+                {
+                    exact: false,
+                }
+            ),
+        ).not.toBeInTheDocument();
     });
 
     it('should navigate to search when clicking the search link', async () => {
@@ -153,6 +162,25 @@ describe('DocumentUploadCompleteStage', () => {
         expect(screen.getByText(documents[1].file.name)).toBeInTheDocument();
     });
 
+    it('should render non-data controller message when user is not data controller', async () => {
+        vi.mocked(usePatient).mockReturnValueOnce(
+            buildPatientDetails({
+                canManageRecord: false,
+            }),
+        );
+
+        renderApp(documents);
+
+        expect(
+            screen.getByText(
+                'You are not the data controller',
+                {
+                    exact: false,
+                }
+            ),
+        ).toBeInTheDocument();
+    });
+
     const renderApp = (documents: UploadDocument[]) => {
         render(
             <MemoryRouter>
diff --git a/app/src/components/blocks/_documentUpload/documentUploadCompleteStage/DocumentUploadCompleteStage.tsx b/app/src/components/blocks/_documentUpload/documentUploadCompleteStage/DocumentUploadCompleteStage.tsx
@@ -126,6 +126,13 @@ const DocumentUploadCompleteStage = ({ documents, documentConfig }: Props): Reac
                 </p>
             )}
 
+            {patientDetails.canManageRecord === false && (
+                <p>
+                    You are not the data controller for this patient so you cannot view the files
+                    you have uploaded in this service.
+                </p>
+            )}
+
             <p>
                 If you think you've made a mistake, contact the Patient Record Management team at{' '}
                 <a href="mailto:england.prmteam@nhs.net">england.prmteam@nhs.net</a>.
diff --git a/app/src/components/generic/patientSummary/PatientSummary.test.tsx b/app/src/components/generic/patientSummary/PatientSummary.test.tsx
@@ -16,6 +16,12 @@ describe('PatientSummary', () => {
         vi.clearAllMocks();
     });
 
+    it('renders nothing when patient details are null', () => {
+        mockedUsePatient.mockReturnValue(null);
+        const { container } = render(<PatientSummary />);
+        expect(container).toBeEmptyDOMElement();
+    });
+
     it('renders provided patient information', () => {
         const mockDetails = buildPatientDetails({
             familyName: 'Jones',
diff --git a/app/src/components/generic/patientSummary/PatientSummary.tsx b/app/src/components/generic/patientSummary/PatientSummary.tsx
@@ -133,8 +133,13 @@ const PatientSummary = ({
     if (reviewPatientDetails) {
         patientDetails = reviewPatientDetails;
     }
+    
     const patientDetailsContextValue = useMemo(() => ({ patientDetails }), [patientDetails]);
 
+    if (!patientDetails) {
+        return <></>;
+    }
+
     if (oneLine) {
         const nameLengthLimit = 30;
         const givenName = patientDetails?.givenName.join(' ') || '';
diff --git a/app/src/config/documentTypesConfig.json b/app/src/config/documentTypesConfig.json
@@ -28,5 +28,15 @@
             "upload_title": "",
             "upload_description": ""
         }
+    },
+    {
+        "name": "Letters and Documents",
+        "snomed_code": "162931000000103",
+        "config_name": "lettersAndDocumentsConfig",
+        "canUploadIndependently": true,
+        "content": {
+            "upload_title": "Other documents",
+            "upload_description": "Upload other letters and documents that have arrived for this patient after they have left your practice. For example, letters, test results and referrals."
+        }
     }
 ]
diff --git a/app/src/config/lettersAndDocumentsConfig.json b/app/src/config/lettersAndDocumentsConfig.json
@@ -0,0 +1,36 @@
+{
+    "snomedCode": "162931000000103",
+    "displayName": "other docs and letters",
+    "filenameOverride": "",
+    "canBeUpdated": false,
+    "associatedSnomed": "",
+    "multifileUpload": true,
+    "multifileZipped": false,
+    "multifileReview": false,
+    "canBeDiscarded": true,
+    "stitched": false,
+    "stitchedFilenamePrefix": "",
+    "singleDocumentOnly": false,
+    "acceptedFileTypes": [],
+    "content": {
+        "viewDocumentTitle": "Patient letters and documents",
+        "addFilesSelectTitle": "",
+        "uploadFilesSelectTitle": "Choose documents to upload",
+        "uploadFilesBulletPoints": [
+            "There is no maximum number of size of files you can upload",
+            "You can upload files in any format except .zip and .exe files",
+            "If there is a problem with your files during upload, you'll need to resolve these before continuing"
+        ],
+        "chooseFilesMessage": "Choose files to upload",
+        "chooseFilesButtonLabel": "Choose files",
+        "chooseFilesWarningText": "",
+        "skipDocumentLinkText": "",
+        "confirmFilesTitle": "Check files are for the correct patient",
+        "confirmFilesTableTitle": "Files to upload",
+        "confirmFilesTableParagraph": "",
+        "beforeYouUploadTitle": "Before you upload",
+        "previewUploadTitle": "Preview your PDF files",
+        "uploadFilesExtraParagraph": "",
+        "reviewList": "Letters and documents"
+    }
+}
diff --git a/app/src/helpers/utils/documentType.test.ts b/app/src/helpers/utils/documentType.test.ts
@@ -50,6 +50,13 @@ describe('documentType', () => {
             expect(config.multifileUpload).toBe(true);
         });
 
+        it('should return config for LETTERS_AND_DOCS', () => {
+            const config = getConfigForDocType(DOCUMENT_TYPE.LETTERS_AND_DOCS);
+            expect(config.snomedCode).toBe(DOCUMENT_TYPE.LETTERS_AND_DOCS);
+            expect(config.displayName).toBe('other docs and letters');
+            expect(config.multifileUpload).toBe(true);
+        });
+
         it('should throw error for unknown document type', () => {
             expect(() => getConfigForDocType('unknown' as DOCUMENT_TYPE)).toThrow(
                 'No config found for document type: unknown',
diff --git a/app/src/helpers/utils/documentType.ts b/app/src/helpers/utils/documentType.ts
@@ -1,6 +1,7 @@
 import lloydGeorgeConfig from '../../config/lloydGeorgeConfig.json';
 import electronicHealthRecordConfig from '../../config/electronicHealthRecordConfig.json';
 import electronicHealthRecordAttachmentsConfig from '../../config/electronicHealthRecordAttachmentsConfig.json';
+import lettersAndDocumentsConfig from '../../config/lettersAndDocumentsConfig.json';
 
 export enum DOCUMENT_TYPE {
     LLOYD_GEORGE = '16521000000101',
@@ -83,6 +84,8 @@ export const getConfigForDocType = (docType: DOCUMENT_TYPE): DOCUMENT_TYPE_CONFI
             return electronicHealthRecordConfig as DOCUMENT_TYPE_CONFIG;
         case DOCUMENT_TYPE.EHR_ATTACHMENTS:
             return electronicHealthRecordAttachmentsConfig as DOCUMENT_TYPE_CONFIG;
+        case DOCUMENT_TYPE.LETTERS_AND_DOCS:
+            return lettersAndDocumentsConfig as DOCUMENT_TYPE_CONFIG;
         default:
             throw new Error(`No config found for document type: ${docType}`);
     }
diff --git a/app/src/pages/documentSearchResultsPage/DocumentSearchResultsPage.tsx b/app/src/pages/documentSearchResultsPage/DocumentSearchResultsPage.tsx
@@ -81,6 +81,16 @@ const DocumentSearchResultsPage = (): React.JSX.Element => {
                                 fileName: 'EHR Attachments.zip',
                                 contentType: 'application/zip',
                             }),
+                            buildSearchResult({
+                                documentSnomedCodeType: DOCUMENT_TYPE.LETTERS_AND_DOCS,
+                                fileName: 'Later letter.pdf',
+                                contentType: 'application/pdf',
+                            }),
+                            buildSearchResult({
+                                documentSnomedCodeType: DOCUMENT_TYPE.LETTERS_AND_DOCS,
+                                fileName: 'Later letter 2.docx',
+                                contentType: 'application/vnd.openxmlformats-officedocument.wordprocessingml.document',
+                            }),
                         ]);
                         setSubmissionState(SUBMISSION_STATE.SUCCEEDED);
                     } else {
diff --git a/lambdas/enums/snomed_codes.py b/lambdas/enums/snomed_codes.py
@@ -21,6 +21,9 @@ class SnomedCodes(Enum):
     EHR_ATTACHMENTS = SnomedCode(
         code="24511000000107", display_name="Electronic Health Record Attachments"
     )
+    LETTERS_AND_DOCUMENTS = SnomedCode(
+        code="162931000000103", display_name="Care record elements"
+    )
     # Temporary snomed code used.
     PATIENT_DATA = SnomedCode(
         code="717391000000106", display_name="Confidential patient data"
diff --git a/lambdas/enums/supported_document_types.py b/lambdas/enums/supported_document_types.py
@@ -12,6 +12,7 @@ class SupportedDocumentTypes(StrEnum):
     LG = SnomedCodes.LLOYD_GEORGE.value.code
     EHR = SnomedCodes.EHR.value.code
     EHR_ATTACHMENTS = SnomedCodes.EHR_ATTACHMENTS.value.code
+    LETTERS_AND_DOCUMENTS = SnomedCodes.LETTERS_AND_DOCUMENTS.value.code
 
     @staticmethod
     def list():
@@ -39,6 +40,9 @@ def get_dynamodb_table_name(self) -> str:
             SupportedDocumentTypes.EHR_ATTACHMENTS: os.getenv(
                 "LLOYD_GEORGE_DYNAMODB_NAME"
             ),
+            SupportedDocumentTypes.LETTERS_AND_DOCUMENTS: os.getenv(
+                "LLOYD_GEORGE_BUCKET_NAME"
+            ),
         }
         return document_type_to_table_name[self]
 
@@ -50,5 +54,8 @@ def get_s3_bucket_name(self) -> str:
             SupportedDocumentTypes.EHR_ATTACHMENTS: os.getenv(
                 "LLOYD_GEORGE_BUCKET_NAME"
             ),
+            SupportedDocumentTypes.LETTERS_AND_DOCUMENTS: os.getenv(
+                "LLOYD_GEORGE_BUCKET_NAME"
+            ),
         }
         return lookup_dict[self]
diff --git a/lambdas/models/upload_file_config.py b/lambdas/models/upload_file_config.py
@@ -19,6 +19,7 @@ class DocumentConfig(BaseModel):
     multifile_zipped: bool
     multifile_review: bool
     can_be_discarded: bool
+    single_file_only: bool
     stitched: bool
     accepted_file_types: List[str]
     content: List[Any]
diff --git a/lambdas/services/create_document_reference_service.py b/lambdas/services/create_document_reference_service.py
@@ -60,14 +60,6 @@ def create_document_reference_request(
         url_responses = {}
         upload_request_documents = self.parse_documents_list(documents_list)
 
-        if any(
-            document.doc_type == SupportedDocumentTypes.LG
-            for document in upload_request_documents
-        ):
-            self.check_existing_lloyd_george_records_and_remove_failed_upload(
-                nhs_number
-            )
-
         try:
             user_ods_code = extract_ods_code_from_request_context()
 
@@ -80,12 +72,21 @@ def create_document_reference_request(
 
             for validated_doc in upload_request_documents:
                 snomed_code = validated_doc.doc_type
+                config = upload_file_configs.get_config_by_snomed_code(
+                    snomed_code
+                )
+
+                if config.single_file_only:
+                    self.check_existing_records_and_remove_failed_upload(
+                        nhs_number,
+                        snomed_code
+                    )
 
                 document_reference = self.create_document_reference(
                     nhs_number, user_ods_code, validated_doc, snomed_code
                 )
 
-                self.validate_document_file_type(validated_doc, snomed_code)
+                self.validate_document_file_type(validated_doc, config)
 
                 upload_document_names.append(validated_doc.file_name)
 
@@ -115,19 +116,16 @@ def create_document_reference_request(
             InvalidNhsNumberException,
             LGInvalidFilesException,
             PdsTooManyRequestsException,
+            ConfigNotFoundException,
         ) as e:
             logger.error(
                 f"{LambdaError.DocRefInvalidFiles.to_str()} :{str(e)}",
                 {"Result": FAILED_CREATE_REFERENCE_MESSAGE},
             )
             raise DocumentRefException(400, LambdaError.DocRefInvalidFiles)
 
-    def validate_document_file_type(self, validated_doc, snomed_code):
-        accepted_file_types = self.get_accepted_file_types(
-            snomed_code, upload_file_configs
-        )
-
-        if not is_file_type_allowed(validated_doc.file_name, accepted_file_types):
+    def validate_document_file_type(self, validated_doc, document_config):
+        if not is_file_type_allowed(validated_doc.file_name, document_config.accepted_file_types):
             raise LGInvalidFilesException(
                 f"Unsupported file type for file: {validated_doc.file_name}"
             )
@@ -159,18 +157,6 @@ def validate_patient_user_ods_codes_match(self, user_ods_code, patient_ods_code)
             )
             raise DocumentRefException(401, LambdaError.DocRefUnauthorizedOdsCode)
 
-    def get_accepted_file_types(self, snomed_code, upload_file_configs):
-        try:
-            return upload_file_configs.get_config_by_snomed_code(
-                snomed_code
-            ).accepted_file_types
-        except ConfigNotFoundException:
-            logger.error(
-                f"{LambdaError.DocRefInvalidType.to_str()}",
-                {"Result": UPLOAD_REFERENCE_FAILED_MESSAGE},
-            )
-            raise DocumentRefException(400, LambdaError.DocRefInvalidType)
-
     def build_doc_ref_info(
         self, validated_doc, nhs_number, snomed_code, user_ods_code
     ) -> DocumentReferenceInfo:
@@ -247,15 +233,16 @@ def create_document_reference(
         )
         return document_reference
 
-    def check_existing_lloyd_george_records_and_remove_failed_upload(
+    def check_existing_records_and_remove_failed_upload(
         self,
         nhs_number: str,
+        doc_type: SupportedDocumentTypes,
     ) -> None:
         logger.info("Looking for previous records for this patient...")
 
         previous_records = self.post_fhir_doc_ref_service.document_service.fetch_available_document_references_by_type(
             nhs_number=nhs_number,
-            doc_type=SupportedDocumentTypes.LG,
+            doc_type=doc_type,
             query_filter=NotDeleted,
         )
         if not previous_records:
diff --git a/lambdas/tests/unit/services/test_create_document_reference_service.py b/lambdas/tests/unit/services/test_create_document_reference_service.py
diff --git a/lambdas/utils/upload_file_configs.py b/lambdas/utils/upload_file_configs.py

Original file line number	Diff line number	Diff line change
`@@ -28,5 +28,15 @@`
`28`	`28`	`"upload_title": "",`
`29`	`29`	`"upload_description": ""`
`30`	`30`	`}`
	`31`	`+ },`
	`32`	`+ {`
	`33`	`+ "name": "Letters and Documents",`
	`34`	`+ "snomed_code": "162931000000103",`
	`35`	`+ "config_name": "lettersAndDocumentsConfig",`
	`36`	`+ "canUploadIndependently": true,`
	`37`	`+ "content": {`
	`38`	`+ "upload_title": "Other documents",`
	`39`	`+ "upload_description": "Upload other letters and documents that have arrived for this patient after they have left your practice. For example, letters, test results and referrals."`
	`40`	`+ }`
`31`	`41`	`}`
`32`	`42`	`]`