bobbie/bnhtrade
1
0
Fork 0
mirror of https://github.com/stokebob/bnhtrade.git synced 2026-03-19 06:27:15 +00:00
Code Issues Packages Projects Releases Wiki Activity

wip

Browse Source
This commit is contained in:
Bobbie Hodgetts
2024-11-21 17:16:23 +00:00
parent f9b38a98b1
commit 5446c995d2
5 changed files with 107 additions and 166 deletions
Download Patch File Download Diff File Expand all files Collapse all files

38
src/bnhtrade.Core/Data/Database/Stock/InsertSkuTransactionType.cs
View File

@@ -6,23 +6,19 @@ namespace bnhtrade.Core.Data.Database.Stock
{ {
public class InsertSkuTransactionType : Connection public class InsertSkuTransactionType : Connection
{ {
/// <summary>
/// The insert command will not participate in any amibent transaction scope. Default is true.
/// </summary>
public bool SuppressTransactionScope { get; set; } = true;
/// <summary> /// <summary>
/// Creates a new SKU Transaction Type /// Creates a new SKU Transaction Type
/// </summary> /// </summary>
/// <param name="stockJournalTypeId"></param> /// <param name="stockJournalTypeId"></param>
/// <param name="skuTransactionCode"></param> /// <param name="skuTransactionCode"></param>
/// <param name="transactionScopeSuppress">The insert command will not participate in any amibent transaction scope</param>
/// <returns>ID of the created record</returns> /// <returns>ID of the created record</returns>
/// <exception cref="Exception"></exception> /// <exception cref="Exception"></exception>
public int Create(string skuTransactionCode, int stockJournalTypeId) public int Create(string skuTransactionCode, int stockJournalTypeId, bool transactionScopeSuppress = false)
{ {
int id; int id;
var scopeOption = new TransactionScopeOption(); var scopeOption = new TransactionScopeOption();
if (SuppressTransactionScope) if (transactionScopeSuppress)
{ {
scopeOption = TransactionScopeOption.Suppress; scopeOption = TransactionScopeOption.Suppress;
} }
@@ -32,12 +28,13 @@ namespace bnhtrade.Core.Data.Database.Stock
} }
using (TransactionScope scope = new TransactionScope(scopeOption)) using (TransactionScope scope = new TransactionScope(scopeOption))
using (SqlConnection conn = new SqlConnection(SqlConnectionString))
{ {
conn.Open(); using (SqlConnection conn = new SqlConnection(SqlConnectionString))
{
conn.Open();
// insert new and retrive new value // insert new and retrive new value
using (SqlCommand cmd = new SqlCommand(@" using (SqlCommand cmd = new SqlCommand(@"
INSERT INTO tblStockSkuTransactionType INSERT INTO tblStockSkuTransactionType
( TypeName, StockJournalTypeID, TypeCode ) ( TypeName, StockJournalTypeID, TypeCode )
OUTPUT OUTPUT
@@ -45,19 +42,20 @@ namespace bnhtrade.Core.Data.Database.Stock
VALUES VALUES
( @typeName, @stockJournalTypeId, @typeCode ); ( @typeName, @stockJournalTypeId, @typeCode );
", conn)) ", conn))
{ {
cmd.Parameters.AddWithValue("@typeName", skuTransactionCode); cmd.Parameters.AddWithValue("@typeName", skuTransactionCode);
cmd.Parameters.AddWithValue("@typeCode", skuTransactionCode); cmd.Parameters.AddWithValue("@stockJournalTypeId", stockJournalTypeId);
cmd.Parameters.AddWithValue("@stockJournalTypeId", stockJournalTypeId); cmd.Parameters.AddWithValue("@typeCode", skuTransactionCode);
object obj = cmd.ExecuteScalar(); object obj = cmd.ExecuteScalar();
if (obj == null || obj == DBNull.Value) if (obj == null || obj == DBNull.Value)
throw new Exception("tblStockSkuTransactionType insert operation returned null"); throw new Exception("tblStockSkuTransactionType insert operation returned null");
id = (int)obj; id = (int)obj;
}
scope.Complete();
} }
scope.Complete();
} }
return id; return id;
} }

99
src/bnhtrade.Core/Data/Database/Stock/ReadSkuTransactionType.cs
View File

@@ -4,7 +4,9 @@ using System.Data.SqlClient;
using System.Linq; using System.Linq;
using System.Text; using System.Text;
using System.Threading.Tasks; using System.Threading.Tasks;
using System.Transactions;
using Dapper; using Dapper;
using static System.Formats.Asn1.AsnWriter;
namespace bnhtrade.Core.Data.Database.Stock namespace bnhtrade.Core.Data.Database.Stock
{ {
@@ -14,81 +16,10 @@ namespace bnhtrade.Core.Data.Database.Stock
{ {
} }
/// <summary> private List<Model.Stock.SkuTransactionType> Execute(string sqlWhere, DynamicParameters param, bool transactionScopeSuppress = false)
/// Depriciated, delete when not required by other code
/// </summary>
/// <param name="sqlConnectionString"></param>
/// <param name="typeCode"></param>
/// <returns></returns>
public int GetTypeId(string typeCode)
{ {
/* GetStockTransactionTypeId return meanings var returnList = new List<Model.Stock.SkuTransactionType>();
* >0 use as the TypeId when inserting transaction
* 0 Skip transpose, type doesn't exist or is new (not reviewed yet)
* -1 Type import/transpose is disabled, IsProcessed=TRUE StockTransactionID=NULL */
// old optional parameters
// , bool onNewReturnId = false, bool onNewDisableInsert = false
if (typeCode.Length == 0)
{
throw new Exception("Empty match string passed to method");
}
using (SqlConnection sqlConn = new SqlConnection(SqlConnectionString))
{
sqlConn.Open();
using (SqlCommand cmd = new SqlCommand(@"
SELECT
StockSkuTransactionTypeID,
IsNewReviewRequired,
TransactionImportEnabled
FROM
tblStockSkuTransactionType
WHERE
TypeCode=@typeCode;
", sqlConn))
{
cmd.Parameters.AddWithValue("@typeCode", typeCode);
using (SqlDataReader reader = cmd.ExecuteReader())
{
if (reader.Read())
{
int transactionTypeId = reader.GetInt32(0);
bool isNew = reader.GetBoolean(1);
bool importEnabled = reader.GetBoolean(2);
if (isNew == true)
{
// return 0 and 'skip' item
return 0;
}
else if (importEnabled == false)
{
// mark IsProcessed=true and leave transactionId=null
return -1;
}
else if (transactionTypeId > 0)
{
return transactionTypeId;
}
else
{
throw new Exception("Sku TransactionTypeId lookup method failed, is one of the 'enabled' boolean on table set to null?");
}
}
else
{
return 0;
}
}
}
}
}
private List<Model.Stock.SkuTransactionType> Execute(string sqlWhere, DynamicParameters param)
{
string sql = @" string sql = @"
SELECT tblStockSkuTransactionType.StockSkuTransactionTypeID AS TypeId SELECT tblStockSkuTransactionType.StockSkuTransactionTypeID AS TypeId
,tblStockSkuTransactionType.TypeName ,tblStockSkuTransactionType.TypeName
@@ -117,13 +48,25 @@ namespace bnhtrade.Core.Data.Database.Stock
using (SqlConnection conn = new SqlConnection(SqlConnectionString)) using (SqlConnection conn = new SqlConnection(SqlConnectionString))
{ {
conn.Open(); if (transactionScopeSuppress)
{
return conn.Query<Model.Stock.SkuTransactionType>(sql, param).ToList(); using (TransactionScope scope = new TransactionScope(TransactionScopeOption.Suppress))
{
conn.Open();
returnList = conn.Query<Model.Stock.SkuTransactionType>(sql, param).ToList();
}
}
else
{
conn.Open();
returnList = conn.Query<Model.Stock.SkuTransactionType>(sql, param).ToList();
}
} }
return returnList;
} }
public List<Model.Stock.SkuTransactionType> ByTypeCode(List<string> typeCodeList) public List<Model.Stock.SkuTransactionType> ByTypeCode(List<string> typeCodeList, bool transactionScopeSuppress = false)
{ {
typeCodeList.RemoveAll(string.IsNullOrWhiteSpace); typeCodeList.RemoveAll(string.IsNullOrWhiteSpace);
@@ -138,7 +81,7 @@ namespace bnhtrade.Core.Data.Database.Stock
return Execute(sqlWhere, param); return Execute(sqlWhere, param);
} }
public List<Model.Stock.SkuTransactionType> ByTypeName(List<string> typeName) public List<Model.Stock.SkuTransactionType> ByTypeName(List<string> typeName, bool transactionScopeSuppress = false)
{ {
typeName.RemoveAll(string.IsNullOrWhiteSpace); typeName.RemoveAll(string.IsNullOrWhiteSpace);

3
src/bnhtrade.Core/Logic/Stock/SkuTransactionCrud.cs
View File

@@ -126,9 +126,6 @@ namespace bnhtrade.Core.Logic.Stock
/// <exception cref="Exception"></exception> /// <exception cref="Exception"></exception>
public int Create(Model.Stock.SkuTransactionCreate skuTransaction) public int Create(Model.Stock.SkuTransactionCreate skuTransaction)
{ {
// need to add function to check if transaction type exists, if not, create a new one.
throw new NotImplementedException();
if (skuTransaction == null) if (skuTransaction == null)
{ {
throw new Exception(err + "Object was null"); throw new Exception(err + "Object was null");

119
src/bnhtrade.Core/Logic/Stock/SkuTransactionImport.cs
View File

@@ -66,33 +66,26 @@ namespace bnhtrade.Core.Logic.Stock
} }
/// <summary> /// <summary>
/// Imports/Transaposes all data required for reconcilation, into the sku transaction table. /// Imports/Transaposes all required data into sku transaction table for reconcilation.
/// </summary> /// </summary>
public void ImportAll() public void ImportAll()
{ {
bool inventoryLedgerDetail = false; string methodName = "'Import all' data to 'Stock SKU Transactions'";
bool reimbursement = false;
while (true) log.LogInformation(methodName + " started...");
try
{ {
try ImportAmazonFbaLedgerDetail();
{ ImportAmazonFbaReimbursement();
if (true)
{
if (inventoryLedgerDetail == false) { inventoryLedgerDetail = true; ImportAmazonFbaLedgerDetail(); }
if (reimbursement == false) { reimbursement = true; ImportAmazonFbaReimbursement(); }
}
break;
}
catch (Exception ex)
{
log.LogError(
"Exception caught running Importing amazon reports in the SKU transaction table, see for further details",
ex.ToString()
);
}
} }
catch
{
log.LogError(methodName + " did not complete.");
throw;
}
log.LogInformation(methodName + " complete.");
} }
/// <summary> /// <summary>
@@ -101,6 +94,8 @@ namespace bnhtrade.Core.Logic.Stock
/// <exception cref="NotImplementedException"></exception> /// <exception cref="NotImplementedException"></exception>
public void ImportAmazonFbaReimbursement() public void ImportAmazonFbaReimbursement()
{ {
string methodName = "Import 'Amazon FBA Reimbursement' into 'Stock SKU Transactions'";
//throw new NotImplementedException("Needs testing"); //throw new NotImplementedException("Needs testing");
/* /*
@@ -112,9 +107,9 @@ namespace bnhtrade.Core.Logic.Stock
* and also the 'Cost of goods' amounts moved to the appropreate account id * and also the 'Cost of goods' amounts moved to the appropreate account id
*/ */
log.LogInformation("Starting TransposeFbaRemovalOrderReport()"); log.LogInformation(methodName + " started...");
int transposeCount = 0; int importedCount = 0;
int transposeSkip = 0; int processedCount = 0;
var dbAmznReport = new Data.Database.Import.AmazonFbaReimbursement(); var dbAmznReport = new Data.Database.Import.AmazonFbaReimbursement();
var dbTransType = new Logic.Stock.SkuTransactionTypeCrud(); var dbTransType = new Logic.Stock.SkuTransactionTypeCrud();
@@ -128,6 +123,8 @@ namespace bnhtrade.Core.Logic.Stock
var transTypeCodeList = new List<string>(); var transTypeCodeList = new List<string>();
foreach (var item in importList) foreach (var item in importList)
{ {
processedCount++;
transTypeCodeList.Add(ConstructTransactionTypeCode(item, false)); transTypeCodeList.Add(ConstructTransactionTypeCode(item, false));
// any that reimburse inventory, will have two entries // any that reimburse inventory, will have two entries
if(item.QuantityReimbursedInventory > 0) if(item.QuantityReimbursedInventory > 0)
@@ -170,7 +167,7 @@ namespace bnhtrade.Core.Logic.Stock
// don't go any further until the transaction-type has been reviewed/setup // don't go any further until the transaction-type has been reviewed/setup
if (foundNewType) if (foundNewType)
{ {
log.LogWarning("Cannot complete ImportAmazonFbaReimbursement, new 'Stock Trnasaction Type' found. Review required/"); log.LogWarning(methodName + " unable to complete. New 'Stock Trnasaction Type' found. Review required/");
return; return;
} }
@@ -189,7 +186,7 @@ namespace bnhtrade.Core.Logic.Stock
if (transType.IsNewReviewRequired) if (transType.IsNewReviewRequired)
{ {
throw new Exception("Fail safe: Buggy code, should not get here!"); throw new Exception(methodName + " fail safe: Buggy code, should not get here!");
} }
else if (transType.TransactionImportEnabled) else if (transType.TransactionImportEnabled)
{ {
@@ -214,7 +211,7 @@ namespace bnhtrade.Core.Logic.Stock
if (transType.IsNewReviewRequired) if (transType.IsNewReviewRequired)
{ {
throw new Exception("Fail safe: Buggy code, should not get here!"); throw new Exception(methodName + " fail safe: Buggy code, should not get here!");
} }
else if (transType.TransactionImportEnabled) else if (transType.TransactionImportEnabled)
{ {
@@ -233,20 +230,26 @@ namespace bnhtrade.Core.Logic.Stock
} }
// update the amazon report table // update the amazon report table
dbAmznReport.UpdateIsProcessed(item.FbaReimbursementReportID, true, transId); dbAmznReport.UpdateIsProcessed(item.FbaReimbursementReportID, true, transId);
transposeCount = transposeCount + 1; importedCount++;
} }
// drop out of loop // drop out of loop
scope.Complete(); scope.Complete();
} }
Console.Write("\r"); Console.Write("\r");
log.LogInformation("ProcessFbaReimbursementData() complete, " + transposeCount + " total records transposed, " + transposeSkip + " records skipped.");
log.LogInformation(
methodName + " complete. Records transferred/processed " + importedCount + "/" + processedCount
);
} }
catch (Exception ex) catch (Exception ex)
{ {
log.LogError("Exception catch, aborting ProcessFbaReimbursementData(), see detailed info. " log.LogError(
+ transposeCount + " total records completed, " + transposeSkip + " records skipped.", ex.ToString()); methodName + " aborted due an exception, no records where modified."
} , ex.ToString()
);
throw;
}
} }
/// <summary> /// <summary>
@@ -255,12 +258,11 @@ namespace bnhtrade.Core.Logic.Stock
/// <exception cref="NotImplementedException"></exception> /// <exception cref="NotImplementedException"></exception>
public void ImportAmazonFbaLedgerDetail() public void ImportAmazonFbaLedgerDetail()
{ {
//// Done but needs testing!! string methodName = "Import 'Amazon FBA Ledger Detail' into 'Stock SKU Transactions'";
//throw new NotImplementedException("Done but needs testing!!");
log.LogInformation("Starting TransposeFbaAdustmentReport()"); log.LogInformation(methodName + " started");
int transposeCount = 0; int transferredCount = 0;
int transposeSkip = 0; int processedCount = 0;
using (var scope = new TransactionScope()) using (var scope = new TransactionScope())
{ {
@@ -275,6 +277,8 @@ namespace bnhtrade.Core.Logic.Stock
var transCodeToJournalTypeId = new Dictionary<string, int>(); var transCodeToJournalTypeId = new Dictionary<string, int>();
foreach (var item in reportDict) foreach (var item in reportDict)
{ {
processedCount++;
// test for internal Amazon stuff that we don't care about and mark as processed // test for internal Amazon stuff that we don't care about and mark as processed
if (item.Value.EventType == "WhseTransfers") if (item.Value.EventType == "WhseTransfers")
{ {
@@ -340,21 +344,25 @@ namespace bnhtrade.Core.Logic.Stock
} }
} }
// check for any new types codes, and add them if ther are // check for any new types codes, remove existing from list and add remaing to db
var dbTransType = new Logic.Stock.SkuTransactionTypeCrud(); using (TransactionScope scope2 = new TransactionScope(TransactionScopeOption.Suppress))
var transTypeList = dbTransType.GetByTypeCode(transCodeToJournalTypeId.Keys.ToList());
foreach ( var transType in transTypeList)
{ {
if (transCodeToJournalTypeId.ContainsKey(transType.Key)) var dbTransType = new Logic.Stock.SkuTransactionTypeCrud();
var transTypeList = dbTransType.GetByTypeCode(transCodeToJournalTypeId.Keys.ToList());
foreach (var transType in transTypeList)
{ {
transCodeToJournalTypeId.Remove(transType.Key); if (transCodeToJournalTypeId.ContainsKey(transType.Key))
{
transCodeToJournalTypeId.Remove(transType.Key);
}
} }
}
foreach (var newItem in transCodeToJournalTypeId) foreach (var newItem in transCodeToJournalTypeId)
{ {
dbTransType.Create(newItem.Key, newItem.Value); dbTransType.Create(newItem.Key, newItem.Value);
}
} }
// finally, add the transction list to the table // finally, add the transction list to the table
@@ -363,33 +371,28 @@ namespace bnhtrade.Core.Logic.Stock
{ {
int id = dbTransaction.Create(item); int id = dbTransaction.Create(item);
dbImport.UpdateIsProcessed((int)item.ForeignKey, id); dbImport.UpdateIsProcessed((int)item.ForeignKey, id);
transferredCount++;
} }
scope.Complete(); scope.Complete();
log.LogInformation( log.LogInformation(
"TransposeFbaAdustmentReport() complete, " + transposeCount + " total records transposed, " + transposeSkip + " records skipped." methodName + " complete. Records transferred/processed " + transferredCount + "/" + processedCount
); );
if (transposeSkip > 0)
{
log.LogInformation(
transposeSkip + " number records skipped during TransposeFbaAdustmentReport() operation."
);
}
} }
catch (Exception ex) catch (Exception ex)
{ {
scope.Dispose(); scope.Dispose();
log.LogError( log.LogError(
"Exception catch, aborting TransposeFbaAdustmentReport(), see detailed info. " methodName + " aborted, no records modified. See additional info exception details."
+ transposeCount + " total records completed, " + transposeSkip + " records skipped."
, ex.ToString() , ex.ToString()
); );
throw;
} }
} }
return;
} }
} }
} }

14
src/bnhtrade.Core/Logic/Stock/SkuTransactionTypeCrud.cs
View File

@@ -25,15 +25,15 @@ namespace bnhtrade.Core.Logic.Stock
/// <param name="stockJournalTypeId"></param> /// <param name="stockJournalTypeId"></param>
/// <returns>Id for new record entry</returns> /// <returns>Id for new record entry</returns>
/// <exception cref="InvalidOperationException">Transaction type code already exists</exception> /// <exception cref="InvalidOperationException">Transaction type code already exists</exception>
public int Create(string skuTransactionTypeCode, int stockJournalTypeId) public int Create(string skuTransactionTypeCode, int stockJournalTypeId, bool transactionScopeSuppress = false)
{ {
//check to see if type already exists //check to see if type already exists
var result = dbRead.ByTypeCode(new List<string> { skuTransactionTypeCode }); var result = dbRead.ByTypeCode(new List<string> { skuTransactionTypeCode }, transactionScopeSuppress);
if (result.Any()) if (result.Any())
throw new InvalidOperationException("Create SKU Transaction Type failed, typecode already exists failed"); throw new InvalidOperationException("Create SKU Transaction Type failed, typecode already exists failed");
// okay to proceed // okay to proceed
int id = new Data.Database.Stock.InsertSkuTransactionType().Create(skuTransactionTypeCode, stockJournalTypeId); int id = new Data.Database.Stock.InsertSkuTransactionType().Create(skuTransactionTypeCode, stockJournalTypeId, transactionScopeSuppress);
return id; return id;
} }
@@ -42,14 +42,14 @@ namespace bnhtrade.Core.Logic.Stock
/// </summary> /// </summary>
/// <param name="typeCode"></param> /// <param name="typeCode"></param>
/// <returns>The object, or null</returns> /// <returns>The object, or null</returns>
public Model.Stock.SkuTransactionType GetByTypeCode(string typeCode) public Model.Stock.SkuTransactionType GetByTypeCode(string typeCode, bool transactionScopeSuppress = false)
{ {
if (string.IsNullOrWhiteSpace(typeCode)) if (string.IsNullOrWhiteSpace(typeCode))
{ {
return null; return null;
} }
var result = dbRead.ByTypeCode(new List<string> { typeCode }); var result = dbRead.ByTypeCode(new List<string> { typeCode }, transactionScopeSuppress);
if (result.Any()) if (result.Any())
{ {
@@ -66,7 +66,7 @@ namespace bnhtrade.Core.Logic.Stock
/// </summary> /// </summary>
/// <param name="typeCodeList">list of transaction type codes</param> /// <param name="typeCodeList">list of transaction type codes</param>
/// <returns>DIctionary key=transactionTypeCode, value=transactionType object</returns> /// <returns>DIctionary key=transactionTypeCode, value=transactionType object</returns>
public Dictionary<string, Model.Stock.SkuTransactionType> GetByTypeCode(List<string> typeCodeList) public Dictionary<string, Model.Stock.SkuTransactionType> GetByTypeCode(List<string> typeCodeList, bool transactionScopeSuppress = false)
{ {
var returnDict = new Dictionary<string, Model.Stock.SkuTransactionType>(); var returnDict = new Dictionary<string, Model.Stock.SkuTransactionType>();
if (!typeCodeList.Any()) if (!typeCodeList.Any())
@@ -74,7 +74,7 @@ namespace bnhtrade.Core.Logic.Stock
return returnDict; return returnDict;
} }
var dbResult = dbRead.ByTypeCode(typeCodeList); var dbResult = dbRead.ByTypeCode(typeCodeList, transactionScopeSuppress);
foreach(var item in dbResult) foreach(var item in dbResult)
{ {