RE1-T117 Fixing build

Author: ucswift

Tests/Resgrid.Tests/Web/Services/TwilioControllerVoiceVerificationTests.cs

@@ -45,6 +45,7 @@ public class TwilioControllerVoiceVerificationTests : TestBase
 		private Mock<IEncryptionService> _encryptionServiceMock;
 		private Mock<ITwilioVoiceResponseService> _twilioVoiceResponseServiceMock;
 		private Mock<IChatbotIngressService> _chatbotIngressServiceMock;
+		private Mock<IFeatureToggleService> _featureToggleServiceMock;
 
 		protected override void Before_all_tests()
 		{
@@ -68,6 +69,7 @@ protected override void Before_all_tests()
 			_communicationTestServiceMock = new Mock<ICommunicationTestService>();
 			_encryptionServiceMock = new Mock<IEncryptionService>();
 			_chatbotIngressServiceMock = new Mock<IChatbotIngressService>();
+			_featureToggleServiceMock = new Mock<IFeatureToggleService>();
 			_twilioVoiceResponseServiceMock = new Mock<ITwilioVoiceResponseService>();
 			_departmentSettingsServiceMock.Setup(x => x.GetTtsLanguageForDepartmentAsync(It.IsAny<int>())).ReturnsAsync((string)null);
 			_twilioVoiceResponseServiceMock
@@ -148,7 +150,8 @@ private TwilioController BuildController()
 				_communicationTestServiceMock.Object,
 				_encryptionServiceMock.Object,
 				_twilioVoiceResponseServiceMock.Object,
-				_chatbotIngressServiceMock.Object);
+				_chatbotIngressServiceMock.Object,
+				_featureToggleServiceMock.Object);
 		}
 
 		private static string InvokeBuildDispatchPrompt(Type controllerType, Call call, string address)

Web/Resgrid.Web.Services/Controllers/TwilioController.cs

@@ -153,6 +153,11 @@ public async Task<ActionResult> IncomingMessage([FromQuery] TwilioMessage reques
 					}
 				}
 
+				// Carry the resolved department onto the inbound message event so chatbot-routed events
+				// retain the same department context the text-command path records.
+				if (departmentId.HasValue)
+					messageEvent.CustomerId = departmentId.Value.ToString();
+
 				// Feature-flagged rollout: the chatbot ingress is the new path. When the flag is off
 				// (globally or for this department) fall back to the original text-command handling so
 				// existing behavior is preserved.
@@ -443,6 +448,14 @@ private async System.Threading.Tasks.Task ProcessTextCommandsAsync(TextMessage t
 
 									var call = await _callsService.GetCallByIdAsync(int.Parse(payload.Data));
 
+									// Guard against a missing call (NRE) and against reading a call that belongs
+									// to another department (cross-department data leakage).
+									if (call == null || call.DepartmentId != department.DepartmentId)
+									{
+										response.Message("Resgrid could not find that call.");
+										break;
+									}
+
 									var callText = new StringBuilder();
 									callText.Append($"Call Information for {call.Name}" + Environment.NewLine);
 									callText.Append("---------------------" + Environment.NewLine);
@@ -505,6 +518,13 @@ private async System.Threading.Tasks.Task ProcessTextCommandsAsync(TextMessage t
 						break;
 					case TextCommandTypes.Stop:
 						messageEvent.Processed = true;
+
+						if (profile == null)
+						{
+							response.Message("Unable to locate your profile. Please log in to Resgrid to manage your text message settings.");
+							break;
+						}
+
 						await _userProfileService.DisableTextMessagesForUserAsync(profile.UserId);
 						response.Message("Text messages are now turned off for this user, to enable again log in to Resgrid and update your profile.");
 						break;