RG-T125 PR#423 fixes

Author: ucswift

Core/Resgrid.Services/DepartmentsService.cs

@@ -459,10 +459,13 @@ public async Task<Department> GetActiveSmsDepartmentForUserAsync(string userId,
 			// of the user's departments that does, so a user whose active department is on the free plan still
 			// lands in an SMS-capable department. If none support SMS, fall back to the preferred one so the
 			// caller's plan gate returns the proper "plan doesn't support" message.
-			foreach (var membership in ordered)
+			var canProvisionNumber = await Task.WhenAll(ordered.Select(membership =>
+				_limitsService.CanDepartmentProvisionNumberAsync(membership.DepartmentId)));
+
+			for (var i = 0; i < ordered.Count; i++)
 			{
-				if (await _limitsService.CanDepartmentProvisionNumberAsync(membership.DepartmentId))
-					return await GetDepartmentByIdAsync(membership.DepartmentId, bypassCache);
+				if (canProvisionNumber[i])
+					return await GetDepartmentByIdAsync(ordered[i].DepartmentId, bypassCache);
 			}
 
 			return await GetDepartmentByIdAsync(preferred.DepartmentId, bypassCache);

Core/Resgrid.Services/SubscriptionsService.cs

@@ -608,7 +608,7 @@ public bool IsPlanRestrictedOrFree(int planId)
 			// move to Entity-based plans, SMS was removed from the free tiers, so "supports SMS/paid features"
 			// is simply "not one of these". Mirrors the authoritative set in the CommonApis billing service.
 			// 1 = Free, 6 = Beta (2yr), 7 = Open Preview, 8 = Unlimited Free.
-			return planId == FreePlanId || planId == 6 || planId == 7 || planId == 8;
+			return planId == FreePlanId || planId == (int)Plans.Beta2YrPlanId || planId == (int)Plans.OpenPreviewPlanId || planId == (int)Plans.UnlimitedFreePlanId;
 		}
 
 		/// <summary>