First pass at #1331 - Groups.search() + Tests

public/src/utils.js

@@ -253,6 +253,10 @@
 				}
 			});
 			return tagsToReturn;
+		},
+
+		escapeRegexChars: function(text) {
+			return text.replace(/[-[\]{}()*+?.,\\^$|#\s]/g, "\\$&");
 		}
 	};
 

src/groups.js

@@ -4,26 +4,31 @@
 	var async = require('async'),
 		winston = require('winston'),
 		user = require('./user'),
-		db = require('./database');
+		db = require('./database'),
+		utils = require('../public/src/utils'),
 
-	Groups.list = function(options, callback) {
-		db.getSetMembers('groups', function (err, groupNames) {
-			if (groupNames.length > 0) {
-				async.map(groupNames, function (groupName, next) {
-					Groups.get(groupName, options, next);
-				}, function (err, groups) {
+		filterGroups = function(groups, options) {
 			// Remove system, hidden, or deleted groups from this list
-					if (!options.showAllGroups) {
-						groups = groups.filter(function (group) {
+			if (groups && !options.showAllGroups) {
+				return groups.filter(function (group) {
 					if (group.deleted || (group.hidden && !group.system) || (!options.showSystemGroups && group.system)) {
 						return false;
 					} else {
 						return true;
 					}
 				});
+			} else {
+				return groups;
 			}
+		};
 
-					callback(err, groups);
+	Groups.list = function(options, callback) {
+		db.getSetMembers('groups', function (err, groupNames) {
+			if (groupNames.length > 0) {
+				async.map(groupNames, function (groupName, next) {
+					Groups.get(groupName, options, next);
+				}, function (err, groups) {
+					callback(err, filterGroups(groups, options));
 				});
 			} else {
 				callback(null, []);
@@ -87,6 +92,24 @@
 		});
 	};
 
+	Groups.search = function(query, options, callback) {
+		if (query.length) {
+			db.getSetMembers('groups', function(err, groups) {
+				groups = groups.filter(function(groupName) {
+					return groupName.match(new RegExp(utils.escapeRegexChars(query), 'i'));
+				});
+
+				async.map(groups, function(groupName, next) {
+					Groups.get(groupName, options, next);
+				}, function(err, groups) {
+					callback(err, filterGroups(groups, options));
+				});
+			});
+		} else {
+			callback(null, []);
+		}
+	};
+
 	Groups.isMember = function(uid, groupName, callback) {
 		db.isSetMember('group:' + groupName + ':members', uid, callback);
 	};

tests/groups.js

@@ -73,6 +73,27 @@ describe('Groups', function() {
 		});
 	});
 
+	describe('.search()', function() {
+		it('should return the "Test" group when searched for', function(done) {
+			Groups.search('test', {}, function(err, groups) {
+				assert.equal(1, groups.length);
+				assert.strictEqual('Test', groups[0].name);
+				done();
+			});
+		});
+
+		it('should return the "Hidden" group when "showAllGroups" option is passed in', function(done) {
+			Groups.search('hidden', {
+				showAllGroups: true
+			}, function(err, groups) {
+				console.log(groups);
+				assert.equal(1, groups.length);
+				assert.strictEqual('Hidden', groups[0].name);
+				done();
+			});
+		});
+	});
+
 	describe('.isMember()', function() {
 		it('should return boolean true when a user is in a group', function(done) {
 			Groups.isMember(1, 'Test', function(err, isMember) {