Merge pull request #88 from ModusCreateOrg/ADE-66

[ADE-66] refactor and improve uploading a report & processing it

Author: GuidoBR

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

@@ -201,11 +201,10 @@ export class DocumentProcessorController {
       // Extract lab values
       report.labValues = result.analysis.labValues || [];
 
+      report.confidence = result.analysis.metadata.confidence || 0;
+
       // Create summary from simplified explanation or diagnoses
-      report.summary =
-        result.simplifiedExplanation ||
-        result.analysis.diagnoses.map(d => d.condition).join(', ') ||
-        'No summary available';
+      report.summary = result.simplifiedExplanation!;
 
       report.updatedAt = new Date().toISOString();
 

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

@@ -50,6 +50,9 @@ export class Report {
   @ApiProperty({ description: 'Summary of the report' })
   summary: string;
 
+  @ApiProperty({ description: 'Confidence score of the analysis (0-100)' })
+  confidence: number;
+
   @ApiProperty({
     description: 'Status of the report',
     enum: ReportStatus,
@@ -60,6 +63,12 @@ export class Report {
   @ApiProperty({ description: 'File path of the report' })
   filePath: string;
 
+  @ApiProperty({ description: 'Original filename of the uploaded file' })
+  originalFilename: string;
+
+  @ApiProperty({ description: 'File size in bytes' })
+  fileSize: number;
+
   @ApiProperty({ description: 'Creation timestamp' })
   createdAt: string;
 

backend/src/reports/reports.controller.ts

@@ -157,18 +157,28 @@ export class ReportsController {
           type: 'string',
           description: 'S3 file path for the report',
         },
+        originalFilename: {
+          type: 'string',
+          description: 'Original filename of the uploaded file',
+        },
+        fileSize: {
+          type: 'number',
+          description: 'Size of the file in bytes',
+        },
       },
       required: ['filePath'],
     },
-    description: 'S3 file path for the report',
+    description: 'S3 file path and metadata for the report',
   })
   @Post()
   async createReport(
     @Body('filePath') filePath: string,
+    @Body('originalFilename') originalFilename: string,
+    @Body('fileSize') fileSize: number,
     @Req() request: RequestWithUser,
   ): Promise<Report> {
     const userId = this.extractUserId(request);
-    return this.reportsService.saveReport(filePath, userId);
+    return this.reportsService.saveReport(filePath, userId, originalFilename, fileSize);
   }
 
   private extractUserId(request: RequestWithUser): string {

backend/src/reports/reports.service.ts

@@ -282,7 +282,20 @@ export class ReportsService {
     }
   }
 
-  async saveReport(filePath: string, userId: string): Promise<Report> {
+  /**
+   * Save a new report to DynamoDB
+   * @param filePath S3 object path of the uploaded file
+   * @param userId User ID of the report owner
+   * @param originalFilename Original filename of the uploaded file
+   * @param fileSize Size of the file in bytes
+   * @returns The saved report
+   */
+  async saveReport(
+    filePath: string,
+    userId: string,
+    originalFilename: string = 'Unknown filename',
+    fileSize: number = 0,
+  ): Promise<Report> {
     if (!filePath) {
       throw new NotFoundException('File URL is required');
     }
@@ -296,12 +309,15 @@ export class ReportsService {
         id: uuidv4(),
         userId,
         filePath,
+        originalFilename,
+        fileSize,
         title: 'New Report',
         bookmarked: false,
         category: '',
         processingStatus: ProcessingStatus.UNPROCESSED,
         labValues: [],
         summary: '',
+        confidence: 0,
         status: ReportStatus.UNREAD,
         createdAt: new Date().toISOString(),
         updatedAt: new Date().toISOString(),

frontend/src/common/api/reportService.ts

@@ -75,6 +75,8 @@ export const uploadReport = async (
       `${API_URL}/api/reports`,
       {
         filePath: s3Key,
+        originalFilename: file.name,
+        fileSize: file.size,
       },
       config,
     );

frontend/src/common/components/Icon/Icon.tsx

@@ -26,6 +26,8 @@ import {
   faArrowUpFromBracket,
   faHome,
   faFileLines as faSolidFileLines,
+  faFileAlt as faFileText,
+  faFilePdf,
   faUpload,
   faComment,
   faUserCircle,
@@ -36,12 +38,14 @@ import {
   faChevronUp,
   faChevronDown,
   faVial,
+  faLightbulb as faSolidLightbulb,
 } from '@fortawesome/free-solid-svg-icons';
 import {
   faFileLines as faRegularFileLines,
   faComment as faRegularComment,
   faUser as faRegularUser,
   faBookmark as faRegularBookmark,
+  faLightbulb as faRegularLightbulb,
 } from '@fortawesome/free-regular-svg-icons';
 import classNames from 'classnames';
 
@@ -63,6 +67,8 @@ export type IconName =
   | 'comment'
   | 'envelope'
   | 'fileLines'
+  | 'fileText'
+  | 'filePdf'
   | 'home'
   | 'house'
   | 'link'
@@ -86,7 +92,8 @@ export type IconName =
   | 'flask'
   | 'chevronUp'
   | 'chevronDown'
-  | 'vial';
+  | 'vial'
+  | 'lightbulb';
 
 /**
  * Properties for the `Icon` component.
@@ -114,6 +121,8 @@ const solidIcons: Record<IconName, IconProp> = {
   comment: faComment,
   envelope: faEnvelope,
   fileLines: faSolidFileLines,
+  fileText: faFileText,
+  filePdf: faFilePdf,
   home: faHome,
   house: faHouse,
   link: faLink,
@@ -138,6 +147,7 @@ const solidIcons: Record<IconName, IconProp> = {
   chevronUp: faChevronUp,
   chevronDown: faChevronDown,
   vial: faVial,
+  lightbulb: faSolidLightbulb,
 };
 
 /**
@@ -150,6 +160,7 @@ const regularIcons: Partial<Record<IconName, IconProp>> = {
   user: faRegularUser,
   bookmark: faRegularBookmark,
   circleXmark: faCircleXmark,
+  lightbulb: faRegularLightbulb,
 };
 
 /**

frontend/src/common/components/Router/TabNavigation.tsx

@@ -18,7 +18,7 @@ import ChatPage from 'pages/Chat/ChatPage';
 import UploadPage from 'pages/Upload/UploadPage';
 import ReportsListPage from 'pages/Reports/ReportsListPage';
 import ReportDetailPage from 'pages/Reports/ReportDetailPage';
-import Processing from 'pages/Processing/Processing';
+import ProcessingPage from 'pages/Processing/ProcessingPage';
 
 /**
  * The `TabNavigation` component provides a router outlet for all of the
@@ -92,7 +92,7 @@ const TabNavigation = (): JSX.Element => {
             <ReportDetailPage />
           </Route>
           <Route exact path="/tabs/processing">
-            <Processing />
+            <ProcessingPage />
           </Route>
           <Route exact path="/">
             <Redirect to="/tabs/home" />

frontend/src/common/models/medicalReport.ts

@@ -22,6 +22,7 @@ export enum ProcessingStatus {
   PROCESSED = 'processed',
   UNPROCESSED = 'unprocessed',
   IN_PROGRESS = 'in_progress',
+  FAILED = 'failed',
 }
 
 /**
@@ -50,8 +51,11 @@ export interface MedicalReport {
   processingStatus: ProcessingStatus;
   labValues: LabValue[];
   summary: string;
+  confidence: number;
   status: ReportStatus;
   filePath: string;
+  originalFilename: string;
+  fileSize: number;
   createdAt: string; // ISO date string
   updatedAt: string; // ISO date string
 }

frontend/src/common/utils/i18n/resources/en/common.json

@@ -70,6 +70,9 @@
     "required-path": "{{path}} is required. ",
     "url": "Must be a URL. "
   },
+  "loading": {
+    "report": "Loading report..."
+  },
   "no": "no",
   "updated": "updated",
   "welcome": "Welcome",
@@ -79,4 +82,4 @@
       "title": "AI Assistant"
     }
   }
-}
+}

frontend/src/common/utils/i18n/resources/en/errors.json

@@ -4,5 +4,9 @@
   },
   "ai": {
     "content_filtered": "I couldn't find an answer. Please try rephrasing your question or consult your healthcare provider."
-  }
-} 
+  },
+  "loading": {
+    "report": "Error loading the report. Please try again."
+  },
+  "no-report-data": "No report data available."
+}