Skip to content

Handle duplicates on contract product addition #895

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

Merged
merged 3 commits into from
Aug 26, 2025
Merged

Handle duplicates on contract product addition #895

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
cca5a1d
Handle duplicates on contract product addition
StuartFerguson Aug 26, 2025
3bfcbd0
fix unit test failures :(
StuartFerguson Aug 26, 2025
3d0acf6
more test fixes
StuartFerguson Aug 26, 2025
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
58 changes: 29 additions & 29 deletions TransactionProcessor.Aggregates.Tests/ContractAggregateTests.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -68,7 +68,7 @@ public void ContractAggregate_AddFixedValueProduct_ProductAdded()
ContractAggregate aggregate = ContractAggregate.Create(TestData.ContractId);
aggregate.Create(TestData.EstateId, TestData.OperatorId, TestData.ContractDescription);

aggregate.AddFixedValueProduct(TestData.ContractProductId,
aggregate.AddFixedValueProduct(TestData.FixedContractProductId,
TestData.ProductName,
TestData.ProductDisplayText,
TestData.ProductFixedValue,
Expand All @@ -91,11 +91,11 @@ public void ContractAggregate_AddFixedValueProduct_DuplicateProduct_ErrorThrown(
ContractAggregate aggregate = ContractAggregate.Create(TestData.ContractId);
aggregate.Create(TestData.EstateId, TestData.OperatorId, TestData.ContractDescription);

aggregate.AddFixedValueProduct(TestData.ContractProductId, TestData.ProductName, TestData.ProductDisplayText, TestData.ProductFixedValue, TestData.ProductTypeMobileTopup);
aggregate.AddFixedValueProduct(TestData.FixedContractProductId, TestData.ProductName, TestData.ProductDisplayText, TestData.ProductFixedValue, TestData.ProductTypeMobileTopup);

Should.Throw<InvalidOperationException>(() =>
{
aggregate.AddFixedValueProduct(TestData.ContractProductId, TestData.ProductName, TestData.ProductDisplayText, TestData.ProductFixedValue, TestData.ProductTypeMobileTopup);
aggregate.AddFixedValueProduct(TestData.FixedContractProductId, TestData.ProductName, TestData.ProductDisplayText, TestData.ProductFixedValue, TestData.ProductTypeMobileTopup);
});
}

Expand All @@ -109,7 +109,7 @@ public void ContractAggregate_AddFixedValueProduct_InvalidProductName_ErrorThrow

Should.Throw<ArgumentNullException>(() =>
{
aggregate.AddFixedValueProduct(TestData.ContractProductId, productName, TestData.ProductDisplayText, TestData.ProductFixedValue, TestData.ProductTypeMobileTopup);
aggregate.AddFixedValueProduct(TestData.FixedContractProductId, productName, TestData.ProductDisplayText, TestData.ProductFixedValue, TestData.ProductTypeMobileTopup);
});
}

Expand All @@ -123,7 +123,7 @@ public void ContractAggregate_AddFixedValueProduct_InvalidProductDisplayText_Err

Should.Throw<ArgumentNullException>(() =>
{
aggregate.AddFixedValueProduct(TestData.ContractProductId, TestData.ProductName, displayText, TestData.ProductFixedValue,TestData.ProductTypeMobileTopup);
aggregate.AddFixedValueProduct(TestData.FixedContractProductId, TestData.ProductName, displayText, TestData.ProductFixedValue,TestData.ProductTypeMobileTopup);
});
}

Expand All @@ -137,7 +137,7 @@ public void ContractAggregate_AddFixedValueProduct_InvalidProductValue_ErrorThro

Should.Throw<ArgumentOutOfRangeException>(() =>
{
aggregate.AddFixedValueProduct(TestData.ContractProductId, TestData.ProductName, TestData.ProductDisplayText, value, TestData.ProductTypeMobileTopup);
aggregate.AddFixedValueProduct(TestData.FixedContractProductId, TestData.ProductName, TestData.ProductDisplayText, value, TestData.ProductTypeMobileTopup);
});
}

