Skip to content

Compare PT refund CaseData fields by value and fix mislabeled error #668

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
StefanKert wants to merge 1 commit into
base: main
Choose a base branch
from
Open

Compare PT refund CaseData fields by value and fix mislabeled error #668

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
28 changes: 24 additions & 4 deletions queue/src/fiskaltrust.Middleware.Localization.QueuePT/Logic/RefundValidator.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -113,7 +113,7 @@ string Mismatch(string field) => isPartial
return (flowControl: false, value: Mismatch("ReceiptCase"));
}

if (originalItem.ftReceiptCaseData != refundItem.ftReceiptCaseData)
if (!CaseDataEquals(originalItem.ftReceiptCaseData, refundItem.ftReceiptCaseData))
{
return (flowControl: false, value: Mismatch("ReceiptCaseData"));
}
Expand Down Expand Up @@ -229,9 +229,9 @@ string Mismatch(string field) => isPartial
return (flowControl: false, value: Mismatch("ReceiptCase"));
}

if (originalItem.ftChargeItemCaseData != refundItem.ftChargeItemCaseData)
if (!CaseDataEquals(originalItem.ftChargeItemCaseData, refundItem.ftChargeItemCaseData))
{
return (flowControl: false, value: Mismatch("cbCustomer"));
return (flowControl: false, value: Mismatch("ftChargeItemCaseData"));
}

if (Math.Abs(Math.Abs(originalItem.GetVATAmount()) - Math.Abs(refundItem.GetVATAmount())) > 0.001m)
Expand Down Expand Up @@ -335,7 +335,7 @@ string Mismatch(string field) => isPartial
return (flowControl: false, value: Mismatch("ftPayItemCase"));
}

if (originalItem.ftPayItemCaseData != refundItem.ftPayItemCaseData)
if (!CaseDataEquals(originalItem.ftPayItemCaseData, refundItem.ftPayItemCaseData))
{
return (flowControl: false, value: Mismatch("ftPayItemCaseData"));
}
Expand Down Expand Up @@ -488,6 +488,26 @@ string Mismatch(string field) => isPartial
return null; // Validation passed
}

private static bool CaseDataEquals(object? original, object? refundValue)
{
var originalIsEmpty = original is null || (original is string s1 && s1.Length == 0);
var refundIsEmpty = refundValue is null || (refundValue is string s2 && s2.Length == 0);
Comment thread
StefanKert marked this conversation as resolved.
if (originalIsEmpty && refundIsEmpty)
{
return true;
}

if (originalIsEmpty || refundIsEmpty)
{
return false;
}

// ftReceiptCaseData/ftChargeItemCaseData/ftPayItemCaseData are typed as object,
// so after JSON deserialization both sides are typically distinct JsonElement
// instances. Compare by serialized value rather than by reference.
return JsonSerializer.Serialize(original) == JsonSerializer.Serialize(refundValue);
}

private static bool AreOppositeWithTolerance(decimal original, decimal refundValue, decimal tolerance)
{
if (Math.Abs(original) <= tolerance)
Expand Down
Loading