catch the lastest dev (#186)

* Add endpoint of upload status (#181) * api key update (#185) --------- Co-authored-by: liulw2022 <[email protected]> Co-authored-by: a-thansen <[email protected]>
DTU-SE-Group-D · Dec 18, 2023 · 98e8ad0 · 98e8ad0
1 parent 71a3699
commit 98e8ad0
Show file tree

Hide file tree

Showing 3 changed files with 33 additions and 1 deletion.
diff --git a/backend/src/upload/file.processor.ts b/backend/src/upload/file.processor.ts
@@ -39,14 +39,19 @@ export class FileProcessor {
         fs.mkdirSync(tempUnzipPath, { recursive: true });
       }
 
+      // Start the unzip process with a progress of 0%
+      await job.progress(0);
+
       // Stream the zip file and extract to the temporary directory
+
       fs.createReadStream(filePath)
         .pipe(unzip.Extract({ path: tempUnzipPath }))
         .on('error', (error) => {
           console.error(`Error unzipping file: ${filePath}`, error);
         })
         .on('close', async () => {
           await this.handleUnzippedContent(tempUnzipPath, filePath);
+          await job.progress(60);
         });
     } catch (error) {
       console.error(`Error processing file: ${job.data.filePath}`, error);
@@ -121,6 +126,8 @@ export class FileProcessor {
 
         // TODO(Seb-sti1): (when rest working) add valhalla here
 
+        await job.progress(65);
+
         // Upload all data and images to the database
         await Promise.all([
           ...data.map(async (data) => {
@@ -145,6 +152,7 @@ export class FileProcessor {
             );
           }),
         ]);
+        await job.progress(99);
       }
 
       // Delete the unzipped file
@@ -161,6 +169,8 @@ export class FileProcessor {
       console.log(
         `File processed successfully and imported into Database: ${filePath}`,
       );
+      await job.progress(100);
+      console.log(`Job ${job.id} completed`);
     } catch (error) {
       console.error(`Error processing file: ${job.data.filePath}`, error);
     }

diff --git a/backend/src/upload/upload.controller.ts b/backend/src/upload/upload.controller.ts
@@ -7,6 +7,7 @@ import {
   Post,
   UploadedFile,
   UseInterceptors,
+  Get,
 } from '@nestjs/common';
 import { FileInterceptor } from '@nestjs/platform-express';
 import { InjectQueue } from '@nestjs/bull';
@@ -79,4 +80,25 @@ export class UploadController {
       };
     }
   }
+  @Get('status')
+  async getUploadStatus() {
+    const jobs = await this.fileQueue.getJobs([
+      'waiting',
+      'active',
+      'completed',
+      'failed',
+    ]);
+    const jobStatus = await Promise.all(
+      jobs.map(async (job) => ({
+        id: job.id,
+        name: job.name,
+        timestamp: job.timestamp,
+        jobData: job.data,
+        status: await job.getState(),
+        progress: await job.progress(),
+      })),
+    );
+    console.log('Job Status:', jobStatus);
+    return jobStatus;
+  }
 }
diff --git a/frontend/src/Components/Map/Inputs/Search.tsx b/frontend/src/Components/Map/Inputs/Search.tsx
@@ -22,7 +22,7 @@ interface Props {
  */
 const Search: React.FC<Props> = ({ onPlaceSelect }) => {
   return (
-    <GeoapifyContext apiKey="bb524d9939ae497688b9b2dddc5cf0a2">
+    <GeoapifyContext apiKey="278562afd6274f1484c58a79d37c76af">
       <GeoapifyGeocoderAutocomplete
         placeholder="Enter address here"
         type={'street'}