Expand All @@ -147,7 +147,7 @@ public void ContractAggregate_AddVariableValueProduct_ProductAdded()
ContractAggregate aggregate = ContractAggregate.Create(TestData.ContractId);
aggregate.Create(TestData.EstateId, TestData.OperatorId, TestData.ContractDescription);

aggregate.AddVariableValueProduct(TestData.ContractProductId, TestData.ProductName, TestData.ProductDisplayText, TestData.ProductTypeMobileTopup);
aggregate.AddVariableValueProduct(TestData.VariableContractProductId, TestData.ProductName, TestData.ProductDisplayText, TestData.ProductTypeMobileTopup);

List<Product> products = aggregate.GetProducts();
products.Count.ShouldBe(1);
Expand All @@ -166,11 +166,11 @@ public void ContractAggregate_AddVariableValueProduct_DuplicateProduct_ErrorThro
ContractAggregate aggregate = ContractAggregate.Create(TestData.ContractId);
aggregate.Create(TestData.EstateId, TestData.OperatorId, TestData.ContractDescription);

aggregate.AddVariableValueProduct(TestData.ContractProductId, TestData.ProductName, TestData.ProductDisplayText, TestData.ProductTypeMobileTopup);
aggregate.AddVariableValueProduct(TestData.VariableContractProductId, TestData.ProductName, TestData.ProductDisplayText, TestData.ProductTypeMobileTopup);

Should.Throw<InvalidOperationException>(() =>
{
aggregate.AddVariableValueProduct(TestData.ContractProductId, TestData.ProductName, TestData.ProductDisplayText, TestData.ProductTypeMobileTopup);
aggregate.AddVariableValueProduct(TestData.VariableContractProductId, TestData.ProductName, TestData.ProductDisplayText, TestData.ProductTypeMobileTopup);
});
}

Expand All @@ -184,7 +184,7 @@ public void ContractAggregate_AddVariableValueProduct_InvalidProductName_ErrorTh

Should.Throw<ArgumentNullException>(() =>
{
aggregate.AddVariableValueProduct(TestData.ContractProductId, productName, TestData.ProductDisplayText, TestData.ProductTypeMobileTopup);
aggregate.AddVariableValueProduct(TestData.VariableContractProductId, productName, TestData.ProductDisplayText, TestData.ProductTypeMobileTopup);
});
}

Expand All @@ -198,7 +198,7 @@ public void ContractAggregate_AddVariableValueProduct_InvalidProductDisplayText_

Should.Throw<ArgumentNullException>(() =>
{
aggregate.AddVariableValueProduct(TestData.ContractProductId, TestData.ProductName, displayText, TestData.ProductTypeMobileTopup);
aggregate.AddVariableValueProduct(TestData.VariableContractProductId, TestData.ProductName, displayText, TestData.ProductTypeMobileTopup);
});
}

