软删除

alsotang · alsotang · commit e4a188652768 · 2015-04-04T20:41:30.000+08:00
diff --git a/controllers/reply.js b/controllers/reply.js
@@ -92,7 +92,8 @@ exports.delete = function (req, res, next) {
       return;
     }
     if (reply.author_id.toString() === req.session.user._id.toString() || req.session.user.is_admin) {
-      reply.remove();
+      reply.deleted = true;
+      reply.save();
       res.json({status: 'success'});
 
       if (!reply.reply_id) {
diff --git a/controllers/site.js b/controllers/site.js
@@ -27,7 +27,7 @@ exports.index = function (req, res, next) {
   proxy.fail(next);
 
   // 取主题
-  var query = {};
+  var query = {deleted: false};
   if (tab && tab !== 'all') {
     if (tab === 'good') {
       query.good = true;
diff --git a/controllers/topic.js b/controllers/topic.js
@@ -260,15 +260,16 @@ exports.delete = function (req, res, next) {
     if (err) {
       return res.send({ success: false, message: err.message });
     }
-    if (!req.session.user.is_admin && !(topic.author_id.equals(req.session.user._id))){
+    if (!req.session.user.is_admin && !(topic.author_id.equals(req.session.user._id))) {
       res.status(403);
       return res.send({success: false, message: '无权限'});
     }
     if (!topic) {
       res.status(422);
       return res.send({ success: false, message: '此话题不存在或已被删除。' });
     }
-    topic.remove(function (err) {
+    topic.deleted = true;
+    topic.save(function (err) {
       if (err) {
         return res.send({ success: false, message: err.message });
       }
diff --git a/controllers/user.js b/controllers/user.js
@@ -370,8 +370,8 @@ exports.deleteAll = function (req, res, next) {
       function () {
         res.json({status: 'success'});
       });
-    TopicModel.remove({author_id: user._id}, ep.done('del_topics'));
-    ReplyModel.remove({author_id: user._id}, ep.done('del_replys'));
+    TopicModel.update({author_id: user._id}, {$set: {deleted: true}}, {multi: true}, ep.done('del_topics'));
+    ReplyModel.update({author_id: user._id}, {$set: {deleted: true}}, {multi: true}, ep.done('del_replys'));
     // 点赞数也全部干掉
     ReplyModel.update({}, {$pull: {'ups': user._id}}, {multi: true}, ep.done('del_ups'));
   }));
diff --git a/models/reply.js b/models/reply.js
@@ -10,7 +10,8 @@ var ReplySchema = new Schema({
   create_at: { type: Date, default: Date.now },
   update_at: { type: Date, default: Date.now },
   content_is_html: { type: Boolean },
-  ups: [Schema.Types.ObjectId]
+  ups: [Schema.Types.ObjectId],
+  deleted: {type: Boolean, default: false},
 });
 
 ReplySchema.index({topic_id: 1});
diff --git a/models/topic.js b/models/topic.js
@@ -20,6 +20,7 @@ var TopicSchema = new Schema({
   last_reply_at: { type: Date, default: Date.now },
   content_is_html: { type: Boolean },
   tab: {type: String},
+  deleted: {type: Boolean, default: false},
 });
 
 TopicSchema.index({create_at: -1});
diff --git a/proxy/reply.js b/proxy/reply.js
@@ -63,7 +63,7 @@ exports.getReplyById = function (id, callback) {
  * @param {Function} callback 回调函数
  */
 exports.getRepliesByTopicId = function (id, cb) {
-  Reply.find({topic_id: id}, '', {sort: 'create_at'}, function (err, replies) {
+  Reply.find({topic_id: id, deleted: false}, '', {sort: 'create_at'}, function (err, replies) {
     if (err) {
       return cb(err);
     }
diff --git a/proxy/topic.js b/proxy/topic.js
@@ -71,6 +71,7 @@ exports.getCountByQuery = function (query, callback) {
  * @param {Function} callback 回调函数
  */
 exports.getTopicsByQuery = function (query, opt, callback) {
+  query.deleted = false;
   Topic.find(query, '_id', opt, function (err, docs) {
     if (err) {
       return callback(err);
@@ -108,7 +109,7 @@ exports.getTopicsByQuery = function (query, opt, callback) {
 
 // for sitemap
 exports.getLimit5w = function (callback) {
-  Topic.find({}, '_id', {limit: 50000, sort: '-create_at'}, callback);
+  Topic.find({deleted: false}, '_id', {limit: 50000, sort: '-create_at'}, callback);
 };
 
 /**
diff --git a/views/user/index.html b/views/user/index.html
@@ -165,7 +165,7 @@
       var params = {
         _csrf: '<%- csrf %>',
       };
-      if (!confirm('确定要删除吗？此操作不可逆')) {
+      if (!confirm('确定要删除吗？（不会永久删除，只做标记位）')) {
         return;
       }
       $.post('/user/<%- user.loginname %>/delete_all', params, function (data) {

Original file line number	Diff line number	Diff line change
`@@ -92,7 +92,8 @@ exports.delete = function (req, res, next) {`
`92`	`92`	`return;`
`93`	`93`	`}`
`94`	`94`	`if (reply.author_id.toString() === req.session.user._id.toString() \|\| req.session.user.is_admin) {`
`95`		`- reply.remove();`
	`95`	`+ reply.deleted = true;`
	`96`	`+ reply.save();`
`96`	`97`	`res.json({status: 'success'});`
`97`	`98`
`98`	`99`	`if (!reply.reply_id) {`
Original file line number	Diff line number	Diff line change
`@@ -260,15 +260,16 @@ exports.delete = function (req, res, next) {`
`260`	`260`	`if (err) {`
`261`	`261`	`return res.send({ success: false, message: err.message });`
`262`	`262`	`}`
`263`		`- if (!req.session.user.is_admin && !(topic.author_id.equals(req.session.user._id))){`
	`263`	`+ if (!req.session.user.is_admin && !(topic.author_id.equals(req.session.user._id))) {`
`264`	`264`	`res.status(403);`
`265`	`265`	`return res.send({success: false, message: '无权限'});`
`266`	`266`	`}`
`267`	`267`	`if (!topic) {`
`268`	`268`	`res.status(422);`
`269`	`269`	`return res.send({ success: false, message: '此话题不存在或已被删除。' });`
`270`	`270`	`}`
`271`		`- topic.remove(function (err) {`
	`271`	`+ topic.deleted = true;`
	`272`	`+ topic.save(function (err) {`
`272`	`273`	`if (err) {`
`273`	`274`	`return res.send({ success: false, message: err.message });`
`274`	`275`	`}`
Original file line number	Diff line number	Diff line change
`@@ -63,7 +63,7 @@ exports.getReplyById = function (id, callback) {`
`63`	`63`	`* @param {Function} callback 回调函数`
`64`	`64`	`*/`
`65`	`65`	`exports.getRepliesByTopicId = function (id, cb) {`
`66`		`- Reply.find({topic_id: id}, '', {sort: 'create_at'}, function (err, replies) {`
	`66`	`+ Reply.find({topic_id: id, deleted: false}, '', {sort: 'create_at'}, function (err, replies) {`
`67`	`67`	`if (err) {`
`68`	`68`	`return cb(err);`
`69`	`69`	`}`
Original file line number	Diff line number	Diff line change
`@@ -165,7 +165,7 @@`
`165`	`165`	`var params = {`
`166`	`166`	`_csrf: '<%- csrf %>',`
`167`	`167`	`};`
`168`		`- if (!confirm('确定要删除吗？此操作不可逆')) {`
	`168`	`+ if (!confirm('确定要删除吗？（不会永久删除，只做标记位）')) {`
`169`	`169`	`return;`
`170`	`170`	`}`
`171`	`171`	`$.post('/user/<%- user.loginname %>/delete_all', params, function (data) {`