[PRMP-861] Upload documents for review

Author: adamwhitingnhs

app/src/components/blocks/_documentUpload/documentUploadCompleteStage/DocumentUploadCompleteStage.tsx

@@ -42,12 +42,12 @@ const DocumentUploadCompleteStage = ({ documents, documentConfig }: Props): Reac
         ]);
 
     useEffect(() => {
-        if (!docsAreInFinishedState()) {
+        if (!docsAreInFinishedState() || patientDetails === null) {
             navigate(routes.HOME);
         }
-    }, [navigate, documents]);
+    }, [navigate, documents, patientDetails]);
 
-    if (!docsAreInFinishedState()) {
+    if (!docsAreInFinishedState() || patientDetails === null) {
         return <></>;
     }
 
@@ -108,7 +108,7 @@ const DocumentUploadCompleteStage = ({ documents, documentConfig }: Props): Reac
 
             <h3>What happens next</h3>
 
-            {journey === 'update' && (
+            {journey === 'update' && patientDetails.canManageRecord && (
                 <p>
                     You can now view the updated {documentConfig.displayName} for this patient in
                     this service by{' '}

app/src/helpers/requests/uploadDocuments.ts

@@ -36,7 +36,7 @@ export const uploadDocumentToS3 = async ({
 }: UploadDocumentsToS3Args): Promise<void> => {
     const documentMetadata: S3Upload = uploadSession[document.id];
     const formData = new FormData();
-    const docFields: S3UploadFields = documentMetadata.fields ?? [];
+    const docFields: S3UploadFields = documentMetadata.fields ?? {} as S3UploadFields;
     Object.entries(docFields).forEach(([key, value]) => {
         formData.append(key, value);
     });

app/src/helpers/test/testBuilders.ts

@@ -40,6 +40,7 @@ const buildPatientDetails = (patientDetailsOverride?: Partial<PatientDetails>):
         restricted: false,
         active: true,
         deceased: false,
+        canManageRecord: true,
         ...patientDetailsOverride,
     };
 

app/src/pages/documentUploadPage/DocumentUploadPage.tsx

@@ -43,6 +43,8 @@ import { DOCUMENT_TYPE, getConfigForDocType } from '../../helpers/utils/document
 import { buildMockUploadSession } from '../../helpers/test/testBuilders';
 import { reduceDocumentsForUpload } from '../../helpers/utils/documentUpload';
 import DocumentUploadIndex from '../../components/blocks/_documentUpload/documentUploadIndex/DocumentUploadIndex';
+import { getDocumentReviewStatus, uploadDocumentForReview } from '../../helpers/requests/documentReview';
+import { DocumentReviewDto, DocumentReviewStatus, DocumentReviewStatusDto } from '../../types/blocks/documentReview';
 
 const DocumentUploadPage = (): React.JSX.Element => {
     const patientDetails = usePatient();
@@ -158,7 +160,7 @@ const DocumentUploadPage = (): React.JSX.Element => {
         setExistingDocuments(newDocuments);
     };
 
-    const uploadSingleLloydGeorgeDocument = async (
+    const uploadSingleDocument = async (
         document: UploadDocument,
         uploadSession: UploadSession,
     ): Promise<void> => {
@@ -190,7 +192,7 @@ const DocumentUploadPage = (): React.JSX.Element => {
         uploadSession: UploadSession,
     ): void => {
         uploadDocuments.forEach((document) => {
-            void uploadSingleLloydGeorgeDocument(document, uploadSession);
+            void uploadSingleDocument(document, uploadSession);
         });
     };
 
@@ -211,17 +213,51 @@ const DocumentUploadPage = (): React.JSX.Element => {
         navigate.withParams(routeChildren.DOCUMENT_UPLOAD_UPLOADING);
     };
 
+    const getUploadSession = async (): Promise<UploadSession> => {
+        if (isLocal) {
+            return buildMockUploadSession(documents);
+        } else if (patientDetails?.canManageRecord) {
+            return await uploadDocuments({
+                nhsNumber,
+                documents: documents,
+                baseUrl,
+                baseHeaders,
+                documentReferenceId: existingDocuments[0]?.id,
+            });
+        } else {
+            const uploadSession: UploadSession = {};
+            const requests: Promise<DocumentReviewDto>[] = [];
+
+            documents.forEach(document => {
+                const documentReview = uploadDocumentForReview({
+                    nhsNumber,
+                    document,
+                    baseUrl,
+                    baseHeaders,
+                });
+
+                documentReview.then((review: DocumentReviewDto) => {
+                    document.id = review.id;
+                    document.versionId = review.version;
+                    uploadSession[review.id] = {
+                        url: review.files[0].presignedUrl,
+                    };
+                });
+
+                requests.push(documentReview);
+            });
+
+            const sessions = await Promise.all(requests);
+
+            setDocuments(documents);
+
+            return Object.assign({}, ...sessions);
+        }
+    };
+
     const startUpload = async (): Promise<void> => {
         try {
-            const uploadSession: UploadSession = isLocal
-                ? buildMockUploadSession(documents)
-                : await uploadDocuments({
-                      nhsNumber,
-                      documents: documents,
-                      baseUrl,
-                      baseHeaders,
-                      documentReferenceId: existingDocuments[0]?.id,
-                  });
+            const uploadSession: UploadSession = await getUploadSession();
 
             setUploadSession(uploadSession);
             const uploadingDocuments = markDocumentsAsUploading(documents, uploadSession);
@@ -282,6 +318,41 @@ const DocumentUploadPage = (): React.JSX.Element => {
         );
     };
 
+    const handleDocReviewStatusResult = (result: DocumentReviewStatusDto): void => {
+        setDocuments((previousState) =>
+            previousState.map((doc) => {
+                if (doc.id !== result.id) {
+                    return doc;
+                }
+
+                const updatedDoc = {
+                    ...doc,
+                };
+
+                switch (result.status) {
+                    case DocumentReviewStatus.PENDING_REVIEW:
+                        updatedDoc.state = DOCUMENT_UPLOAD_STATE.SUCCEEDED;
+                        break;
+
+                    case DocumentReviewStatus.VIRUS_SCAN_FAILED:
+                        updatedDoc.state = DOCUMENT_UPLOAD_STATE.INFECTED;
+                        break;
+
+                    case DocumentReviewStatus.REVIEW_PENDING_UPLOAD:
+                        updatedDoc.state = DOCUMENT_UPLOAD_STATE.SCANNING;
+                        break;
+
+                    default:
+                        updatedDoc.state = DOCUMENT_UPLOAD_STATE.ERROR;
+                        updatedDoc.errorCode = result.reviewReason;
+                        break;
+                }
+
+                return updatedDoc;
+            }),
+        );
+    };
+
     const startIntervalTimer = (uploadDocuments: Array<UploadDocument>): number => {
         return window.setInterval(async () => {
             interval.current = interval.current + 1;
@@ -314,14 +385,29 @@ const DocumentUploadPage = (): React.JSX.Element => {
                 setDocuments(updatedDocuments);
             } else {
                 try {
-                    const documentStatusResult = await getDocumentStatus({
-                        documents: uploadDocuments,
-                        baseUrl,
-                        baseHeaders,
-                        nhsNumber,
-                    });
-
-                    handleDocStatusResult(documentStatusResult);
+                    if (patientDetails?.canManageRecord) {
+                        const documentStatusResult = await getDocumentStatus({
+                            documents: uploadDocuments,
+                            baseUrl,
+                            baseHeaders,
+                            nhsNumber,
+                        });
+
+                        handleDocStatusResult(documentStatusResult);
+                    }
+                    else {
+                        uploadDocuments.forEach(async document => {
+                            void getDocumentReviewStatus({
+                                document,
+                                baseUrl,
+                                baseHeaders,
+                                nhsNumber,
+                            }).then(handleDocReviewStatusResult).catch((e) => {
+                                const error = e as AxiosError;
+                                navigate(routes.SERVER_ERROR + errorToParams(error));
+                            });
+                        });
+                    }
                 } catch (e) {
                     const error = e as AxiosError;
                     navigate(routes.SERVER_ERROR + errorToParams(error));

app/src/pages/patientResultPage/PatientResultPage.test.tsx

@@ -237,7 +237,7 @@ describe('PatientResultPage', () => {
 
             const results = await runAxeTest(document.body);
             expect(results).toHaveNoViolations();
-        });
+        }); 
     });
 
     describe('Navigation', () => {
@@ -258,6 +258,33 @@ describe('PatientResultPage', () => {
             });
         });
 
+        it('navigates to upload page after user selects patient they cannot manage when role is GP Clinical and feature flag is enabled', async () => {
+            const patient = buildPatientDetails({ canManageRecord: false });
+
+            mockedUsePatient.mockReturnValue(patient);
+            mockedUseRole.mockReturnValue(REPOSITORY_ROLE.GP_CLINICAL);
+            mockedUseConfig.mockReturnValue({
+                featureFlags: {
+                    uploadLambdaEnabled: true,
+                    uploadArfWorkflowEnabled: false,
+                    uploadLloydGeorgeWorkflowEnabled: true,
+                    uploadDocumentIteration3Enabled: true,
+                },
+                mockLocal: {},
+            });
+
+            render(<PatientResultPage />);
+            await userEvent.click(
+                screen.getByRole('button', {
+                    name: CONFIRM_BUTTON_TEXT,
+                }),
+            );
+
+            await waitFor(() => {
+                expect(mockedUseNavigate).toHaveBeenCalledWith(routes.DOCUMENT_UPLOAD);
+            });
+        });
+
         it.each([REPOSITORY_ROLE.GP_ADMIN, REPOSITORY_ROLE.GP_CLINICAL])(
             "navigates to Lloyd George Record page after user selects Active patient, when role is '%s' and uploadDocumentIteration3Enabled is false",
             async (role) => {
@@ -276,7 +303,7 @@ describe('PatientResultPage', () => {
         );
 
         it.each([REPOSITORY_ROLE.GP_ADMIN, REPOSITORY_ROLE.GP_CLINICAL])(
-            "navigates to patient documents page after user selects Active patient, when role is '%s' and uploadDocumentIteration3Enabled is true",
+            "navigates to patient documents page after user selects Active patient and canManageRecord, when role is '%s' and uploadDocumentIteration3Enabled is true",
             async (role) => {
                 const patient = buildPatientDetails({ active: true });
                 mockedUseRole.mockReturnValue(role);

app/src/pages/patientResultPage/PatientResultPage.tsx

@@ -37,6 +37,11 @@ const PatientResultPage = (): React.JSX.Element => {
                 return;
             }
 
+            if (!patientDetails.canManageRecord && featureFlags.uploadDocumentIteration3Enabled) {
+                navigate(routes.DOCUMENT_UPLOAD);
+                return;
+            }
+
             if (patientDetails?.active) {
                 navigate(
                     featureFlags.uploadDocumentIteration3Enabled

app/src/types/generic/patientDetails.ts

@@ -8,4 +8,5 @@ export type PatientDetails = {
     restricted: boolean;
     active: boolean;
     deceased: boolean;
+    canManageRecord?: boolean;
 };

app/src/types/generic/uploadResult.ts

@@ -4,7 +4,7 @@ export type UploadSession = {
 
 export type S3Upload = {
     url: string;
-    fields: S3UploadFields;
+    fields?: S3UploadFields;
 };
 
 export type S3UploadFields = {