Expand All @@ -225,7 +225,7 @@ public void ContractAggregate_AddTransactionFee_FixedValueProduct_TransactionFee
{
ContractAggregate aggregate = ContractAggregate.Create(TestData.ContractId);
aggregate.Create(TestData.EstateId, TestData.OperatorId, TestData.ContractDescription);
aggregate.AddFixedValueProduct(TestData.ContractProductId, TestData.ProductName, TestData.ProductDisplayText, TestData.ProductFixedValue, TestData.ProductTypeMobileTopup);
aggregate.AddFixedValueProduct(TestData.FixedContractProductId, TestData.ProductName, TestData.ProductDisplayText, TestData.ProductFixedValue, TestData.ProductTypeMobileTopup);

List<Product> products = aggregate.GetProducts();
Product product = products.Single();
Expand Down Expand Up @@ -253,7 +253,7 @@ public void ContractAggregate_AddTransactionFee_FixedValueProduct_InvalidFeeId_E
{
ContractAggregate aggregate = ContractAggregate.Create(TestData.ContractId);
aggregate.Create(TestData.EstateId, TestData.OperatorId, TestData.ContractDescription);
aggregate.AddFixedValueProduct(TestData.ContractProductId, TestData.ProductName, TestData.ProductDisplayText, TestData.ProductFixedValue, TestData.ProductTypeMobileTopup);
aggregate.AddFixedValueProduct(TestData.FixedContractProductId, TestData.ProductName, TestData.ProductDisplayText, TestData.ProductFixedValue, TestData.ProductTypeMobileTopup);

List<Product> products = aggregate.GetProducts();
Product product = products.Single();
Expand All @@ -277,7 +277,7 @@ public void ContractAggregate_AddTransactionFee_FixedValueProduct_InvalidFeeDesc
{
ContractAggregate aggregate = ContractAggregate.Create(TestData.ContractId);
aggregate.Create(TestData.EstateId, TestData.OperatorId, TestData.ContractDescription);
aggregate.AddFixedValueProduct(TestData.ContractProductId, TestData.ProductName, TestData.ProductDisplayText, TestData.ProductFixedValue, TestData.ProductTypeMobileTopup);
aggregate.AddFixedValueProduct(TestData.FixedContractProductId, TestData.ProductName, TestData.ProductDisplayText, TestData.ProductFixedValue, TestData.ProductTypeMobileTopup);

List<Product> products = aggregate.GetProducts();
Product product = products.Single();
Expand All @@ -297,7 +297,7 @@ public void ContractAggregate_AddTransactionFee_VariableValueProduct_Transaction
{
ContractAggregate aggregate = ContractAggregate.Create(TestData.ContractId);
aggregate.Create(TestData.EstateId, TestData.OperatorId, TestData.ContractDescription);
aggregate.AddVariableValueProduct(TestData.ContractProductId, TestData.ProductName, TestData.ProductDisplayText, TestData.ProductTypeMobileTopup);
aggregate.AddVariableValueProduct(TestData.VariableContractProductId, TestData.ProductName, TestData.ProductDisplayText, TestData.ProductTypeMobileTopup);

List<Product> products = aggregate.GetProducts();
Product product = products.Single();
Expand Down Expand Up @@ -325,7 +325,7 @@ public void ContractAggregate_AddTransactionFee_VariableValueProduct_InvalidFeeI
{
ContractAggregate aggregate = ContractAggregate.Create(TestData.ContractId);
aggregate.Create(TestData.EstateId, TestData.OperatorId, TestData.ContractDescription);
aggregate.AddVariableValueProduct(TestData.ContractProductId, TestData.ProductName, TestData.ProductDisplayText, TestData.ProductTypeMobileTopup);
aggregate.AddVariableValueProduct(TestData.VariableContractProductId, TestData.ProductName, TestData.ProductDisplayText, TestData.ProductTypeMobileTopup);

List<Product> products = aggregate.GetProducts();
Product product = products.Single();
Expand All @@ -349,7 +349,7 @@ public void ContractAggregate_AddTransactionFee_VariableValueProduct_InvalidFeeD
{
ContractAggregate aggregate = ContractAggregate.Create(TestData.ContractId);
aggregate.Create(TestData.EstateId, TestData.OperatorId, TestData.ContractDescription);
aggregate.AddVariableValueProduct(TestData.ContractProductId, TestData.ProductName, TestData.ProductDisplayText, TestData.ProductTypeMobileTopup);
aggregate.AddVariableValueProduct(TestData.VariableContractProductId, TestData.ProductName, TestData.ProductDisplayText, TestData.ProductTypeMobileTopup);

List<Product> products = aggregate.GetProducts();
Product product = products.Single();
Expand Down Expand Up @@ -385,7 +385,7 @@ public void ContractAggregate_AddTransactionFee_ProductNotFound_ErrorThrown(Calc
{
ContractAggregate aggregate = ContractAggregate.Create(TestData.ContractId);
aggregate.Create(TestData.EstateId, TestData.OperatorId, TestData.ContractDescription);
aggregate.AddFixedValueProduct(TestData.ContractProductId,TestData.ProductName, TestData.ProductDisplayText, TestData.ProductFixedValue, TestData.ProductTypeMobileTopup);
aggregate.AddFixedValueProduct(TestData.FixedContractProductId,TestData.ProductName, TestData.ProductDisplayText, TestData.ProductFixedValue, TestData.ProductTypeMobileTopup);

Should.Throw<InvalidOperationException>(() =>
{
Expand All @@ -400,7 +400,7 @@ public void ContractAggregate_AddTransactionFee_FixedValueProduct_InvalidCalcula
{
ContractAggregate aggregate = ContractAggregate.Create(TestData.ContractId);
aggregate.Create(TestData.EstateId, TestData.OperatorId, TestData.ContractDescription);
aggregate.AddVariableValueProduct(TestData.ContractProductId, TestData.ProductName, TestData.ProductDisplayText, TestData.ProductTypeMobileTopup);
aggregate.AddVariableValueProduct(TestData.VariableContractProductId, TestData.ProductName, TestData.ProductDisplayText, TestData.ProductTypeMobileTopup);

List<Product> products = aggregate.GetProducts();
Product product = products.Single();
Expand All @@ -418,7 +418,7 @@ public void ContractAggregate_AddTransactionFee_FixedValueProduct_InvalidFeeType
{
ContractAggregate aggregate = ContractAggregate.Create(TestData.ContractId);
aggregate.Create(TestData.EstateId, TestData.OperatorId, TestData.ContractDescription);
aggregate.AddVariableValueProduct(TestData.ContractProductId, TestData.ProductName, TestData.ProductDisplayText, TestData.ProductTypeMobileTopup);
aggregate.AddVariableValueProduct(TestData.VariableContractProductId, TestData.ProductName, TestData.ProductDisplayText, TestData.ProductTypeMobileTopup);

List<Product> products = aggregate.GetProducts();
Product product = products.Single();
Expand All @@ -442,7 +442,7 @@ public void ContractAggregate_AddTransactionFee_VariableValueProduct_InvalidFeeV
{
ContractAggregate aggregate = ContractAggregate.Create(TestData.ContractId);
aggregate.Create(TestData.EstateId, TestData.OperatorId, TestData.ContractDescription);
aggregate.AddVariableValueProduct(TestData.ContractProductId, TestData.ProductName, TestData.ProductDisplayText, TestData.ProductTypeMobileTopup);
aggregate.AddVariableValueProduct(TestData.VariableContractProductId, TestData.ProductName, TestData.ProductDisplayText, TestData.ProductTypeMobileTopup);

List<Product> products = aggregate.GetProducts();
Product product = products.Single();
Expand All @@ -466,7 +466,7 @@ public void ContractAggregate_AddTransactionFee_FixedValueProduct_InvalidFeeValu
{
ContractAggregate aggregate = ContractAggregate.Create(TestData.ContractId);
aggregate.Create(TestData.EstateId, TestData.OperatorId, TestData.ContractDescription);
aggregate.AddVariableValueProduct(TestData.ContractProductId, TestData.ProductName, TestData.ProductDisplayText, TestData.ProductTypeMobileTopup);
aggregate.AddVariableValueProduct(TestData.VariableContractProductId, TestData.ProductName, TestData.ProductDisplayText, TestData.ProductTypeMobileTopup);

List<Product> products = aggregate.GetProducts();
Product product = products.Single();
Expand All @@ -484,7 +484,7 @@ public void ContractAggregate_AddTransactionFee_VariableValueProduct_InvalidCalc
{
ContractAggregate aggregate = ContractAggregate.Create(TestData.ContractId);
aggregate.Create(TestData.EstateId, TestData.OperatorId, TestData.ContractDescription);
aggregate.AddVariableValueProduct(TestData.ContractProductId, TestData.ProductName, TestData.ProductDisplayText, TestData.ProductTypeMobileTopup);
aggregate.AddVariableValueProduct(TestData.VariableContractProductId, TestData.ProductName, TestData.ProductDisplayText, TestData.ProductTypeMobileTopup);

List<Product> products = aggregate.GetProducts();
Product product = products.Single();
Expand All @@ -502,7 +502,7 @@ public void ContractAggregate_AddTransactionFee_VariableValueProduct_InvalidFeeT
{
ContractAggregate aggregate = ContractAggregate.Create(TestData.ContractId);
aggregate.Create(TestData.EstateId, TestData.OperatorId, TestData.ContractDescription);
aggregate.AddVariableValueProduct(TestData.ContractProductId, TestData.ProductName, TestData.ProductDisplayText, TestData.ProductTypeMobileTopup);
aggregate.AddVariableValueProduct(TestData.VariableContractProductId, TestData.ProductName, TestData.ProductDisplayText, TestData.ProductTypeMobileTopup);

List<Product> products = aggregate.GetProducts();
Product product = products.Single();
Expand All @@ -522,7 +522,7 @@ public void ContractAggregate_DisableTransactionFee_TransactionFeeIsDisabled(Cal
{
ContractAggregate aggregate = ContractAggregate.Create(TestData.ContractId);
aggregate.Create(TestData.EstateId, TestData.OperatorId, TestData.ContractDescription);
aggregate.AddVariableValueProduct(TestData.ContractProductId, TestData.ProductName, TestData.ProductDisplayText, TestData.ProductTypeMobileTopup);
aggregate.AddVariableValueProduct(TestData.VariableContractProductId, TestData.ProductName, TestData.ProductDisplayText, TestData.ProductTypeMobileTopup);

List<Product> products = aggregate.GetProducts();
Product product = products.Single();
Expand All @@ -535,7 +535,7 @@ public void ContractAggregate_DisableTransactionFee_TransactionFeeIsDisabled(Cal
ContractProductTransactionFee? fee = productWithFees.TransactionFees.Single();
fee.IsEnabled.ShouldBeTrue();

aggregate.DisableTransactionFee(TestData.ContractProductId, TestData.TransactionFeeId);
aggregate.DisableTransactionFee(TestData.VariableContractProductId, TestData.TransactionFeeId);

productsAfterFeeAdded = aggregate.GetProducts();
productWithFees = productsAfterFeeAdded.Single();
Expand All @@ -552,7 +552,7 @@ public void ContractAggregate_DisableTransactionFee_ProductNotFound_ErrorThrown(

Should.Throw<InvalidOperationException>(() =>
{
aggregate.DisableTransactionFee(TestData.ContractProductId, TestData.TransactionFeeId);
aggregate.DisableTransactionFee(TestData.VariableContractProductId, TestData.TransactionFeeId);
});
}

Expand All @@ -561,11 +561,11 @@ public void ContractAggregate_DisableTransactionFee_TransactionFeeNotFound_Error
{
ContractAggregate aggregate = ContractAggregate.Create(TestData.ContractId);
aggregate.Create(TestData.EstateId, TestData.OperatorId, TestData.ContractDescription);
aggregate.AddVariableValueProduct(TestData.ContractProductId, TestData.ProductName, TestData.ProductDisplayText, TestData.ProductTypeMobileTopup);
aggregate.AddVariableValueProduct(TestData.VariableContractProductId, TestData.ProductName, TestData.ProductDisplayText, TestData.ProductTypeMobileTopup);

Should.Throw<InvalidOperationException>(() =>
{
aggregate.DisableTransactionFee(TestData.ContractProductId, TestData.TransactionFeeId);
aggregate.DisableTransactionFee(TestData.VariableContractProductId, TestData.TransactionFeeId);
});
}
}
Expand Down
Loading
Loading