From 0ce0dc35e18e4df4061b6f22ab799bee564d8fb4 Mon Sep 17 00:00:00 2001 From: Tom Raterman Date: Tue, 3 Jun 2025 09:39:46 -0400 Subject: [PATCH] Updated timestamp string format --- PartSource.Api/Controllers/InventoryController.cs | 7 +++---- PartSource.Api/appsettings.json | 1 - PartSource.Automation/Jobs/BulkUpdateInventory.cs | 6 ++++-- PartSource.Automation/Jobs/PartialInventoryUpdate.cs | 6 ++++-- PartSource.Data/Models/PartAvailability.cs | 2 +- 5 files changed, 12 insertions(+), 10 deletions(-) diff --git a/PartSource.Api/Controllers/InventoryController.cs b/PartSource.Api/Controllers/InventoryController.cs index ab01a7e..912b16c 100644 --- a/PartSource.Api/Controllers/InventoryController.cs +++ b/PartSource.Api/Controllers/InventoryController.cs @@ -1,8 +1,7 @@ -using Microsoft.AspNetCore.Mvc; +using System.Threading.Tasks; +using Microsoft.AspNetCore.Mvc; using PartSource.Data.Models; using PartSource.Services; -using System.Net; -using System.Threading.Tasks; namespace PartSource.Api.Controllers { @@ -37,7 +36,7 @@ namespace PartSource.Api.Controllers StoreNumber = inventory.Store, Sku = sku, Quantity = inventory.QTY, - Updated = inventory.Updated ?? System.DateTime.MinValue + Updated = inventory.Updated } }); } diff --git a/PartSource.Api/appsettings.json b/PartSource.Api/appsettings.json index 7059cbb..fe5b261 100644 --- a/PartSource.Api/appsettings.json +++ b/PartSource.Api/appsettings.json @@ -1,7 +1,6 @@ { "ConnectionStrings": { "PartSourceDatabase": "Server=tcp:ps-whi.database.windows.net,1433;Initial Catalog=ps-whi-stage;Persist Security Info=False;User ID=ps-whi;Password=9-^*N5dw!6:|.5Q;MultipleActiveResultSets=False;Encrypt=True;TrustServerCertificate=False;Connection Timeout=30;", - "FitmentDatabase": "Server=tcp:ps-automation.eastus2.cloudapp.azure.com,1433;Initial Catalog=WhiFitment;User ID=automation;Password=)6L)XP%m(x-UU#M;Encrypt=True;TrustServerCertificate=True;Connection Timeout=300" //"FitmentDatabase": "Data Source=localhost;Initial Catalog=WhiFitment;Integrated Security=true" "FitmentDatabase": "Server=tcp:ps-automation.eastus2.cloudapp.azure.com,1433;Initial Catalog=WhiFitment;User ID=sa;Password=GZ0`-ekd~[2u;Encrypt=True;TrustServerCertificate=True;Connection Timeout=300" }, diff --git a/PartSource.Automation/Jobs/BulkUpdateInventory.cs b/PartSource.Automation/Jobs/BulkUpdateInventory.cs index 29fd40d..bc11a3d 100644 --- a/PartSource.Automation/Jobs/BulkUpdateInventory.cs +++ b/PartSource.Automation/Jobs/BulkUpdateInventory.cs @@ -74,7 +74,7 @@ namespace PartSource.Automation.Jobs dataTable.Columns.Add("Store", typeof(int)); dataTable.Columns.Add("SKU", typeof(string)); dataTable.Columns.Add("QTY", typeof(int)); - dataTable.Columns.Add("Updated", typeof(DateTime)); + dataTable.Columns.Add("Updated", typeof(string)); using StreamReader reader = new StreamReader(filename); string line = reader.ReadLine(); // Burn the header row @@ -90,10 +90,12 @@ namespace PartSource.Automation.Jobs } string sku = columns[1].Trim(); + string updated = columns[3].Trim(); + if (int.TryParse(columns[0], out int store) && !string.IsNullOrEmpty(sku) && int.TryParse(columns[2], out int quantity) - && DateTime.TryParse(columns[3], out DateTime updated)) + && string.IsNullOrEmpty(updated)) { dataTable.Rows.Add(new object[] { store, sku, quantity, updated }); } diff --git a/PartSource.Automation/Jobs/PartialInventoryUpdate.cs b/PartSource.Automation/Jobs/PartialInventoryUpdate.cs index 92e74f0..896e97e 100644 --- a/PartSource.Automation/Jobs/PartialInventoryUpdate.cs +++ b/PartSource.Automation/Jobs/PartialInventoryUpdate.cs @@ -69,11 +69,13 @@ namespace PartSource.Automation.Jobs { columns[j] = columns[j].Replace("\"", string.Empty); } + string sku = columns[1].Trim(); + string updated = columns[3].Trim(); if (int.TryParse(columns[0], out int store) - && int.TryParse(columns[1], out int sku) + && !string.IsNullOrEmpty(sku) && int.TryParse(columns[2], out int quantity) - && DateTime.TryParse(columns[3], out DateTime updated)) + && string.IsNullOrEmpty(updated)) { command += $"UPDATE PartAvailability SET QTY = @qty_{i}, Updated = @updated_{i} WHERE SKU = @sku_{i} AND Store = @store_{i};"; diff --git a/PartSource.Data/Models/PartAvailability.cs b/PartSource.Data/Models/PartAvailability.cs index 3435ebb..af90687 100644 --- a/PartSource.Data/Models/PartAvailability.cs +++ b/PartSource.Data/Models/PartAvailability.cs @@ -16,6 +16,6 @@ namespace PartSource.Data.Models public int? QTY { get; set; } - public DateTime? Updated { get; set; } + public string Updated { get; set; } } }