파일 삭제 수정

@@ -24,16 +24,19 @@ router.get('/:name', function (req, res) {
             res.send({erorr: 'db delete error'});
             res.send({erorr: 'db delete error'});
         }
         }
         else {
         else {
-            connection.query(sql2, [file_name, '/trashcan'+curPath, user_id], function (err) {
+            //connection.query(sql2, [file_name, '/trashcan'+curPath, user_id], function (err) {
+            connection.query(sql2, [file_name, '/trashcan/', user_id], function (err) {
                 if (err) {
                 if (err) {
                     console.log('insert in trashcan db error');
                     console.log('insert in trashcan db error');
                     res.send({error: 'db insert error'});
                     res.send({error: 'db insert error'});
                 }
                 }
                 else {
                 else {
                     // /drive/user_id/sourceFile --> /drive/user_id/trashcan/sourceFile
                     // /drive/user_id/sourceFile --> /drive/user_id/trashcan/sourceFile
-                    S3.moveFile2(S3.BUCKET_NAME, user_id, sourceFile, targetPath, function (result) {
+                    S3.moveFile4(S3.BUCKET_NAME, user_id, sourceFile, targetPath, function (result) {
                         if (result) {
                         if (result) {
-                            res.send("move to trashcan success");
+                            res.send({message: "move to trashcan success"});
+                        }else{
+                            res.send({err: "no such file"})
                         }
                         }
                     })
                     })
                 }
                 }

 {
 {
-    "accessKeyId": "ASIAZQ5XTMMFW4UZW2VT",
-    "secretAccessKey": "xW8+UlKZwlWoFapKbCIWLylzm7Fu/NEp9I3Zm8ol",
-    "sessionToken": "FwoGZXIvYXdzEJr//////////wEaDCrmrozcBSyKdyzlniLDASuoWRbM8DUd4DsQqVjvJJVsuyegnxLuKZbs2nQvfAOA8X2mB5vakuykW6uNXXeyiY2keatkH5ksP07CEShFR/uoCuKHxqfV+5hglcylIeJvx4ruEvgdfyBw+u+emsSNPMYjqdc9zDgS7DZ1g9qPwUluEY+VIOhgURT15h3onCDIM7enhr4ba8iU+Nbx2ANjdTy3TGzwHnwupMZvAp8iGUt3yxlbopfIm6WtgjE2znMYGrz5/9V/S6hXCsNRVzTainyugCjc2Pn2BTItOpW51eRX99P1onvwOCN5Rh7psaflX4n+bGBhWIBuUh+jlFimntPBaKzmrB3V",
+    "accessKeyId": "ASIAZQ5XTMMF3ZUR2BUN",
+    "secretAccessKey": "eWtyyVMNd0bRvfEWHr2/8QS9Pz7kx8CfE+s1e9kZ",
+    "sessionToken": "FwoGZXIvYXdzELP//////////wEaDNHd6noZfvBmcxG92CLDAeuqzY82tmA4/ZQ0KRZhj/qwO15RUafkJfnFkRcRVd1BFkLDMkUAM79KYlfEwFyav9yPbz1fPg8nh3QYWcdFRrr02jFSPs2aFuzVYDWhSjY8t7ulft7ug7C4SmARQ7WAvJ8gON8PNFy0SmMyfl+dXomcBrKx8miw+vgsbtbnVIoBal6vaARMi60DDBNR9gOTi/ocWWhQdeoMIKfnnrhywJ+b8REcJdaUC4gYBmowFLa8hlDu9LzZFlocEe22Hs8bEm/0HCjWgv/2BTItyAqTUVvzyHPGtxvoOA5f8fB30ZbU7ISzRcIVpPOGgTTDJXAXE7gZmDSQX2+U",
     "region": "us-east-1"
     "region": "us-east-1"
 }
 }

@@ -337,6 +337,32 @@ var S3 = {
         })
         })
     },
     },
 
 
+    // 파일 삭제 때 쓰임
+    moveFile4: function (bucketName, userId, sourceFile, targetPath, callback) {
+        // sourceFile => folder1/folder2/test.txt
+        var paths = sourceFile.split('/');
+        var filename = paths[paths.length-1];
+        //var targetFile = targetPath + '/' + sourceFile;
+        targetFile = targetPath + '/' + filename;
+
+        S3.copyFile2(bucketName, userId, sourceFile, targetFile, function (res) {
+            if (!res) {
+                console.log("Move Error on Copying File2");
+                callback(false);
+            } else {
+                S3.deleteFile(bucketName, userId, sourceFile, function (res) {
+                    if (!res) {
+                        console.log("Move Error on Deleting File");
+                        callback(false);
+                    } else {
+                        console.log("Move Success");
+                        callback(true);
+                    }
+                })
+            }
+        })
+    },
+
     renameFile: function(bucketName, userId, sourceFile, modiFile, targetPath, callback){
     renameFile: function(bucketName, userId, sourceFile, modiFile, targetPath, callback){
         // sourceFile = test.txt
         // sourceFile = test.txt
         // modiFile = test2.txt
         // modiFile = test2.txt