From 38aa5aa3e63da6ab7a7741d8443432824910f929 Mon Sep 17 00:00:00 2001
From: Baris Soner Usakli <barisusakli@gmail.com>
Date: Mon, 22 Jul 2013 16:47:41 -0400
Subject: [PATCH] refactor to remove category_name and category_slug from topic
 hashes

---
 src/admin/categories.js | 13 -------------
 src/categories.js       | 29 ++++++++++++++++++++---------
 src/threadTools.js      |  5 -----
 src/topics.js           | 35 +++++++++++++++++++++++------------
 src/webserver.js        |  3 +--
 5 files changed, 44 insertions(+), 41 deletions(-)

diff --git a/src/admin/categories.js b/src/admin/categories.js
index f287f9a1ef..21d13aacac 100644
--- a/src/admin/categories.js
+++ b/src/admin/categories.js
@@ -41,25 +41,12 @@ var	RDB = require('./../redis.js'),
 					var slug = cid + '/' + utils.slugify(category[key]);
 					RDB.hset('category:' + cid, 'slug', slug);
 					RDB.set('categoryslug:' + slug + ':cid', cid);
-
-					RDB.smembers('categories:' + cid + ':tid', function(err, tids) {
-						var pipe = RDB.multi();
-
-						for (var tid in tids) {
-							pipe.set(schema.topics(tid).category_name, category[key]);
-							pipe.set(schema.topics(tid).category_slug, slug);
-						}
-						pipe.exec();
-					});
-					
 				}
 			}
 
 			updated.push(cid);
 		}
 
