More work in support of #474.

AccelerateNetworks · Nov 8, 2024 · 50c737f · 50c737f
1 parent 19acb5b
commit 50c737f
Show file tree

Hide file tree

Showing 6 changed files with 24 additions and 17 deletions.
diff --git a/NumberSearch.Ingest/Orders.cs b/NumberSearch.Ingest/Orders.cs
@@ -114,8 +114,8 @@ public static async Task<bool> DailyBriefingEmailAsync(Owned.SMSRouteChange[] sm
             var failedMessages = Array.Empty<MessageRecord>();
 
             var token = await GetTokenAsync(appConfig);
-            failedMessages = await $"{appConfig.MessagingURL}message/all/failed?start={DateTime.Now.AddDays(-3).ToShortDateString()}&end={DateTime.Now.AddDays(1).ToShortDateString()}".WithOAuthBearerToken(token.AccessToken).GetJsonAsync<MessageRecord[]>();
-
+            var messages = await $"{appConfig.MessagingURL}message/all/failed?start={DateTime.Now.AddDays(-3).ToShortDateString()}&end={DateTime.Now.AddDays(1).ToShortDateString()}".WithOAuthBearerToken(token.AccessToken).GetJsonAsync<MessageRecord[]>();
+            failedMessages = messages.Where(x => x.MessageSource is MessageSource.Outgoing).ToArray();
             foreach (var order in orders)
             {
                 // Orders that should be marked as complete because the install data has passed?

diff --git a/NumberSearch.Ingest/Provider.cs b/NumberSearch.Ingest/Provider.cs
@@ -1,5 +1,4 @@
-using FirstCom;
-using FirstCom.Models;
+using FirstCom.Models;
 
 using NumberSearch.DataAccess;
 using NumberSearch.DataAccess.BulkVS;
@@ -9,7 +8,6 @@
 
 using System;
 using System.Collections.Generic;
-using System.Globalization;
 using System.Linq;
 using System.Threading.Tasks;
 

diff --git a/NumberSearch.Mvc/Controllers/CartController.cs b/NumberSearch.Mvc/Controllers/CartController.cs
@@ -79,6 +79,7 @@ public async Task<IActionResult> IndexAsync(bool? emptyCart, string product, int
             var cordless = cart.Products.Where(x => x.Name.Contains("DP")).ToArray();
             int handsets = 0;
             int basestations = 0;
+
             foreach (var item in cordless)
             {
                 var productOrder = cart?.ProductOrders?.FirstOrDefault(x => x.ProductId == item.ProductId);

diff --git a/NumberSearch.Mvc/Controllers/SearchController.cs b/NumberSearch.Mvc/Controllers/SearchController.cs
@@ -77,9 +77,9 @@ public async Task<IActionResult> SearchAsync(string query, string city, string f
             }
 
             // If there's a city provided we need to use a more specific results count query.
-            var count = (string.IsNullOrWhiteSpace(city))
-                ? await PhoneNumber.NumberOfResultsInQuery(cleanedQuery, _postgresql).ConfigureAwait(false)
-                : await PhoneNumber.NumberOfResultsInQueryWithCity(cleanedQuery, city, _postgresql).ConfigureAwait(false);
+            int count = string.IsNullOrWhiteSpace(city)
+                ? await PhoneNumber.NumberOfResultsInQuery(cleanedQuery, _postgresql)
+                : await PhoneNumber.NumberOfResultsInQueryWithCity(cleanedQuery, city, _postgresql);
 
             // Handle out of range page values.
             page = page < 1 ? 1 : page;
@@ -90,30 +90,30 @@ public async Task<IActionResult> SearchAsync(string query, string city, string f
             // Select a view for the data.
             if (!string.IsNullOrWhiteSpace(view) && view == "Recommended")
             {
-                results = await PhoneNumber.RecommendedPaginatedSearchAsync(cleanedQuery, page, _postgresql).ConfigureAwait(false);
+                results = await PhoneNumber.RecommendedPaginatedSearchAsync(cleanedQuery, page, _postgresql);
             }
             else if (!string.IsNullOrWhiteSpace(view) && view == "Sequential")
             {
-                results = await PhoneNumber.SequentialPaginatedSearchAsync(cleanedQuery, page, _postgresql).ConfigureAwait(false);
+                results = await PhoneNumber.SequentialPaginatedSearchAsync(cleanedQuery, page, _postgresql);
             }
             else if (!string.IsNullOrWhiteSpace(view) && view == "Location")
             {
                 // If a city is provided then we need to filter our results down to just that city.
                 if (!string.IsNullOrWhiteSpace(city))
                 {
-                    results = await PhoneNumber.LocationByCityPaginatedSearchAsync(cleanedQuery, city, page, _postgresql).ConfigureAwait(false);
+                    results = await PhoneNumber.LocationByCityPaginatedSearchAsync(cleanedQuery, city, page, _postgresql);
                 }
                 else
                 {
-                    results = await PhoneNumber.LocationPaginatedSearchAsync(cleanedQuery, page, _postgresql).ConfigureAwait(false);
+                    results = await PhoneNumber.LocationPaginatedSearchAsync(cleanedQuery, page, _postgresql);
                 }
             }
             else
             {
-                results = await PhoneNumber.RecommendedPaginatedSearchAsync(cleanedQuery, page, _postgresql).ConfigureAwait(false);
+                results = await PhoneNumber.RecommendedPaginatedSearchAsync(cleanedQuery, page, _postgresql);
             }
 
-            var cart = Cart.GetFromSession(HttpContext.Session);
+            Cart cart = Cart.GetFromSession(HttpContext.Session);
 
             // The query is a complete phone number and we have no results, perhaps they mean to port it?
             if (cleanedQuery.Length == 10 && !cleanedQuery.Contains('*') && !results.Any())

diff --git a/NumberSearch.Ops/Models/Cart.cs b/NumberSearch.Ops/Models/Cart.cs
@@ -1,8 +1,10 @@
 
 using AccelerateNetworks.Operations;
 
+using System;
 using System.Collections.Generic;
 using System.Linq;
+using System.Runtime.InteropServices;
 
 namespace NumberSearch.Ops.Models
 {
@@ -445,7 +447,9 @@ public Dictionary<string, ProductOrder> ProductOrdersToDictionary()
             {
                 var dict = new Dictionary<string, ProductOrder>();
 
-                foreach (var item in ProductOrders)
+                ReadOnlySpan<ProductOrder> span = CollectionsMarshal.AsSpan(ProductOrders);
+
+                foreach (var item in span)
                 {
                     var foreignId = string.Empty;
 

diff --git a/NumberSearch.Tests/Ingest.cs b/NumberSearch.Tests/Ingest.cs
@@ -79,7 +79,10 @@ public FunctionalIngest(ITestOutputHelper output)
                 EmailTom = string.IsNullOrWhiteSpace(config.GetConnectionString("EmailTom")) ? throw new Exception("EmailTom config key is blank.") : config.GetConnectionString("EmailTom").AsMemory(),
                 FusionPBXUsername = string.IsNullOrWhiteSpace(config.GetConnectionString("FusionPBXUsername")) ? throw new Exception("FusionPBXUsername config key is blank.") : config.GetConnectionString("FusionPBXUsername").AsMemory(),
                 FusionPBXPassword = string.IsNullOrWhiteSpace(config.GetConnectionString("FusionPBXPassword")) ? throw new Exception("FusionPBXPassword config key is blank.") : config.GetConnectionString("FusionPBXPassword").AsMemory(),
-                InvoiceNinjaToken = string.IsNullOrWhiteSpace(config.GetConnectionString("EmailTom")) ? throw new Exception("InvoiceNinjaToken config key is blank.") : config.GetConnectionString("InvoiceNinjaToken").AsMemory(),
+                InvoiceNinjaToken = string.IsNullOrWhiteSpace(config.GetConnectionString("InvoiceNinjaToken")) ? throw new Exception("InvoiceNinjaToken config key is blank.") : config.GetConnectionString("InvoiceNinjaToken").AsMemory(),
+                MessagingUsername = string.IsNullOrWhiteSpace(config.GetConnectionString("MessagingUsername")) ? throw new Exception("MessagingUsername config key is blank.") : config.GetConnectionString("MessagingUsername").AsMemory(),
+                MessagingPassword = string.IsNullOrWhiteSpace(config.GetConnectionString("MessagingPassword")) ? throw new Exception("MessagingPassword config key is blank.") : config.GetConnectionString("MessagingPassword").AsMemory(),
+                MessagingURL = string.IsNullOrWhiteSpace(config.GetConnectionString("MessagingURL")) ? throw new Exception("MessagingURL config key is blank.") : config.GetConnectionString("MessagingURL").AsMemory()
             };
             ingestConfiguration = appConfig;
         }
@@ -128,7 +131,8 @@ public FunctionalIngest(ITestOutputHelper output)
         //[Fact]
         //public async Task DailyBreifingEmailToDan()
         //{
-        //    var checkRun = await Orders.DailyBriefingEmailAsync(ingestConfiguration);
+        //    var emptyChanges = Array.Empty<Owned.SMSRouteChange>();
+        //    var checkRun = await Orders.DailyBriefingEmailAsync(emptyChanges, ingestConfiguration);
         //}
 
         //[Fact]