Refactor DocumentProcessorController and enhance report processing logic to include isMedicalReport flag. Update ProcessingPage and ProcessingError components for improved error handling and user feedback. Introduce new ProcessingMedicalReport component for non-medical report scenarios. Ensure all user-facing text is internationalized.

Author: adamrefaey

backend/src/document-processor/controllers/document-processor.controller.ts

@@ -38,10 +38,7 @@ export class DocumentProcessorController {
     }
 
     // Extract userId from the request (attached by auth middleware)
-    const userId = request.user?.sub;
-    if (!userId) {
-      throw new UnauthorizedException('User ID not found in request');
-    }
+    const userId = this.extractUserId(request);
 
     this.logger.log(`Queueing document for processing, report ID: ${reportId}`);
 
@@ -138,11 +135,9 @@ export class DocumentProcessorController {
       }
 
       if (!result.analysis.metadata.isMedicalReport) {
-        this.logger.log(`Report ${reportId} is not a medical report.`);
-        report.processingStatus = ProcessingStatus.FAILED;
-        report.errorMessage = 'Document is not a medical report';
-        report.updatedAt = new Date().toISOString();
-        await this.reportsService.updateReport(report);
+        const errorMessage = `Report ${reportId} is not a medical report.`;
+        this.logger.log(errorMessage);
+        await this.failReport(reportId, userId, errorMessage, false);
 
         return;
       }