-		
-
 		socket.emit('event:alert', {
 			title: 'Updated Categories',
 			message: 'Category IDs ' + updated.join(', ') + ' was successfully updated.',
diff --git a/src/categories.js b/src/categories.js
index 165f9e2c3f..476b72dcef 100644
--- a/src/categories.js
+++ b/src/categories.js
@@ -9,9 +9,9 @@ var	RDB = require('./redis.js'),
 
 	Categories.getCategoryById = function(category_id, current_user, callback) {
 		
-		Categories.getCategoryData(category_id, function(categoryData) {
+		Categories.getCategoryData(category_id, function(err, categoryData) {
 			
-			if(!categoryData) {
+			if(err) {
 				callback(false);
 				return;
 			}
@@ -341,12 +341,23 @@ var	RDB = require('./redis.js'),
 	}
 
 	Categories.getCategoryData = function(cid, callback) {
-		RDB.hgetall('category:' + cid, function(err, data) {
-			if(err === null)
-				callback(data);
-			else	
+		RDB.hgetall('category:' + cid, callback);
+	}
+	
+	Categories.getCategoryFields = function(cid, fields, callback) {
+		RDB.hmget('category:' + cid, fields, function(err, data) {
+			if(err === null) {
+				var returnData = {};
+				
+				for(var i=0, ii=fields.length; i<ii; ++i) {
+					returnData[fields[i]] = data[i];
+				}
+
+				callback(returnData);
+			}
+			else
 				console.log(err);
-		});
+		});		
 	}
 	
 	Categories.setCategoryField = function(cid, field, value) {
@@ -366,9 +377,9 @@ var	RDB = require('./redis.js'),
 		var categories = [];
 
 		for(var i=0; i<cids.length; ++i) {
-			Categories.getCategoryData(cids[i], function(categoryData) {
+			Categories.getCategoryData(cids[i], function(err, categoryData) {
 				
-				if(!categoryData)
+				if(err)
 					return;
 
 				Categories.hasReadCategory(categoryData.cid, current_user, function(hasRead) {
diff --git a/src/threadTools.js b/src/threadTools.js
index da0366cc17..6083741846 100644
--- a/src/threadTools.js
+++ b/src/threadTools.js
@@ -180,11 +180,6 @@ var	RDB = require('./redis.js'),
 					categories.incrementCategoryFieldBy(oldCid, 'topic_count', -1);
 					categories.incrementCategoryFieldBy(cid, 'topic_count', 1);
 
-					categories.getCategories([cid], function(data) {
-						topics.setTopicField(tid, 'category_name', data.categories[0].name);
-						topics.setTopicField(tid, 'category_slug', data.categories[0].slug);
-					});
-
 					socket.emit('api:topic.move', {
 						status: 'ok'
 					});
diff --git a/src/topics.js b/src/topics.js
index f660325776..f83a64bf26 100644
--- a/src/topics.js
+++ b/src/topics.js
@@ -84,9 +84,16 @@ marked.setOptions({
 		});
 	}
 
+	Topics.getCategoryData = function(tid, callback) {
+		Topics.getTopicField(tid, 'cid', function(cid) {
+			categories.getCategoryData(cid, callback);
+		});
+	}
+
 	Topics.getTopicWithPosts = function(tid, current_user, callback) {
 		threadTools.exists(tid, function(exists) {
-			if (!exists) return callback(new Error('Topic tid \'' + tid + '\' not found'));
+			if (!exists) 
+				return callback(new Error('Topic tid \'' + tid + '\' not found'));
 
 			Topics.markAsRead(tid, current_user);
 
@@ -108,19 +115,29 @@ marked.setOptions({
 					next(null, privData);
 				});
 			}		
+			
+			function getCategoryData(next) {
+				Topics.getCategoryData(tid, next);
+			}
 
-			async.parallel([getTopicData, getTopicPosts, getPrivileges], function(err, results) {
-				if (err) console.log(err.message);
+			async.parallel([getTopicData, getTopicPosts, getPrivileges, getCategoryData], function(err, results) {
+				if (err) {
+					console.log(err.message);
+					callback(err, null);
+					return;
+				}
+					
 				var topicData = results[0],
 					topicPosts = results[1],
-					privileges = results[2];
+					privileges = results[2],
+					categoryData = results[3];
 
 				var main_posts = topicPosts.splice(0, 1);
 				
 				callback(null, {
 					'topic_name':topicData.title,
-					'category_name':topicData.category_name,
-					'category_slug':topicData.category_slug,
+					'category_name':categoryData.name,
+					'category_slug':categoryData.slug,
 					'locked': topicData.locked,
 					'deleted': topicData.deleted,
 					'pinned': topicData.pinned,
@@ -410,12 +427,6 @@ marked.setOptions({
 
 				// in future it may be possible to add topics to several categories, so leaving the door open here.
 				RDB.sadd('categories:' + category_id + ':tid', tid);
-
-				categories.getCategories([category_id], function(data) {
-					Topics.setTopicField(tid, 'category_name', data.categories[0].name);
-					Topics.setTopicField(tid, 'category_slug', data.categories[0].slug);
-				});
-
 				RDB.hincrby('category:' + category_id, 'topic_count', 1);
 				RDB.incr('totaltopiccount');
 
diff --git a/src/webserver.js b/src/webserver.js
index fae657791f..44716d32cb 100644
--- a/src/webserver.js
+++ b/src/webserver.js
@@ -38,7 +38,6 @@ var express = require('express'),
 	// Middlewares
 	app.use(express.favicon(path.join(__dirname, '../', 'public', 'favicon.ico')));
 	app.use(require('less-middleware')({ src: path.join(__dirname, '../', 'public') }));
-	//app.use(express.static(path.join(__dirname, '../', 'public')));
 	app.use(global.nconf.get('relative_path'), express.static(path.join(__dirname, '../', 'public')));
 	app.use(express.bodyParser());	// Puts POST vars in request.body
 	app.use(express.cookieParser());	// If you want to parse cookies (res.cookies)
@@ -252,7 +251,7 @@ var express = require('express'),
 		app.get('/api/:method/:id*', api_method);
 
 		app.get('/cid/:cid', function(req, res) {
-			categories.getCategoryData(req.params.cid, function(data){
+			categories.getCategoryData(req.params.cid, function(err, data) {
 				if(data)
 					res.send(data);
 				else