Move rocketchat models (#13027)

* Move rocketchat settings to specific package

* WIP: Move models from rocketchat-lib to a specific package (server)

* Move function from rocketchat:lib to rocketchat:utils to use it in rocketchat:models

* Move client models from rocketchat:lib to rocketchat:models

* Fix lint

* Simplify model files

* Fix wrong object assign

.meteor/packages

@@ -202,4 +202,5 @@ rocketchat:mailmessages
 juliancwirko:postcss
 littledata:synced-cron
 rocketchat:utils
-rocketchat:settings
+rocketchat:settings
+rocketchat:models

.meteor/versions

@@ -201,6 +201,7 @@ rocketchat:message-pin@0.0.1
 rocketchat:message-snippet@0.0.1
 rocketchat:message-star@0.0.1
 rocketchat:migrations@0.0.1
+rocketchat:models@1.0.0
 rocketchat:monitoring@2.30.2_3
 rocketchat:nrr@1.0.0
 rocketchat:oauth2-server@2.0.0

packages/rocketchat-lib/client/models/index.js

@@ -0,0 +1,11 @@
+import { Avatars } from 'meteor/rocketchat:models';
+import { Base as _Base } from 'meteor/rocketchat:models';
+import { Uploads } from 'meteor/rocketchat:models';
+import { UserDataFiles } from 'meteor/rocketchat:models';
+
+Object.assign(RocketChat.models, {
+	_Base,
+	Avatars,
+	Uploads,
+	UserDataFiles,
+});

packages/rocketchat-lib/lib/getDefaultSubscriptionPref.js

@@ -1,31 +1,3 @@
-RocketChat.getDefaultSubscriptionPref = function _getDefaultSubscriptionPref(userPref) {
-	const subscription = {};
+import { getDefaultSubscriptionPref } from 'meteor/rocketchat:utils';
 
-	const {
-		desktopNotifications,
-		mobileNotifications,
-		emailNotificationMode,
-		highlights,
-	} = (userPref.settings && userPref.settings.preferences) || {};
-
-	if (Array.isArray(highlights) && highlights.length) {
-		subscription.userHighlights = highlights;
-	}
-
-	if (desktopNotifications && desktopNotifications !== 'default') {
-		subscription.desktopNotifications = desktopNotifications;
-		subscription.desktopPrefOrigin = 'user';
-	}
-
-	if (mobileNotifications && mobileNotifications !== 'default') {
-		subscription.mobilePushNotifications = mobileNotifications;
-		subscription.mobilePrefOrigin = 'user';
-	}
-
-	if (emailNotificationMode && emailNotificationMode !== 'default') {
-		subscription.emailNotifications = emailNotificationMode;
-		subscription.emailPrefOrigin = 'user';
-	}
-
-	return subscription;
-};
+RocketChat.getDefaultSubscriptionPref = getDefaultSubscriptionPref;

packages/rocketchat-lib/package.js

@@ -25,6 +25,7 @@ Package.onUse(function(api) {
 	api.use('service-configuration');
 	api.use('check');
 	api.use('rocketchat:utils');
+	api.use('rocketchat:models');
 	api.use('rocketchat:accounts');
 	api.use('modules');
 	api.use('rocketchat:i18n');
@@ -134,17 +135,7 @@ Package.onUse(function(api) {
 	api.addFiles('server/lib/passwordPolicy.js', 'server');
 
 	// SERVER MODELS
-	api.addFiles('server/models/_Base.js', 'server');
-	api.addFiles('server/models/Avatars.js', 'server');
-	api.addFiles('server/models/Messages.js', 'server');
-	api.addFiles('server/models/Reports.js', 'server');
-	api.addFiles('server/models/Rooms.js', 'server');
-	api.addFiles('server/models/Settings.js', 'server');
-	api.addFiles('server/models/Subscriptions.js', 'server');
-	api.addFiles('server/models/Uploads.js', 'server');
-	api.addFiles('server/models/Users.js', 'server');
-	api.addFiles('server/models/ExportOperations.js', 'server');
-	api.addFiles('server/models/UserDataFiles.js', 'server');
+	api.addFiles('server/models/index.js', 'server');
 
 	api.addFiles('server/oauth/oauth.js', 'server');
 	api.addFiles('server/oauth/facebook.js', 'server');
@@ -243,9 +234,7 @@ Package.onUse(function(api) {
 	api.addFiles('client/CustomTranslations.js', 'client');
 
 	// CLIENT MODELS
-	api.addFiles('client/models/_Base.js', 'client');
-	api.addFiles('client/models/Avatars.js', 'client');
-	api.addFiles('client/models/Uploads.js', 'client');
+	api.addFiles('client/models/index.js', 'client');
 
 	// CLIENT VIEWS
 	api.addFiles('client/views/customFieldsForm.html', 'client');

packages/rocketchat-lib/server/models/index.js

@@ -0,0 +1,25 @@
+import { Avatars } from 'meteor/rocketchat:models';
+import { Base as _Base } from 'meteor/rocketchat:models';
+import { ExportOperations } from 'meteor/rocketchat:models';
+import { Messages } from 'meteor/rocketchat:models';
+import { Reports } from 'meteor/rocketchat:models';
+import { Rooms } from 'meteor/rocketchat:models';
+import { Settings } from 'meteor/rocketchat:models';
+import { Subscriptions } from 'meteor/rocketchat:models';
+import { Uploads } from 'meteor/rocketchat:models';
+import { UserDataFiles } from 'meteor/rocketchat:models';
+import { Users } from 'meteor/rocketchat:models';
+
+Object.assign(RocketChat.models, {
+	_Base,
+	Avatars,
+	ExportOperations,
+	Messages,
+	Reports,
+	Rooms,
+	Settings,
+	Subscriptions,
+	Uploads,
+	UserDataFiles,
+	Users,
+});

packages/rocketchat-models/client/index.js

@@ -0,0 +1,11 @@
+import { Base } from './models/_Base';
+import Avatars from './models/Avatars';
+import Uploads from './models/Uploads';
+import UserDataFiles from './models/UserDataFiles';
+
+export {
+	Base,
+	Avatars,
+	Uploads,
+	UserDataFiles,
+};

packages/rocketchat-models/client/models/Avatars.js

@@ -0,0 +1,10 @@
+import { Base } from './_Base';
+
+export class Avatars extends Base {
+	constructor() {
+		super();
+		this._initModel('avatars');
+	}
+}
+
+export default new Avatars();

packages/rocketchat-models/client/models/Uploads.js

@@ -0,0 +1,10 @@
+import { Base } from './_Base';
+
+export class Uploads extends Base {
+	constructor() {
+		super();
+		this._initModel('uploads');
+	}
+}
+
+export default new Uploads();

packages/rocketchat-models/client/models/UserDataFiles.js

@@ -0,0 +1,10 @@
+import { Base } from './_Base';
+
+export class UserDataFiles extends Base {
+	constructor() {
+		super();
+		this._initModel('userDataFiles');
+	}
+}
+
+export default new UserDataFiles();

packages/rocketchat-lib/client/models/_Base.js → packages/rocketchat-models/client/models/_Base.js

@@ -1,7 +1,7 @@
 import { check } from 'meteor/check';
 import { Mongo } from 'meteor/mongo';
 
-RocketChat.models._Base = class {
+export class Base {
 
 	_baseName() {
 		return 'rocketchat_';
@@ -52,4 +52,4 @@ RocketChat.models._Base = class {
 
 	tryDropIndex() {}
 
-};
+}

packages/rocketchat-models/package.js

@@ -0,0 +1,17 @@
+Package.describe({
+	name: 'rocketchat:models',
+	summary: 'RocketChat Models',
+	version: '1.0.0',
+	git: '',
+});
+
+Package.onUse(function(api) {
+	api.use([
+		'ecmascript',
+		'rocketchat:settings',
+		'rocketchat:utils',
+		'konecty:multiple-instances-status',
+	]);
+	api.mainModule('client/index.js', 'client');
+	api.mainModule('server/index.js', 'server');
+});

packages/rocketchat-models/server/index.js

@@ -0,0 +1,27 @@
+import { Base } from './models/_Base';
+import { BaseDb } from './models/_BaseDb';
+import Avatars from './models/Avatars';
+import ExportOperations from './models/ExportOperations';
+import Messages from './models/Messages';
+import Reports from './models/Reports';
+import Rooms from './models/Rooms';
+import Settings from './models/Settings';
+import Subscriptions from './models/Subscriptions';
+import Uploads from './models/Uploads';
+import UserDataFiles from './models/UserDataFiles';
+import Users from './models/Users';
+
+export {
+	Base,
+	BaseDb,
+	Avatars,
+	ExportOperations,
+	Messages,
+	Reports,
+	Rooms,
+	Settings,
+	Subscriptions,
+	Uploads,
+	UserDataFiles,
+	Users,
+};

packages/rocketchat-lib/server/models/Avatars.js → packages/rocketchat-models/server/models/Avatars.js

@@ -1,8 +1,9 @@
 import _ from 'underscore';
 import s from 'underscore.string';
 import { InstanceStatus } from 'meteor/konecty:multiple-instances-status';
+import { Base } from './_Base';
 
-RocketChat.models.Avatars = new class extends RocketChat.models._Base {
+export class Avatars extends Base {
 	constructor() {
 		super('avatars');
 
@@ -110,4 +111,6 @@ RocketChat.models.Avatars = new class extends RocketChat.models._Base {
 			return this.remove({ _id: fileId });
 		}
 	}
-};
+}
+
+export default new Avatars();

packages/rocketchat-lib/server/models/ExportOperations.js → packages/rocketchat-models/server/models/ExportOperations.js

@@ -1,6 +1,7 @@
+import { Base } from './_Base';
 import _ from 'underscore';
 
-RocketChat.models.ExportOperations = new class ModelExportOperations extends RocketChat.models._Base {
+export class ExportOperations extends Base {
 	constructor() {
 		super('export_operations');
 
@@ -75,4 +76,6 @@ RocketChat.models.ExportOperations = new class ModelExportOperations extends Roc
 	removeById(_id) {
 		return this.remove(_id);
 	}
-};
+}
+
+export default new ExportOperations();

packages/rocketchat-lib/server/models/Messages.js → packages/rocketchat-models/server/models/Messages.js

@@ -1,8 +1,12 @@
 import { Meteor } from 'meteor/meteor';
 import { Match } from 'meteor/check';
+import { settings } from 'meteor/rocketchat:settings';
+import { Base } from './_Base';
+import Rooms from './Rooms';
+import Users from './Users';
 import _ from 'underscore';
 
-RocketChat.models.Messages = new class extends RocketChat.models._Base {
+export class Messages extends Base {
 	constructor() {
 		super('message');
 
@@ -366,7 +370,7 @@ RocketChat.models.Messages = new class extends RocketChat.models._Base {
 	}
 
 	cloneAndSaveAsHistoryById(_id) {
-		const me = RocketChat.models.Users.findOneById(Meteor.userId());
+		const me = Users.findOneById(Meteor.userId());
 		const record = this.findOneById(_id);
 		record._hidden = true;
 		record.parent = record._id;
@@ -580,7 +584,7 @@ RocketChat.models.Messages = new class extends RocketChat.models._Base {
 
 	// INSERT
 	createWithTypeRoomIdMessageAndUser(type, roomId, message, user, extraData) {
-		const room = RocketChat.models.Rooms.findOneById(roomId, { fields: { sysMes: 1 } });
+		const room = Rooms.findOneById(roomId, { fields: { sysMes: 1 } });
 		if ((room != null ? room.sysMes : undefined) === false) {
 			return;
 		}
@@ -596,20 +600,20 @@ RocketChat.models.Messages = new class extends RocketChat.models._Base {
 			groupable: false,
 		};
 
-		if (RocketChat.settings.get('Message_Read_Receipt_Enabled')) {
+		if (settings.get('Message_Read_Receipt_Enabled')) {
 			record.unread = true;
 		}
 
 		_.extend(record, extraData);
 
 		record._id = this.insertOrUpsert(record);
-		RocketChat.models.Rooms.incMsgCountById(room._id, 1);
+		Rooms.incMsgCountById(room._id, 1);
 		return record;
 	}
 
 	createNavigationHistoryWithRoomIdMessageAndUser(roomId, message, user, extraData) {
 		const type = 'livechat_navigation_history';
-		const room = RocketChat.models.Rooms.findOneById(roomId, { fields: { sysMes: 1 } });
+		const room = Rooms.findOneById(roomId, { fields: { sysMes: 1 } });
 		if ((room != null ? room.sysMes : undefined) === false) {
 			return;
 		}
@@ -625,7 +629,7 @@ RocketChat.models.Messages = new class extends RocketChat.models._Base {
 			groupable: false,
 		};
 
-		if (RocketChat.settings.get('Message_Read_Receipt_Enabled')) {
+		if (settings.get('Message_Read_Receipt_Enabled')) {
 			record.unread = true;
 		}
 
@@ -753,7 +757,7 @@ RocketChat.models.Messages = new class extends RocketChat.models._Base {
 			query['u.username'] = { $in: users };
 		}
 
-		const messagesToDelete = RocketChat.models.Messages.find(query, {
+		const messagesToDelete = this.find(query, {
 			fields: {
 				_id: 1,
 			},
@@ -830,4 +834,6 @@ RocketChat.models.Messages = new class extends RocketChat.models._Base {
 			},
 		});
 	}
-};
+}
+
+export default new Messages();

packages/rocketchat-lib/server/models/Reports.js → packages/rocketchat-models/server/models/Reports.js

@@ -1,6 +1,7 @@
+import { Base } from './_Base';
 import _ from 'underscore';
 
-RocketChat.models.Reports = new class extends RocketChat.models._Base {
+export class Reports extends Base {
 	constructor() {
 		super('reports');
 	}
@@ -15,4 +16,6 @@ RocketChat.models.Reports = new class extends RocketChat.models._Base {
 		record._id = this.insert(record);
 		return record;
 	}
-};
+}
+
+export default new Reports();