Add option to not overwrite livechat custom fields

packages/rocketchat-livechat/app/client/lib/CustomFields.js

@@ -2,13 +2,13 @@ this.CustomFields = (function() {
 	var queue = {};
 	var initiated = false;
 
-	var setCustomField = function(token, key, value) {
+	var setCustomField = function(token, key, value, overwrite = true) {
 		if (!initiated) {
 			// queue by key
-			queue[key] = { token, value };
+			queue[key] = { token, value, overwrite };
 			return;
 		}
-		Meteor.call('livechat:setCustomField', token, key, value);
+		Meteor.call('livechat:setCustomField', token, key, value, overwrite);
 	};
 
 	var init = function() {
@@ -16,7 +16,7 @@ this.CustomFields = (function() {
 			if (Meteor.userId()) {
 				initiated = true;
 				Object.keys(queue).forEach((key) => {
-					setCustomField.call(this, queue[key].token, key, queue[key].value);
+					setCustomField.call(this, queue[key].token, key, queue[key].value, queue[key].overwrite);
 				});
 				queue = {};
 			} else {

packages/rocketchat-livechat/app/client/lib/hooks.js

@@ -8,8 +8,8 @@ var api = {
 		Meteor.call('livechat:pageVisited', visitor.getToken(), info);
 	},
 
-	setCustomField: function(key, value) {
-		CustomFields.setCustomField(visitor.getToken(), key, value);
+	setCustomField: function(key, value, overwrite = true) {
+		CustomFields.setCustomField(visitor.getToken(), key, value, overwrite);
 	},
 
 	setTheme: function(theme) {

packages/rocketchat-livechat/assets/rocket-livechat.js

@@ -74,8 +74,11 @@
 		});
 	};
 
-	var setCustomField = function(key, value) {
-		callHook('setCustomField', [ key, value ]);
+	var setCustomField = function(key, value, overwrite) {
+		if (typeof overwrite === 'undefined') {
+			overwrite = true;
+		}
+		callHook('setCustomField', [ key, value, overwrite ]);
 	};
 
 	var setTheme = function(theme) {

packages/rocketchat-livechat/server/methods/setCustomField.js

 Meteor.methods({
-	'livechat:setCustomField'(token, key, value) {
+	'livechat:setCustomField'(token, key, value, overwrite = true) {
 		const customField = RocketChat.models.LivechatCustomField.findOneById(key);
 		if (customField) {
 			if (customField.scope === 'room') {
-				return RocketChat.models.Rooms.updateLivechatDataByToken(token, key, value);
+				return RocketChat.models.Rooms.updateLivechatDataByToken(token, key, value, overwrite);
 			} else {
 				// Save in user
-				return RocketChat.models.Users.updateLivechatDataByToken(token, key, value);
+				return RocketChat.models.Users.updateLivechatDataByToken(token, key, value, overwrite);
 			}
 		}
 

packages/rocketchat-livechat/server/models/Rooms.js

@@ -16,12 +16,19 @@ RocketChat.models.Rooms.updateSurveyFeedbackById = function(_id, surveyFeedback)
 	return this.update(query, update);
 };
 
-RocketChat.models.Rooms.updateLivechatDataByToken = function(token, key, value) {
+RocketChat.models.Rooms.updateLivechatDataByToken = function(token, key, value, overwrite = true) {
 	const query = {
 		'v.token': token,
 		open: true
 	};
 
+	if (!overwrite) {
+		const room = this.findOne(query, { fields: { livechatData: 1 } });
+		if (room.livechatData && typeof room.livechatData[key] !== 'undefined') {
+			return true;
+		}
+	}
+
 	const update = {
 		$set: {
 			[`livechatData.${key}`]: value

packages/rocketchat-livechat/server/models/Users.js

@@ -166,11 +166,18 @@ RocketChat.models.Users.openOffice = function() {
 	});
 };
 
-RocketChat.models.Users.updateLivechatDataByToken = function(token, key, value) {
+RocketChat.models.Users.updateLivechatDataByToken = function(token, key, value, overwrite = true) {
 	const query = {
 		'profile.token': token
 	};
 
+	if (!overwrite) {
+		const user = this.findOne(query, { fields: { livechatData: 1 } });
+		if (user.livechatData && typeof user.livechatData[key] !== 'undefined') {
+			return true;
+		}
+	}
+
 	const update = {
 		$set: {
 			[`livechatData.${key}`]: value