refactor: Move channel related props outside of room.visitor

apps/meteor/app/apps/server/converters/rooms.js

@@ -39,8 +39,8 @@ export class AppRoomsConverter {
 		if (room.visitor) {
 			const visitor = await LivechatVisitors.findOneById(room.visitor.id);
 
-			const lastMessageTs = room?.visitor?.lastMessageTs;
-			const phone = room?.visitor?.channelPhone;
+			const { lastMessageTs, phone } = room.visitorChannelInfo;
+
 			v = {
 				_id: visitor._id,
 				username: visitor.username,
@@ -170,26 +170,32 @@ export class AppRoomsConverter {
 
 				return this.orch.getConverters().get('users').convertById(u._id);
 			},
-			visitor: async (room) => {
+			visitor: (room) => {
 				const { v } = room;
 
 				if (!v) {
 					return undefined;
 				}
 
-				const { lastMessageTs, phone } = v;
+				return this.orch.getConverters().get('visitors').convertById(v._id);
+			},
+			// Note: room.v is not just visitor, it also contains channel related visitor data
+			// so we need to pass this data to the converter
+			// So suppose you have a contact whom we're contacting using SMS via 2 phone no's,
+			// let's call X and Y. Then if the contact sends a message using X phone number,
+			// then room.v.phoneNo would be X and correspondingly we'll store the timestamp of
+			// the last message from this visitor from X phone no on room.v.lastMessageTs
+			visitorChannelInfo: (room) => {
+				const { v } = room;
 
-				delete room.v;
+				if (!v) {
+					return undefined;
+				}
+
+				const { lastMessageTs, phone } = v;
 
 				return {
-					...(await this.orch.getConverters().get('visitors').convertById(v._id)),
-					// Note: room.v is not just visitor, it also contains channel related visitor data
-					// so we need to pass this data to the converter
-					// So suppose you have a contact whom we're contacting using SMS via 2 phone no's,
-					// let's call X and Y. Then if the contact sends a message using X phone number,
-					// then room.v.phoneNo would be X and correspondingly we'll store the timestamp of
-					// the last message from this visitor from X phone no on room.v.lastMessageTs
-					...(phone && { channelPhone: phone }),
+					...(phone && { phone }),
 					...(lastMessageTs && { lastMessageTs }),
 				};
 			},