Merge pull request RocketChat#963 from WideChat/sms_endpoint_departme…

…nt_change [IMPROVE] Add departmentName as query param and route to that department in SMS endpoint
bhardwajaditya · Nov 9, 2021 · ca160ec · ca160ec
2 parents 73136ff + 6c1f915
commit ca160ec
Show file tree

Hide file tree

Showing 3 changed files with 19 additions and 7 deletions.
diff --git a/app/livechat/imports/server/rest/sms.js b/app/livechat/imports/server/rest/sms.js
@@ -30,7 +30,7 @@ const defineDepartment = (idOrName) => {
 	return department && department._id;
 };
 
-const defineVisitor = (smsNumber) => {
+const defineVisitor = (smsNumber, targetDepartment) => {
 	const visitor = LivechatVisitors.findOneVisitorByPhone(smsNumber);
 	let data = {
 		token: (visitor && visitor.token) || Random.id(),
@@ -45,9 +45,8 @@ const defineVisitor = (smsNumber) => {
 		});
 	}
 
-	const department = defineDepartment(SMS.department);
-	if (department) {
-		data.department = department;
+	if (targetDepartment) {
+		data.department = targetDepartment;
 	}
 
 	const id = Livechat.registerGuest(data);
@@ -70,10 +69,12 @@ API.v1.addRoute('livechat/sms-incoming/:service', {
 	post() {
 		const SMSService = SMS.getService(this.urlParams.service);
 		const sms = SMSService.parse(this.bodyParams);
+		const { departmentName } = this.queryParams;
+		const targetDepartment = defineDepartment(departmentName || SMS.department);
 
-		const visitor = defineVisitor(sms.from);
+		const visitor = defineVisitor(sms.from, targetDepartment);
 		const { token } = visitor;
-		const room = LivechatRooms.findOneOpenByVisitorToken(token);
+		const room = LivechatRooms.findOneOpenByVisitorTokenAndDepartmentId(token, targetDepartment);
 		const roomExists = !!room;
 		const location = normalizeLocationSharing(sms);
 		const rid = (room && room._id) || Random.id();

diff --git a/app/models/server/models/LivechatRooms.js b/app/models/server/models/LivechatRooms.js
@@ -279,6 +279,17 @@ export class LivechatRooms extends Base {
 		return this.findOne(query, options);
 	}
 
+	findOneOpenByVisitorTokenAndDepartmentId(visitorToken, departmentId, options) {
+		const query = {
+			t: 'l',
+			open: true,
+			'v.token': visitorToken,
+			departmentId,
+		};
+
+		return this.findOne(query, options);
+	}
+
 	findOpenByVisitorTokenAndDepartmentId(visitorToken, departmentId, options) {
 		const query = {
 			t: 'l',

diff --git a/packages/rocketchat-i18n/i18n/en.i18n.json b/packages/rocketchat-i18n/i18n/en.i18n.json
@@ -3947,7 +3947,7 @@
   "Smileys_and_People": "Smileys & People",
   "SMS": "SMS",
   "SMS_Default_Omnichannel_Department": "Omnichannel Department (Default)",
-  "SMS_Default_Omnichannel_Department_Description": "If set, all new incoming chats initiated by this integration will be routed to this department.",
+  "SMS_Default_Omnichannel_Department_Description": "If set, all new incoming chats initiated by this integration will be routed to this department.\nThis setting can be overwritten by passing departmentName query param in the request.\ne.g. https://<SERVER_URL>/api/v1/livechat/sms-incoming/twilio?departmentName=< departmentName>.\nDepartment name should be URL safe.",
   "SMS_Enabled": "SMS Enabled",
   "SMTP": "SMTP",
   "SMTP_Host": "SMTP Host",