modify createFile() place

diff --git a/server/class/DB.js b/server/class/DB.js
index 0c7a662..8157809 100644 (file)
--- a/server/class/DB.js
+++ b/server/class/DB.js
@@ -45,10 +45,10 @@ function DB() {
                     existDirectory: existDirectory,
                     notExistDirectory: notExistDirectory,
                     createFile: createFile,
-                    test1: test1,
-                    removeFile: removeFile
+                    removeFile: removeFile,
+                    createDirectory: createDirectory,
+                    test1: test1
                     /*
-                       createDirectory: createDirectory,
                        removeDirectory: removeDirectory,
                        getFilename: getFilename,
                        moveFile: moveFile,
@@ -60,34 +60,7 @@ function DB() {
         });
     }
 
-    /**
-     * createFile
-     *
-     * @param fileName 
-     * @param parentDirectory
-     * @returns {promise}<sequelize.createの結果を格納したobject | Error>
-     */
-    function createFile(fileName,parentDirectory) {
-        return new Promise(function(resolve, reject) {
-            Promise.all([notExistFile(fileName, parentDirectory), existDirectory(parentDirectory)])
-            .catch(function(error) {
-                reject(error);
-            })
-            .then(function() {
-                var q = {
-                    fileId: uuid.v1(),
-                    name: fileName,
-                    parentDirectory: parentDirectory,
-                    fileType: 1 
-                }
-                return Files.create(q)
-            })
-            .then(function(r) {
-                resolve(r.dataValues.fileId);
-            });
-        });
-    }
-
+    
 
     /**
      * existFile
@@ -169,7 +142,6 @@ function DB() {
         });
     }
 
-
     /**
      * notExistDirectory
      * ディレクトリが存在しないことを確認する
@@ -195,6 +167,34 @@ function DB() {
         });
     }
 
+    /**
+     * createFile
+     *
+     * @param fileName 
+     * @param parentDirectory
+     * @returns {promise}<sequelize.createの結果を格納したobject | Error>
+     */
+    function createFile(fileName,parentDirectory) {
+        return new Promise(function(resolve, reject) {
+            Promise.all([notExistFile(fileName, parentDirectory), existDirectory(parentDirectory)])
+            .catch(function(error) {
+                reject(error);
+            })
+            .then(function() {
+                var q = {
+                    fileId: uuid.v1(),
+                    name: fileName,
+                    parentDirectory: parentDirectory,
+                    fileType: 1 
+                }
+                return Files.create(q)
+            })
+            .then(function(r) {
+                resolve(r.dataValues.fileId);
+            });
+        });
+    }
+
 
     /**
      * removeFile
@@ -225,6 +225,34 @@ function DB() {
     }
 
     /**
+     * createDirectory
+     *
+     * @param fileName 
+     * @param parentDirectory
+     * @returns {promise}<sequelize.createの結果を格納したobject | Error>
+     */
+    function createDirectory(fileName,parentDirectory) {
+        return new Promise(function(resolve, reject) {
+            Promise.all([notExistFile(fileName, parentDirectory), existDirectory(parentDirectory)])
+            .catch(function(error) {
+                reject(error);
+            })
+            .then(function() {
+                var q = {
+                    fileId: uuid.v1(),
+                    name: fileName,
+                    parentDirectory: parentDirectory,
+                    fileType: 1 
+                }
+                return Files.create(q)
+            })
+            .then(function(r) {
+                resolve(r.dataValues.fileId);
+            });
+        });
+    }
+
+    /**
      * test1
      * test用にデータベースのレコードを追加する関数
      * @returns {promise}