From 6a83bf79b49693e54fe1930efcc9d73a709e7ed5 Mon Sep 17 00:00:00 2001
From: Baris Usakli <barisusakli@gmail.com>
Date: Fri, 28 Jun 2013 12:40:15 -0400
Subject: [PATCH] fixed the issue with Topics.markAsRead

---
 src/categories.js | 19 +++++++++++++++++++
 src/topics.js     | 10 ++++++++--
 2 files changed, 27 insertions(+), 2 deletions(-)

diff --git a/src/categories.js b/src/categories.js
index a165bfaadf..e4ba8ad55e 100644
--- a/src/categories.js
+++ b/src/categories.js
@@ -267,7 +267,26 @@ var	RDB = require('./redis.js'),
 		});
 	}
 
+	Categories.isTopicsRead = function(cid, uid, callback) {
+		RDB.smembers('categories:' + cid + ':tid', function(err, tids) {
 
+			topics.hasReadTopics(tids, uid, function(hasRead) {
+
+				var allread = true;
+				for (var i=0, ii=tids.length; i<ii; i++) {
+					if(hasRead[i] === 0) {
+						allread = false;
+						break;
+					}
+				}
+				callback(allread);				
+			});
+		});
+	}
+
+	Categories.markAsRead = function(cid, uid) {
+		RDB.sadd('cid:' + cid + ':read_by_uid', uid);			
+	}
 
 	Categories.hasReadCategories = function(cids, uid, callback) {
 		var batch = RDB.multi();
diff --git a/src/topics.js b/src/topics.js
index 659182d0cb..0ba2054647 100644
--- a/src/topics.js
+++ b/src/topics.js
@@ -218,10 +218,16 @@ marked.setOptions({
 	}
 
 	Topics.markAsRead = function(tid, uid) {
-		// there is an issue with this fn. if you read a topic that is previously read you will mark the category as read anyways - there is no check
+		
 		RDB.sadd(schema.topics(tid).read_by_uid, uid);
+		
 		Topics.get_cid_by_tid(tid, function(cid) {
-			RDB.sadd('cid:' + cid + ':read_by_uid', uid);
+					
+			categories.isTopicsRead(cid, uid, function(read) {
+				if(read) {
+					categories.markAsRead(cid, uid);
+				}
+			});
 		});
 	}