@@ -151,7 +146,7 @@ export class DocumentProcessorController {
       report.title = result.analysis.title;
       report.category = result.analysis.category;
       report.processingStatus = ProcessingStatus.PROCESSED;
-
+      report.isMedicalReport = true;
       // Extract lab values
       report.labValues = result.analysis.labValues || [];
 
@@ -184,13 +179,15 @@ export class DocumentProcessorController {
     reportId: string,
     userId: string,
     errorMessage: string | undefined = undefined,
+    isMedicalReport: boolean | undefined = undefined,
   ): Promise<void> {
     try {
       const report = await this.reportsService.findOne(reportId, userId);
       if (report) {
         report.processingStatus = ProcessingStatus.FAILED;
         report.updatedAt = new Date().toISOString();
         report.errorMessage = errorMessage;
+        report.isMedicalReport = isMedicalReport;
         await this.reportsService.updateReport(report);
         this.logger.log(`Updated status of report ${reportId} to FAILED`);
       }
@@ -283,10 +280,7 @@ export class DocumentProcessorController {
     }
 
     // Extract userId from the request (attached by auth middleware)
-    const userId = request.user?.sub;
-    if (!userId) {
-      throw new UnauthorizedException('User ID not found in request');
-    }
+    const userId = this.extractUserId(request);
 
     try {
       // Fetch the associated report record from DynamoDB
@@ -299,6 +293,7 @@ export class DocumentProcessorController {
         reportId: report.id,
         status: report.processingStatus,
         isComplete: report.processingStatus === ProcessingStatus.PROCESSED,
+        isMedicalReport: report.isMedicalReport,
       };
     } catch (error: unknown) {
       this.logger.error(
@@ -307,4 +302,12 @@ export class DocumentProcessorController {
       throw error;
     }
   }
+
+  private extractUserId(request: RequestWithUser): string {
+    const userId = request.user?.sub;
+    if (!userId) {
+      throw new UnauthorizedException('User ID not found in request');
+    }
+    return userId;
+  }
 }

backend/src/reports/models/report.model.ts

@@ -35,6 +35,9 @@ export class Report {
   })
   processingStatus: ProcessingStatus;
 
+  @ApiProperty({ description: 'Optional flag to indicate if the report is a medical report' })
+  isMedicalReport?: boolean;
+
   @ApiProperty({ description: 'List of lab values' })
   labValues: Array<{
     name: string;

frontend/src/common/models/medicalReport.ts

@@ -57,6 +57,7 @@ export interface MedicalReport {
   fileSize: number;
   status: ReportStatus;
   errorMessage?: string; // Optional error message for the report
+  isMedicalReport?: boolean; // Optional flag to indicate if the report is a medical report
   createdAt: string; // ISO date string
   updatedAt: string; // ISO date string
 }

frontend/src/pages/Processing/ProcessingPage.tsx

@@ -24,6 +24,7 @@ const ProcessingPage: React.FC = () => {
   // States to track processing
   const [isProcessing, setIsProcessing] = useState(true);
   const [processingError, setProcessingError] = useState<string | null>(null);
+  const [errorHeading, setErrorHeading] = useState<string | null>(null);
   const statusCheckIntervalRef = useRef<number | null>(null);
   const lastTriggeredTime = useRef<number | null>(null);
 
@@ -42,6 +43,14 @@ const ProcessingPage: React.FC = () => {
   const checkReportStatus = async () => {
     if (!reportId) return;
 
+    const failedHeading = 'Processing Error';
+    const failedMessage =
+      'There was a problem processing your uploaded file. Please try again or upload another.';
+
+    const missingDataHeading = 'Missing Data';
+    const missingDataMessage =
+      'The system was unable to extract meaningful health data from your uploaded file. Please try again or upload another.';
+
     try {
       const response = await axios.get(
         `${API_URL}/api/document-processor/report-status/${reportId}`,
@@ -50,27 +59,27 @@ const ProcessingPage: React.FC = () => {
 
       const data = response.data;
 
-      // If processing is complete, clear the interval and redirect to the report page
       if (data.isComplete) {
         setIsProcessing(false);
-
-        // Clear the interval
         clearStatusCheckInterval();
 
         console.log('Processing complete');
 
-        // Redirect to report detail page
         history.push(`/tabs/reports/${reportId}`);
+      } else if (data.isMedicalReport === false) {
+        setIsProcessing(false);
+        clearStatusCheckInterval();
+        setErrorHeading(missingDataHeading);
+        setProcessingError(missingDataMessage);
       } else if (data.status === 'failed') {
-        throw new Error('Processing failed');
+        throw new Error(failedMessage);
       }
     } catch (error) {
-      // Clear the interval on error
+      setIsProcessing(false);
       clearStatusCheckInterval();
 
-      console.error('Error checking report status:', error);
-      setProcessingError('An error occurred while processing the report. Please try again.');
-      setIsProcessing(false);
+      setErrorHeading(failedHeading);
+      setProcessingError(error instanceof Error ? error.message : failedMessage);
     }
   };
 
@@ -148,7 +157,13 @@ const ProcessingPage: React.FC = () => {
           {isProcessing && <ProcessingAnimation firstName={firstName} />}
 
           {/* Error state - shows when processing fails */}
-          {processingError && <ProcessingError errorMessage={processingError} onRetry={execute} />}
+          {processingError && errorHeading && (
+            <ProcessingError
+              errorHeading={errorHeading}
+              errorMessage={processingError}
+              onRetry={execute}
+            />
+          )}
         </div>
       </IonContent>
     </IonPage>

frontend/src/pages/Processing/components/ProcessingError.tsx

@@ -5,14 +5,19 @@ import warning from '../../../assets/icons/warning.svg';
 
 interface ProcessingErrorProps {
   errorMessage: string;
+  errorHeading: string;
   onRetry: () => void;
 }
 
 /**
  * Component that displays processing error information and actions
  * Exactly matches the design from the provided screenshot
  */
-const ProcessingError: React.FC<ProcessingErrorProps> = ({ errorMessage, onRetry }) => {
+const ProcessingError: React.FC<ProcessingErrorProps> = ({
+  errorMessage,
+  errorHeading,
+  onRetry,
+}) => {
   const history = useHistory();
 
   return (
@@ -27,7 +32,7 @@ const ProcessingError: React.FC<ProcessingErrorProps> = ({ errorMessage, onRetry
           <img src={warning} alt="Warning Icon" className="processing-page__error-icon-img" />
         </div>
 
-        <h3 className="processing-page__error-subheading">Processing Error</h3>
+        <h3 className="processing-page__error-subheading">{errorHeading}</h3>
 
         <p className="processing-page__error-message">{errorMessage}</p>
       </div>

frontend/src/pages/Processing/components/ProcessingMedicalReport.tsx

@@ -0,0 +1,24 @@
+import React from 'react';
+import { IonButton } from '@ionic/react';
+import { useHistory } from 'react-router-dom';
+import { useTranslation } from 'react-i18next';
+
+/**
+ * Component displayed when the uploaded document is not a medical report
+ */
+const ProcessingMedicalReport: React.FC = () => {
+  const history = useHistory();
+  const { t } = useTranslation();
+
+  return (
+    <div className="processing-error">
+      <h2>{t('error.not_medical_report', { ns: 'processing' })}</h2>
+      <p>{t('error.not_medical_report_message', { ns: 'processing' })}</p>
+      <IonButton onClick={() => history.push('/tabs/upload')} className="retry-button">
+        {t('button.try_another', { ns: 'common' })}
+      </IonButton>
+    </div>
+  );
+};
+
+export default ProcessingMedicalReport;