Merge pull request #822 from RocketChat/models

Replace Collections by Models
RocketChat · Sep 22, 2015 · 0e5e767 · 0e5e767
2 parents 06328ec + b8b74fe
commit 0e5e767
Show file tree

Hide file tree

Showing 122 changed files with 1,666 additions and 907 deletions.
diff --git a/client/views/app/messagePopupConfig.coffee b/client/views/app/messagePopupConfig.coffee
@@ -1,19 +1,19 @@
-@onlineUsers = new Mongo.Collection 'online-users'
+@filteredUsers = new Mongo.Collection 'filtered-users'
 
 Template.messagePopupConfig.helpers
 	popupUserConfig: ->
 		self = this
 		template = Template.instance()
 		config =
 			title: 'People'
-			collection: onlineUsers
+			collection: filteredUsers
 			template: 'messagePopupUser'
 			getInput: self.getInput
 			textFilterDelay: 200
 			getFilter: (collection, filter) ->
 				exp = new RegExp("^#{filter}", 'i')
-				Meteor.subscribe 'onlineUsers', filter
-				items = onlineUsers.find({$or: [{username: exp}, {name: exp}]}, {limit: 5}).fetch()
+				Meteor.subscribe 'filteredUsers', filter
+				items = filteredUsers.find({$or: [{username: exp}, {name: exp}]}, {limit: 5}).fetch()
 
 				all =
 					_id: '@all'

diff --git a/packages/meteor-accounts-saml/saml_rocketchat.coffee b/packages/meteor-accounts-saml/saml_rocketchat.coffee
@@ -16,7 +16,7 @@ updateServices = ->
 	Meteor.clearTimeout timer if timer?
 
 	timer = Meteor.setTimeout ->
-		services = Settings.find({_id: /^(SAML_Custom_)[a-z]+$/i}).fetch()
+		services = RocketChat.models.Settings.find({_id: /^(SAML_Custom_)[a-z]+$/i}).fetch()
 
 		Accounts.saml.settings.providers = []
 
@@ -27,26 +27,26 @@ updateServices = ->
 
 			if service.value is true
 				data =
-					buttonLabelText: Settings.findOne({_id: "#{service._id}_button_label_text"})?.value
-					buttonLabelColor: Settings.findOne({_id: "#{service._id}_button_label_color"})?.value
-					buttonColor: Settings.findOne({_id: "#{service._id}_button_color"})?.value
+					buttonLabelText: RocketChat.models.Settings.findOneById("#{service._id}_button_label_text")?.value
+					buttonLabelColor: RocketChat.models.Settings.findOneById("#{service._id}_button_label_color")?.value
+					buttonColor: RocketChat.models.Settings.findOneById("#{service._id}_button_color")?.value
 					clientConfig:
-						provider: Settings.findOne({_id: "#{service._id}_provider"})?.value
+						provider: RocketChat.models.Settings.findOneById("#{service._id}_provider")?.value
 
-				Accounts.saml.settings.generateUsername = Settings.findOne({_id: "#{service._id}_generate_username"})?.value
+				Accounts.saml.settings.generateUsername = RocketChat.models.Settings.findOneById("#{service._id}_generate_username")?.value
 
 				Accounts.saml.settings.providers.push
 					provider: data.clientConfig.provider
-					entryPoint: Settings.findOne({_id: "#{service._id}_entry_point"})?.value
-					issuer: Settings.findOne({_id: "#{service._id}_issuer"})?.value
-					cert: Settings.findOne({_id: "#{service._id}_cert"})?.value
+					entryPoint: RocketChat.models.Settings.findOneById("#{service._id}_entry_point")?.value
+					issuer: RocketChat.models.Settings.findOneById("#{service._id}_issuer")?.value
+					cert: RocketChat.models.Settings.findOneById("#{service._id}_cert")?.value
 
 				ServiceConfiguration.configurations.upsert {service: serviceName.toLowerCase()}, $set: data
 			else
 				ServiceConfiguration.configurations.remove {service: serviceName.toLowerCase()}
 	, 2000
 
-Settings.find().observe
+RocketChat.models.Settings.find().observe
 	added: (record) ->
 		if /^SAML_.+/.test record._id
 			updateServices()
@@ -60,5 +60,5 @@ Settings.find().observe
 			updateServices()
 
 Meteor.startup ->
-	if not Settings.findOne({_id: /^(SAML_Custom)[a-z]+$/i})?
+	if not RocketChat.models.Settings.findOne({_id: /^(SAML_Custom)[a-z]+$/i})?
 		Meteor.call 'addSamlService', 'default'
