Skip to content

CU-868dmcr4g Removing old messaging plan check code. #214

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 27, 2025
Merged

CU-868dmcr4g Removing old messaging plan check code. #214

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
3 changes: 2 additions & 1 deletion Core/Resgrid.Services/CommunicationService.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -526,7 +526,8 @@ private async Task<bool> CanSendToUser(string userId, int departmentId)
var supressStaffingInfo = await _departmentSettingsService.GetDepartmentStaffingSuppressInfoAsync(departmentId);
var lastUserStaffing = await _userStateService.GetLastUserStateByUserIdAsync(userId);

if (lastUserStaffing == null && supressStaffingInfo != null)
// Looks like this was a bug, lastUserStaffing was going through here == null. -SJ
if (lastUserStaffing != null && supressStaffingInfo != null)
{
if (supressStaffingInfo.EnableSupressStaffing)
{
Expand Down
8 changes: 4 additions & 4 deletions Core/Resgrid.Services/QueueService.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -119,8 +119,8 @@ public async Task<List<QueueItem>> GetAllPendingDeleteDepartmentQueueItemsAsync(
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;
//string departmentNumber = await _departmentSettingsService.GetTextToCallNumberForDepartmentAsync(dm.DepartmentId);
//mqi.DepartmentTextNumber = departmentNumber;

if (mqi.Message.ReceivingUser == null)
{
Expand All @@ -133,8 +133,8 @@ public async Task<List<QueueItem>> GetAllPendingDeleteDepartmentQueueItemsAsync(
else if (!String.IsNullOrWhiteSpace(mqi.Message.SendingUserId))
{
var dm = await _departmentsService.GetDepartmentMemberAsync(mqi.Message.SendingUserId, mqi.DepartmentId);
string departmentNumber = await _departmentSettingsService.GetTextToCallNumberForDepartmentAsync(dm.DepartmentId);
mqi.DepartmentTextNumber = departmentNumber;
//string departmentNumber = await _departmentSettingsService.GetTextToCallNumberForDepartmentAsync(dm.DepartmentId);
//mqi.DepartmentTextNumber = departmentNumber;
}

return await _outboundQueueProvider.EnqueueMessage(mqi);
Expand Down
29 changes: 4 additions & 25 deletions Core/Resgrid.Services/SubscriptionsService.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -388,31 +388,10 @@ public bool CanPlanSendMessageSms(int planId)
{
if (!String.IsNullOrWhiteSpace(Config.SystemBehaviorConfig.BillingApiBaseUrl) && !String.IsNullOrWhiteSpace(Config.ApiConfig.BackendInternalApikey))
{
if (planId == 4 // Professional
|| planId == 5 // Ultimate
|| planId == 9 // Unlimited
|| planId == 10 // Enterprise
|| planId == 14 // Professional Monthly
|| planId == 15 // Ultimate Monthly
|| planId == 16 // Enterprise Monthly
|| planId == 17 // Enterprise+
|| planId == 18 // Enterprise+ Monthly
|| planId == 20 // Univeral
|| planId == 21 // Univeral Monthly
|| planId == 26 // Professional
|| planId == 27 // Professional Monthly
|| planId == 28 // Ultimate
|| planId == 29 // Ultimate Monthly
|| planId == 30 // Enterprise
|| planId == 31 // Enterprise Monthly
|| planId == 32 // Enterprise+
|| planId == 32 // Enterprise+ Monthly
|| planId == 34 // Unified
|| planId == 35 // Unified Monthly
)
return true;

return false;
if (planId == 1)
return false;

return true;
}

return true;
Expand Down
25 changes: 5 additions & 20 deletions Providers/Resgrid.Providers.Bus/OutboundQueueProvider.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,42 +18,27 @@ public OutboundQueueProvider()

public async Task<bool> EnqueueCall(CallQueueItem callQueue)
{
if (SystemBehaviorConfig.ServiceBusType == ServiceBusTypes.Rabbit)
return await _rabbitOutboundQueueProvider.EnqueueCall(callQueue);

return false;
return await _rabbitOutboundQueueProvider.EnqueueCall(callQueue);
}

public async Task<bool> EnqueueMessage(MessageQueueItem messageQueue)
{
if (SystemBehaviorConfig.ServiceBusType == ServiceBusTypes.Rabbit)
return await _rabbitOutboundQueueProvider.EnqueueMessage(messageQueue);

return false;
return await _rabbitOutboundQueueProvider.EnqueueMessage(messageQueue);
}

public async Task<bool> EnqueueDistributionList(DistributionListQueueItem distributionListQueue)
{
if (SystemBehaviorConfig.ServiceBusType == ServiceBusTypes.Rabbit)
return await _rabbitOutboundQueueProvider.EnqueueDistributionList(distributionListQueue);

return false;
return await _rabbitOutboundQueueProvider.EnqueueDistributionList(distributionListQueue);
}

public async Task<bool> EnqueueNotification(NotificationItem notificationQueue)
{
if (SystemBehaviorConfig.ServiceBusType == ServiceBusTypes.Rabbit)
return await _rabbitOutboundQueueProvider.EnqueueNotification(notificationQueue);

return false;
return await _rabbitOutboundQueueProvider.EnqueueNotification(notificationQueue);
}

public async Task<bool> EnqueueShiftNotification(ShiftQueueItem shiftQueueItem)
{
if (SystemBehaviorConfig.ServiceBusType == ServiceBusTypes.Rabbit)
return await _rabbitOutboundQueueProvider.EnqueueShiftNotification(shiftQueueItem);

return false;
return await _rabbitOutboundQueueProvider.EnqueueShiftNotification(shiftQueueItem);
}

public async Task<bool> EnqueueAuditEvent(AuditEvent auditEvent)
Expand Down
Loading