Skip to content

CU-868dk7jz1 Fixed messaging queue bug #210

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
ucswift merged 1 commit into from
Apr 18, 2025
Merged

CU-868dk7jz1 Fixed messaging queue bug #210

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
42 changes: 14 additions & 28 deletions Core/Resgrid.Services/QueueService.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -116,42 +116,28 @@ public async Task<List<QueueItem>> GetAllPendingDeleteDepartmentQueueItemsAsync(

public async Task<bool> EnqueueMessageBroadcastAsync(MessageQueueItem mqi, CancellationToken cancellationToken = default(CancellationToken))
{
if (Config.SystemBehaviorConfig.IsAzure)
if (!String.IsNullOrWhiteSpace(mqi.Message.ReceivingUserId))
{
if (!String.IsNullOrWhiteSpace(mqi.Message.ReceivingUserId))
{
var dm = await _departmentsService.GetDepartmentMemberAsync(mqi.Message.ReceivingUserId, mqi.DepartmentId);
string departmentNumber = await _departmentSettingsService.GetTextToCallNumberForDepartmentAsync(dm.DepartmentId);
mqi.DepartmentTextNumber = departmentNumber;

if (mqi.Message.ReceivingUser == null)
{
var user = mqi.Profiles.FirstOrDefault(x => x.UserId == mqi.Message.ReceivingUserId);
var dm = await _departmentsService.GetDepartmentMemberAsync(mqi.Message.ReceivingUserId, mqi.DepartmentId);
string departmentNumber = await _departmentSettingsService.GetTextToCallNumberForDepartmentAsync(dm.DepartmentId);
mqi.DepartmentTextNumber = departmentNumber;

if (user != null && user.User != null)
mqi.Message.ReceivingUser = user.User;
}
}
else if (!String.IsNullOrWhiteSpace(mqi.Message.SendingUserId))
if (mqi.Message.ReceivingUser == null)
{
var dm = await _departmentsService.GetDepartmentMemberAsync(mqi.Message.SendingUserId, mqi.DepartmentId);
string departmentNumber = await _departmentSettingsService.GetTextToCallNumberForDepartmentAsync(dm.DepartmentId);
mqi.DepartmentTextNumber = departmentNumber;
}
var user = mqi.Profiles.FirstOrDefault(x => x.UserId == mqi.Message.ReceivingUserId);

return await _outboundQueueProvider.EnqueueMessage(mqi);
if (user != null && user.User != null)
mqi.Message.ReceivingUser = user.User;
}
}
else
else if (!String.IsNullOrWhiteSpace(mqi.Message.SendingUserId))
{
QueueItem item = new QueueItem();
item.QueueType = (int)QueueTypes.MessageBroadcast;
item.SourceId = mqi.Message.MessageId.ToString();
item.QueuedOn = DateTime.UtcNow;

await _queueItemsRepository.SaveOrUpdateAsync(item, cancellationToken);
var dm = await _departmentsService.GetDepartmentMemberAsync(mqi.Message.SendingUserId, mqi.DepartmentId);
string departmentNumber = await _departmentSettingsService.GetTextToCallNumberForDepartmentAsync(dm.DepartmentId);
mqi.DepartmentTextNumber = departmentNumber;
}

return true;
return await _outboundQueueProvider.EnqueueMessage(mqi);
}

public async Task<bool> EnqueueCallBroadcastAsync(CallQueueItem cqi, CancellationToken cancellationToken = default(CancellationToken))
Expand Down
Loading
Loading