소스 검색

Amélioration retour updateFile

Loquicom 5 년 전
부모
커밋
2b9da2bdc2
2개의 변경된 파일24개의 추가작업 그리고 10개의 파일을 삭제
  1. 13 5
      node/src/db.js
  2. 11 5
      node/src/router.js

+ 13 - 5
node/src/db.js

@@ -192,12 +192,20 @@ Db.prototype.updateFile = function (username, fileId, data) {
     if (typeof username !== 'string' || typeof fileId !== 'string' || typeof data !== 'string') {
         return false;
     }
-    this.fileExist(username, fileId).then((result) => {
-        if (result) {
-            this._execute(sql.updateFile, [data, fileId]);
-        }
+    // Met à jour les données du fichier
+    return new Promise((resolve, reject) => {
+        this.fileExist(username, fileId).then((result) => {
+            if (result) {
+                this._execute(sql.updateFile, [data, fileId]);
+                resolve(true);
+            } else {
+                if (gobal.verbose) {
+                    console.info(`File ${fileId} for user ${username} not found`);
+                }
+                resolve(false);
+            }
+        });
     });
-    return true;
 };
 
 Db.prototype.renameFile = function (username, fileId, name) {

+ 11 - 5
node/src/router.js

@@ -312,12 +312,18 @@ const router = class Router {
         }
         // Sinon on modifie la base
         else {
-            let result = db.updateFile(req.body.user, req.params.file, req.body.data);
-            if (result === false) {
-                res.json(error(ERR_SERV));
+            let promise = db.updateFile(req.body.user, req.params.file, req.body.data);
+            if (promise === false) {
+                res.json(error(ERR_REQUEST));
                 return;
             }
-            res.json(success({fileId: req.params.file}));
+            promise.then((result) => {
+                if (result) {
+                    res.json(success({fileId: req.params.file}));
+                } else {
+                    res.json(error(ERR_FILE));
+                }
+            });
         }
     }
 
@@ -335,7 +341,7 @@ const router = class Router {
             if (result) {
                 res.json(success({fileId: req.params.file, filename: req.body.name}));
             } else {
-                res.json(error(ERR_UNKNOW));
+                res.json(error(ERR_FILE));
             }
         });
     }