From f9b38a98b1913030e0d514056ebccc40bebb762c Mon Sep 17 00:00:00 2001 From: Bobbie Hodgetts Date: Thu, 21 Nov 2024 09:36:16 +0000 Subject: [PATCH] wip --- .../Database/Import/AmazonFbaReimbursement.cs | 4 ++-- .../Logic/Import/AmazonFbaCustomerReturn.cs | 2 +- .../Logic/Stock/SkuTransactionImport.cs | 14 +++++++------- src/bnhtrade.Core/Logic/Validate/Format.cs | 17 +++++++++++++---- .../Model/Stock/SkuTransactionCreate.cs | 4 ++-- src/bnhtrade.ScheduledTasks/Program.cs | 8 ++++---- 6 files changed, 29 insertions(+), 20 deletions(-) diff --git a/src/bnhtrade.Core/Data/Database/Import/AmazonFbaReimbursement.cs b/src/bnhtrade.Core/Data/Database/Import/AmazonFbaReimbursement.cs index acb78ce..77f2c54 100644 --- a/src/bnhtrade.Core/Data/Database/Import/AmazonFbaReimbursement.cs +++ b/src/bnhtrade.Core/Data/Database/Import/AmazonFbaReimbursement.cs @@ -354,8 +354,8 @@ namespace bnhtrade.Core.Data.Database.Import item.Asin = reader.GetString(8); item.Condition = reader.GetString(9); item.CurrencyUnit = reader.GetString(10); - item.AmountPerUnit = reader.GetInt32(11); - item.AmountTotal = reader.GetInt32(12); + item.AmountPerUnit = reader.GetDecimal(11); + item.AmountTotal = reader.GetDecimal(12); item.QuantityReimbursedCash = reader.GetInt32(13); item.QuantityReimbursedInventory = reader.GetInt32(14); item.QuantityReimbursedTotal = reader.GetInt32(15); diff --git a/src/bnhtrade.Core/Logic/Import/AmazonFbaCustomerReturn.cs b/src/bnhtrade.Core/Logic/Import/AmazonFbaCustomerReturn.cs index 206fd87..193db10 100644 --- a/src/bnhtrade.Core/Logic/Import/AmazonFbaCustomerReturn.cs +++ b/src/bnhtrade.Core/Logic/Import/AmazonFbaCustomerReturn.cs @@ -45,7 +45,7 @@ namespace bnhtrade.Core.Logic.Import dateLog.SetDateTimeUtc(reportName, utcEndDate); scope.Complete(); } - log.LogInformation("Amazon report '" + reportName + "' sync with database comlpete."); + log.LogInformation("Amazon report '" + reportName + "' sync with database complete."); } } } diff --git a/src/bnhtrade.Core/Logic/Stock/SkuTransactionImport.cs b/src/bnhtrade.Core/Logic/Stock/SkuTransactionImport.cs index 27618d6..e41af10 100644 --- a/src/bnhtrade.Core/Logic/Stock/SkuTransactionImport.cs +++ b/src/bnhtrade.Core/Logic/Stock/SkuTransactionImport.cs @@ -39,10 +39,10 @@ namespace bnhtrade.Core.Logic.Stock private string ConstructTransactionTypeCode(Model.Import.AmazonFbaInventoryLedgerDetail record) { - if (string.IsNullOrEmpty(record.Reason)) - { - return null; - } + //if (string.IsNullOrEmpty(record.Reason)) + //{ + // return null; + //} string transactionCode = "<" + record.EventType + ">"; @@ -101,7 +101,7 @@ namespace bnhtrade.Core.Logic.Stock /// public void ImportAmazonFbaReimbursement() { - throw new NotImplementedException("Needs testing"); + //throw new NotImplementedException("Needs testing"); /* * Not to be used for stock reconciliation! A single stock item can have multiple reimburesements aginst it. @@ -255,8 +255,8 @@ namespace bnhtrade.Core.Logic.Stock /// public void ImportAmazonFbaLedgerDetail() { - // Done but needs testing!! - throw new NotImplementedException("Done but needs testing!!"); + //// Done but needs testing!! + //throw new NotImplementedException("Done but needs testing!!"); log.LogInformation("Starting TransposeFbaAdustmentReport()"); int transposeCount = 0; diff --git a/src/bnhtrade.Core/Logic/Validate/Format.cs b/src/bnhtrade.Core/Logic/Validate/Format.cs index 08c35cf..989b485 100644 --- a/src/bnhtrade.Core/Logic/Validate/Format.cs +++ b/src/bnhtrade.Core/Logic/Validate/Format.cs @@ -15,7 +15,10 @@ namespace bnhtrade.Core.Logic.Validate /// public static bool SkuNumber(string skuNumber) { - if (string.IsNullOrEmpty(skuNumber)) { return false;} + if (string.IsNullOrEmpty(skuNumber)) + { + return false; + } int count = 0; foreach (char c in skuNumber) @@ -50,11 +53,17 @@ namespace bnhtrade.Core.Logic.Validate public static bool DateTime(DateTime dateTime) { if (dateTime == default(DateTime)) - { return false; } + { + return false; + } else if (dateTime.Kind != DateTimeKind.Utc) - { return false; } + { + return false; + } else - { return true; } + { + return true; + } } } } diff --git a/src/bnhtrade.Core/Model/Stock/SkuTransactionCreate.cs b/src/bnhtrade.Core/Model/Stock/SkuTransactionCreate.cs index f959e12..03c00e1 100644 --- a/src/bnhtrade.Core/Model/Stock/SkuTransactionCreate.cs +++ b/src/bnhtrade.Core/Model/Stock/SkuTransactionCreate.cs @@ -54,7 +54,7 @@ namespace bnhtrade.Core.Model.Stock { var result = new List(); - if (Logic.Validate.Format.DateTime(TransactionDate)) + if (Logic.Validate.Format.DateTime(TransactionDate) == false) { result.Add(new ValidationResult("Invalid transaction date")); } @@ -62,7 +62,7 @@ namespace bnhtrade.Core.Model.Stock { result.Add(new ValidationResult("Invalid transaction type code")); } - if (Logic.Validate.Format.SkuNumber(SkuNumber)) + if (Logic.Validate.Format.SkuNumber(SkuNumber) == false) { result.Add(new ValidationResult("Invalid SKU number")); } diff --git a/src/bnhtrade.ScheduledTasks/Program.cs b/src/bnhtrade.ScheduledTasks/Program.cs index 3e4af66..e438418 100644 --- a/src/bnhtrade.ScheduledTasks/Program.cs +++ b/src/bnhtrade.ScheduledTasks/Program.cs @@ -50,12 +50,12 @@ namespace bnhtradeScheduledTasks Console.WriteLine("<1> Start nightly tasks"); Console.WriteLine(); Console.WriteLine("<2> Update FBA Inventory Data"); - Console.WriteLine("<3> Update FBA Inventory Age Data"); + Console.WriteLine("<3> Update FBA Inventory Ledger Data (new)"); Console.WriteLine("<4> Update Amazon Settlement Data"); - Console.WriteLine("<5> Update Fba Inventory Receipt Data"); + Console.WriteLine("<5> (depreciated) Update Fba Inventory Receipt Data"); Console.WriteLine("<6> Update Fba Sale Shipment Data"); Console.WriteLine("<7> Update Fba Return Data"); - Console.WriteLine("<8> Update Fba Adustment Data"); + Console.WriteLine("<8> (depreciated) Update Fba Adustment Data"); Console.WriteLine("<9> Update Fba Removal Order Data"); Console.WriteLine(); Console.WriteLine("<0> Back"); @@ -84,7 +84,7 @@ namespace bnhtradeScheduledTasks else if (input == "3") { Console.Clear(); - new bnhtrade.Core.Logic.Import.AmazonFbaInventoryAge().SyncDatabaseWithAmazon(); + new bnhtrade.Core.Logic.Import.AmazonFbaInventoryLedgerDetail().SyncDatabaseWithAmazon(); Console.WriteLine("Complete, press any key to continue..."); Console.ReadKey(); }