diff --git a/...chat-authorization/lib/permissions.coffee → ...at-authorization/client/collection.coffee b/...chat-authorization/lib/permissions.coffee → ...at-authorization/client/collection.coffee
diff --git a/packages/rocketchat-authorization/package.js b/packages/rocketchat-authorization/package.js
@@ -16,13 +16,15 @@ Package.onUse(function(api) {
 
   api.use('templating', 'client');
 
-  api.addFiles('lib/permissions.coffee', ['server', 'client']);
   api.addFiles('lib/rocketchat.coffee', ['server','client']);
+  api.addFiles('client/collection.coffee', ['client']);
   api.addFiles('client/startup.coffee', ['client']);
   api.addFiles('client/hasPermission.coffee', ['client']);
   api.addFiles('client/hasRole.coffee', ['client']);
 
 
+  api.addFiles('server/models/Permissions.coffee', ['server']);
+
   api.addFiles('server/functions/addUsersToRoles.coffee', ['server']);
   api.addFiles('server/functions/getPermissionsForRole.coffee', ['server']);
   api.addFiles('server/functions/getRoles.coffee', ['server']);

diff --git a/packages/rocketchat-authorization/server/functions/getPermissionsForRole.coffee b/packages/rocketchat-authorization/server/functions/getPermissionsForRole.coffee
@@ -6,4 +6,4 @@ RocketChat.authz.getPermissionsForRole = (roleName) ->
 	unless roleName in roleNames
 		throw new Meteor.Error 'invalid-role'
 
-	return _.pluck(ChatPermissions.find({roles : roleName }).fetch(), '_id')
+	return _.pluck(RocketChat.models.Permissions.findByRole( roleName ).fetch(), '_id')
diff --git a/packages/rocketchat-authorization/server/models/Permissions.coffee b/packages/rocketchat-authorization/server/models/Permissions.coffee
@@ -0,0 +1,11 @@
+RocketChat.models.Permissions = new class extends RocketChat.models._Base
+	constructor: ->
+		@_initModel 'permissions'
+
+
+	# FIND
+	findByRole: (role, options) ->
+		query =
+			roles: role
+
+		return @find query, options
diff --git a/packages/rocketchat-authorization/server/publication.coffee b/packages/rocketchat-authorization/server/publication.coffee
@@ -1,3 +1,3 @@
 Meteor.publish 'permissions', ->
 	console.log '[publish] permissions'.green
-	return ChatPermissions.find {} 
+	return RocketChat.models.Permissions.find {}
diff --git a/packages/rocketchat-authorization/server/startup.coffee b/packages/rocketchat-authorization/server/startup.coffee
@@ -78,7 +78,7 @@ Meteor.startup ->
 	roles = _.pluck(Roles.getAllRoles().fetch(), 'name');
 
 	for permission in permissions
-		ChatPermissions.upsert( permission._id, {$setOnInsert : permission })
+		RocketChat.models.Permissions.upsert( permission._id, {$setOnInsert : permission })
 		for role in permission.roles
 			unless role in roles
 				Roles.createRole role

diff --git a/packages/rocketchat-irc/irc.server.coffee b/packages/rocketchat-irc/irc.server.coffee
@@ -160,7 +160,7 @@ class IrcClient
 		console.log '[irc] onReceiveMessage -> '.yellow, 'source:', source, 'target:', target, 'content:', content
 		source = @createUserWhenNotExist source
 		if target[0] == '#'
-			room = ChatRoom.findOne {name: target.substring 1}
+			room = RocketChat.models.Rooms.findOneByName target.substring(1)
 		else
 			room = @createDirectRoomWhenNotExist(source, @user)
 
@@ -178,7 +178,7 @@ class IrcClient
 	onEndMemberList: (roomName) ->
 		newMembers = @receiveMemberListBuf[roomName]
 		console.log '[irc] onEndMemberList -> '.yellow, 'room:', roomName, 'members:', newMembers.join ','
-		room = ChatRoom.findOne {name: roomName, t: 'c'}
+		room = RocketChat.models.Rooms.findOneByNameAndType roomName, 'c'
 		unless room
 			return
 
@@ -189,17 +189,9 @@ class IrcClient
 		for member in appendMembers
 			@createUserWhenNotExist member
 
-		update =
-			$pull:
-				usernames:
-					$in: removeMembers
-		ChatRoom.update room._id, update
-		update =
-			$addToSet:
-				usernames:
-					$each: appendMembers
-
-		ChatRoom.update room._id, update
+		RocketChat.models.Rooms.removeUsernamesById room._id, removeMembers
+		RocketChat.models.Rooms.addUsernamesById room._id, appendMembers
+
 		@isJoiningRoom = false
 		roomName = @pendingJoinRoomBuf.shift()
 		if roomName
@@ -231,15 +223,12 @@ class IrcClient
 		msg = "PRIVMSG #{target} :#{message.msg}\r\n"
 		@sendRawMessage msg
 
-	initRoomList: () ->
-		roomsCursor = ChatRoom.find
-			usernames:
-				$in: [@user.username]
-			t: 'c'
-		,
+	initRoomList: ->
+		roomsCursor = RocketChat.models.Rooms.findByTypeContainigUsername 'c', @user.username,
 			fields:
 				name: 1
 				t: 1
+
 		rooms = roomsCursor.fetch()
 		for room in rooms
 			@joinRoom(room)
@@ -276,25 +265,17 @@ class IrcClient
 
 		console.log '[irc] onAddMemberToRoom -> '.yellow, 'roomName:', roomName, 'member:', member
 		@createUserWhenNotExist member
-		update =
-			$addToSet:
-				usernames: member
 
-		ChatRoom.update {name: roomName}, update
+		RocketChat.models.Rooms.addUsernameByName roomName, member
 
 	onRemoveMemberFromRoom: (member, roomName)->
 		console.log '[irc] onRemoveMemberFromRoom -> '.yellow, 'roomName:', roomName, 'member:', member
-		update =
-			$pull:
-				usernames: member
-		ChatRoom.update {name: roomName}, update
+		RocketChat.models.Rooms.removeUsernameByName roomName, member
 
 	onQuiteMember: (member) ->
 		console.log '[irc] onQuiteMember ->'.yellow, 'username:', member
-		update =
-			$pull:
-				usernames: member
-		ChatRoom.update {}, update, {multi: true}
+		RocketChat.models.Rooms.removeUsernameFromAll member
+
 		Meteor.users.update {name: member},
 			$set:
 				status: 'offline'
@@ -319,7 +300,7 @@ class IrcClient
 		console.log '[irc] createDirectRoomWhenNotExist -> '.yellow, 'source:', source, 'target:', target
 		rid = [source._id, target._id].sort().join('')
 		now = new Date()
-		ChatRoom.upsert
+		RocketChat.models.Rooms.upsert
 			_id: rid
 		,
 			$set:
@@ -328,7 +309,8 @@ class IrcClient
 				t: 'd'
 				msgs: 0
 				ts: now
-		ChatSubscription.upsert
+
+		RocketChat.models.Subscriptions.upsert
 			rid: rid
 			$and: [{'u._id': target._id}]
 		,
@@ -373,7 +355,7 @@ class IrcSender
 		if ircReceiveMessageCache.get cacheKey
 			return message
 
-		room = ChatRoom.findOne message.rid, { fields: { name: 1, usernames: 1, t: 1 } }
+		room = RocketChat.models.Rooms.findOneById message.rid, { fields: { name: 1, usernames: 1, t: 1 } }
 		ircClient = IrcClient.getByUid message.u._id
 		ircClient.sendMessage room, message
 		return message

diff --git a/packages/rocketchat-ldap/config_server.coffee b/packages/rocketchat-ldap/config_server.coffee
@@ -14,7 +14,7 @@ updateServices = ->
 	Meteor.clearTimeout timer if timer?
 
 	timer = Meteor.setTimeout ->
-		enable = Settings.findOne({_id: 'LDAP_Enable', value: true})
+		enable = RocketChat.models.Settings.findOne({_id: 'LDAP_Enable', value: true})
 
 		if enable?
 			console.log "Enabling LDAP".blue
@@ -29,7 +29,7 @@ updateServices = ->
 			LDAP_DEFAULTS.bindSearch = undefined
 	, 2000
 
-Settings.find().observe
+RocketChat.models.Settings.find().observe
 	added: (record) ->
 		if /^LDAP_.+/.test record._id
 			updateServices()

diff --git a/packages/rocketchat-ldap/package.js b/packages/rocketchat-ldap/package.js
@@ -6,7 +6,7 @@ Package.describe({
 });
 
 Npm.depends({
-  ldapjs: "0.7.1", 
+  ldapjs: "0.7.1",
 });
 
 // Loads all i18n.json files into tapi18nFiles
@@ -22,6 +22,7 @@ Package.onUse(function(api) {
   api.versionsFrom('1.0.3.1');
 
   // Commom
+  api.use('rocketchat:[email protected]');
   api.use('tap:[email protected]');
   api.use('yasaricli:slugify');
   api.use('coffeescript');
@@ -43,7 +44,7 @@ Package.onUse(function(api) {
   api.addFiles('config_server.coffee', 'server');
 
   api.addFiles(tapi18nFiles);
-  
+
   api.export('LDAP', 'server');
   api.export('LDAP_DEFAULTS', 'server');
   api.export('MeteorWrapperLdapjs');

diff --git a/packages/rocketchat-lib/lib/core.coffee b/packages/rocketchat-lib/lib/core.coffee
@@ -3,4 +3,5 @@
 # @namespace RocketChat
 ###
 
-RocketChat = {}
+RocketChat =
+	models: {}
diff --git a/packages/rocketchat-lib/package.js b/packages/rocketchat-lib/package.js
@@ -7,13 +7,15 @@ Package.describe({
 
 Package.onUse(function(api) {
 	api.versionsFrom('1.0');
-	
+
 	api.use('reactive-var');
 	api.use('reactive-dict');
 	api.use('coffeescript');
 	api.use('random');
+	api.use('check');
 	api.use('underscore');
 	api.use('underscorestring:underscore.string');
+	api.use('monbro:[email protected]');
 
 	// TAPi18n
 	api.use('templating', 'client');
@@ -28,14 +30,33 @@ Package.onUse(function(api) {
 	api.imply('tap:i18n');
 	api.addFiles("package-tap.i18n", ["client", "server"]);
 
+
 	// COMMON
 	api.addFiles('lib/core.coffee');
 	api.addFiles('lib/callbacks.coffee');
 	api.addFiles('lib/slashCommand.coffee');
 
-	api.addFiles('settings/lib/settings.coffee');
+	// MODELS SERVER
+	api.addFiles('server/models/_Base.coffee', 'server');
+	api.addFiles('server/models/Users.coffee', 'server');
+	api.addFiles('server/models/Subscriptions.coffee', 'server');
+	api.addFiles('server/models/Rooms.coffee', 'server');
+	api.addFiles('server/models/Messages.coffee', 'server');
+	api.addFiles('server/models/Reports.coffee', 'server');
+
+	// Settings
 	api.addFiles('settings/lib/rocketchat.coffee');
 
+	api.addFiles('settings/server/models/Settings.coffee', 'server');
+	api.addFiles('settings/server/methods.coffee', 'server');
+	api.addFiles('settings/server/publication.coffee', 'server');
+	api.addFiles('settings/server/startup.coffee', 'server');
+	api.addFiles('settings/server/updateServices.coffee', 'server');
+	api.addFiles('settings/server/addOAuthService.coffee', 'server');
+
+	api.addFiles('settings/lib/settings.coffee');
+
+
 	// CLIENT
 	api.addFiles('client/Notifications.coffee', 'client');
 	api.addFiles('client/TabBar.coffee', 'client');
@@ -58,13 +79,6 @@ Package.onUse(function(api) {
 
 	api.addFiles('server/Notifications.coffee', 'server');
 
-	// Settings
-	api.addFiles('settings/server/methods.coffee', 'server');
-	api.addFiles('settings/server/publication.coffee', 'server');
-	api.addFiles('settings/server/startup.coffee', 'server');
-	api.addFiles('settings/server/updateServices.coffee', 'server');
-	api.addFiles('settings/server/addOAuthService.coffee', 'server');
-
 	api.addFiles('server/cdn.coffee', 'server');
 
 	// TAPi18n -- needs to be added last

diff --git a/packages/rocketchat-lib/server/Notifications.coffee b/packages/rocketchat-lib/server/Notifications.coffee
@@ -19,7 +19,7 @@ RocketChat.Notifications = new class
 			roomId = eventName.split('/')[0]
 
 			user = Meteor.users.findOne @userId, {fields: {username: 1}}
-			return ChatRoom.findOne({_id: roomId, usernames: user.username}, {fields: {_id: 1}})?
+			return RocketChat.models.Rooms.findOneByIdContainigUsername(roomId, user.username, {fields: {_id: 1}})?
 
 		@streamUser.permissions.write -> return @userId?
 		@streamUser.permissions.read (eventName) ->