From 7e3ace5f806add6abb01e3fa184b72ae293d64a9 Mon Sep 17 00:00:00 2001
From: Nikita Melnikov <nikmel2803@gmail.com>
Date: Thu, 21 Apr 2022 21:46:15 +0300
Subject: [PATCH] fix files uploading

---
 src/backend/controllers/transport.ts | 7 ++++++-
 src/backend/models/file.ts           | 7 ++++++-
 src/backend/routes/api/transport.ts  | 9 ++++++++-
 src/frontend/js/classes/editor.js    | 2 +-
 4 files changed, 21 insertions(+), 4 deletions(-)

diff --git a/src/backend/controllers/transport.ts b/src/backend/controllers/transport.ts
index b8b773e..adea3f5 100644
--- a/src/backend/controllers/transport.ts
+++ b/src/backend/controllers/transport.ts
@@ -34,7 +34,7 @@ class Transport {
    * @returns {Promise<FileData>}
    */
   public static async save(multerData: Dict, map: Dict): Promise<FileData> {
-    const { originalname: name, path, filename, size, mimetype } = multerData;
+    const { originalname: name, path, filename, size, mimetype, url } = multerData;
 
     const file = new File({
       name,
@@ -42,12 +42,15 @@ class Transport {
       path,
       size,
       mimetype,
+      url,
     });
 
     await file.save();
 
     let response = file.data;
 
+    console.log(file)
+
     if (map) {
       response = Transport.composeResponse(file, map);
     }
@@ -95,6 +98,8 @@ class Transport {
 
     let response = file.data;
 
+    console.log(response)
+
     if (map) {
       response = Transport.composeResponse(file, map);
     }
diff --git a/src/backend/models/file.ts b/src/backend/models/file.ts
index 3ed44ee..ab1c2e2 100644
--- a/src/backend/models/file.ts
+++ b/src/backend/models/file.ts
@@ -10,6 +10,7 @@ const filesDb = database['files'];
  * @property {string} filename - name of uploaded file
  * @property {string} path - path to uploaded file
  * @property {string} mimetype - file MIME type
+ * @property {string} url - file url
  * @property {number} size - size of the file in
  */
 export interface FileData {
@@ -18,6 +19,7 @@ export interface FileData {
   filename?: string;
   path?: string;
   mimetype?: string;
+  url?: string;
   size?: number;
   [key: string]: string | number | undefined;
 }
@@ -40,6 +42,7 @@ class File {
   public path?: string;
   public mimetype?: string;
   public size?: number;
+  public url?: string;
 
   /**
    * @class
@@ -99,13 +102,14 @@ class File {
    * @param {FileData} fileData - info about file
    */
   public set data(fileData: FileData) {
-    const { name, filename, path, mimetype, size } = fileData;
+    const { name, filename, path, mimetype, size, url } = fileData;
 
     this.name = name || this.name;
     this.filename = filename || this.filename;
     this.path = path ? this.processPath(path) : this.path;
     this.mimetype = mimetype || this.mimetype;
     this.size = size || this.size;
+    this.url = url || this.url;
   }
 
   /**
@@ -121,6 +125,7 @@ class File {
       path: this.path,
       mimetype: this.mimetype,
       size: this.size,
+      url: this.url,
     };
   }
 
diff --git a/src/backend/routes/api/transport.ts b/src/backend/routes/api/transport.ts
index 15219e0..0f99bdd 100644
--- a/src/backend/routes/api/transport.ts
+++ b/src/backend/routes/api/transport.ts
@@ -77,10 +77,17 @@ router.post('/transport/image', imageUploader, async (req: Request, res: Respons
     return;
   }
 
+  const fileData = {
+    ...req.files.image[0],
+    url: '/uploads/' + req.files.image[0].filename,
+  };
+
+  console.log(fileData);
+
   try {
     Object.assign(
       response,
-      await Transport.save(req.files.image[0], req.body.map ? JSON.parse(req.body.map) : undefined)
+      await Transport.save(fileData, req.body.map ? JSON.parse(req.body.map) : undefined)
     );
 
     response.success = 1;
diff --git a/src/frontend/js/classes/editor.js b/src/frontend/js/classes/editor.js
index afeca67..044a294 100644
--- a/src/frontend/js/classes/editor.js
+++ b/src/frontend/js/classes/editor.js
@@ -55,7 +55,7 @@ export default class Editor {
             },
             additionalRequestData: {
               map: JSON.stringify({
-                path: 'file:url',
+                url: 'file:url',
                 size: 'file:size',
                 mimetype: 'file:mime',
               }),