2020-1-CloudComputing / D_Team_Khuloud

Go to a project
Toggle navigation Toggle navigation pinning
Hong
1bb8b4ac 1 parent cbf932d2

폴더삭제 구현

Inline Side-by-side
Showing 2 changed files with 72 additions and 83 deletions
...@@ -29,26 +29,17 @@ router.get('/show', function(req, res, next) { ...@@ -29,26 +29,17 @@ router.get('/show', function(req, res, next) {
29 parentPath += '/'; 29 parentPath += '/';
30 } 30 }
31 } 31 }
32 - folders = {}
33 let checkfolder = 'SELECT * FROM folders WHERE location = ? AND user_id = ?;'; 32 let checkfolder = 'SELECT * FROM folders WHERE location = ? AND user_id = ?;';
34 connection.query(checkfolder, [curPath, user_id], function(err, rows, fields) { 33 connection.query(checkfolder, [curPath, user_id], function(err, rows, fields) {
35 if (err) { 34 if (err) {
36 console.log('select error'); 35 console.log('select error');
37 res.status(404).send() 36 res.status(404).send()
38 } else { 37 } else {
39 - if (rows.length != 0) { 38 + res.status(200).send({
40 - res.status(200).send({ 39 + folders: rows,
41 - folders: rows, 40 + cur: curPath,
42 - cur: curPath, 41 + parentPath: parentPath
43 - parentPath: parentPath 42 + })
44 - })
45 - } else {
46 - res.status(200).send({
47 - folders: rows,
48 - cur: curPath,
49 - parentPath: parentPath
50 - })
51 - }
52 } 43 }
53 }); 44 });
54 }); 45 });
...@@ -70,39 +61,37 @@ router.post('/makefolder', function(req, res, next) { ...@@ -70,39 +61,37 @@ router.post('/makefolder', function(req, res, next) {
70 let checksql = 'SELECT * FROM folders WHERE location = ? AND folder_name = ?;'; 61 let checksql = 'SELECT * FROM folders WHERE location = ? AND folder_name = ?;';
71 console.log(req.body) 62 console.log(req.body)
72 connection.query(checksql, [cur, folder_name], function(err, rows, fields) { 63 connection.query(checksql, [cur, folder_name], function(err, rows, fields) {
73 - if (rows.length == 0) { 64 + if (err) {
74 - s3.putObject(params, function(err, data) {
75 - if (err) {
76 - console.log('s3 error');
77 - throw err;
78 - } else {
79 - console.log(data);
80 - }
81 - });
82 - let sql = 'INSERT INTO folders (folder_name,location,user_id,created) values (?,?,?,?);';
83 - let values = [folder_name, cur, user_id, date];
84 - connection.query(sql, values, function(err, result, field) {
85 - if (err) {
86 - console.log('insert error');
87 - throw err;
88 - } else {
89 - folders = {}
90 - let checkfolder = 'SELECT * FROM folders WHERE location = ? AND user_id = ?;';
91 - connection.query(checkfolder, [cur, user_id], function(err, rows, fields) {
92 - if (rows.length != 0) {
93 - res.status(200).send({
94 - folders: rows
95 - })
96 - } else {
97 - res.send({ error: "Does not exist" });
98 - }
99 - });
100 - }
101 - });
102 -
103 65
104 } else { 66 } else {
105 - res.status(404).send({ error: "same name error" }); 67 + if (rows.length == 0) {
68 + s3.putObject(params, function(err, data) {
69 + if (err) {
70 + console.log('s3 error');
71 + throw err;
72 + } else {
73 + console.log(data);
74 + let sql = 'INSERT INTO folders (folder_name,location,user_id,created) values (?,?,?,?);';
75 + let values = [folder_name, cur, user_id, date];
76 + connection.query(sql, values, function(err, result, field) {
77 + if (err) {
78 + console.log('insert error');
79 + throw err;
80 + } else {
81 + let checkfolder = 'SELECT * FROM folders WHERE location = ? AND user_id = ?;';
82 + connection.query(checkfolder, [cur, user_id], function(err, rows, fields) {
83 + console.log(rows);
84 + res.status(200).send({
85 + folders: rows
86 + })
87 + });
88 + }
89 + });
90 + }
91 + });
92 + } else {
93 + res.status(404).send({ error: "same name error" });
94 + }
106 } 95 }
107 }); 96 });
108 }); 97 });
...@@ -110,48 +99,49 @@ router.post('/makefolder', function(req, res, next) { ...@@ -110,48 +99,49 @@ router.post('/makefolder', function(req, res, next) {
110 99
111 router.post('/delfolder', function(req, res, next) { 100 router.post('/delfolder', function(req, res, next) {
112 101
113 - user_id = req.body.user_id; 102 + user_id = req.body.id;
114 - curPath = user_id + req.body.cur; 103 + let cur = req.body.cur;
104 + curPath = user_id + cur;
115 let folder_name = req.body.folder_name; 105 let folder_name = req.body.folder_name;
116 let params = { 106 let params = {
117 - Bucket: BUCKET_NAME + curPath, 107 + Bucket: BUCKET_NAME,
118 - Key: folder_name + '/' 108 + Key: curPath + folder_name + '/'
119 }; 109 };
120 - let checksql = 'SELECT * FROM folders WHERE location = ? AND folder_name = ?;'; 110 + let checksql = 'SELECT * FROM folders WHERE location = ? AND folder_name = ? AND user_id = ?;';
121 - let values = [curPath, folder_name]; 111 + let values = [cur, folder_name, user_id];
122 -
123 connection.query(checksql, values, function(err, rows, fields) { 112 connection.query(checksql, values, function(err, rows, fields) {
124 - if (rows.length != 0) { 113 + if (err) {
125 - s3.deleteObject(params, function(err, data) { 114 + res.status(404).send({ error: "error" });
126 - if (err) { 115 + } else {
127 - //throw err; 116 + if (rows.length != 0) {
128 - } else { 117 + s3.deleteObject(params, function(err, data) {
129 - let sql = 'DELETE FROM folders WHERE location = ? AND folder_name = ?;'; 118 + if (err) {
130 - connection.query(sql, values, function(err, result, field) { 119 + console.log('s3 error');
131 - if (err) { 120 + //throw err;
132 - //throw err; 121 + } else {
133 - } else { 122 + console.log(data);
134 - folders = {} 123 + let sql = 'DELETE FROM folders WHERE location = ? AND folder_name = ? AND user_id = ?;';
135 - let checkfolder = 'SELECT * FROM folders WHERE location = ? AND user_id = ?;'; 124 + connection.query(sql, values, function(err, result, field) {
136 - connection.query(checkfolder, [cur, user_id], function(err, rows, fields) { 125 + if (err) {
137 - if (rows.length != 0) { 126 + //throw err;
127 + } else {
128 + console.log(cur);
129 + console.log(user_id);
130 + let checkfolder = 'SELECT * FROM folders WHERE location = ? AND user_id = ?;';
131 + connection.query(checkfolder, [cur, user_id], function(err, rows, fields) {
138 res.status(200).send({ 132 res.status(200).send({
139 - folders: rows, 133 + folders: rows
140 - cur: curPath
141 }) 134 })
142 - } else { 135 + });
143 - res.send({ error: "Does not exist" });
144 - }
145 - });
146 136
147 - } 137 + }
148 - }); 138 + });
149 - } 139 + }
150 - }); 140 + });
151 - 141 + } else {
152 - 142 + console.log(req.body);
153 - } else { 143 + res.status(304).send({ error: "Does not exist" });
154 - res.send({ error: "Does not exist" }); 144 + }
155 } 145 }
156 }); 146 });
157 }); 147 });
......
...@@ -219,10 +219,9 @@ import Axios from 'axios'; ...@@ -219,10 +219,9 @@ import Axios from 'axios';
219 cur : this.$store.state.cur, 219 cur : this.$store.state.cur,
220 folder_name: folderName 220 folder_name: folderName
221 } 221 }
222 - const reponse = await deleteFolder(cData); 222 + const response = await deleteFolder(cData);
223 - console.log(response.data); 223 + console.log(response);
224 this.$store.commit('setFolder', response.data.folders); 224 this.$store.commit('setFolder', response.data.folders);
225 - this.$store.commit('setCur', response.data.cur);
226 } catch (error) { 225 } catch (error) {
227 console.log("에러"); 226 console.log("에러");
228 console.log(error.response.data); 227 console.log(error.response.data);
......