Skip to content

more refactoring #191

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 4 commits into from
Oct 14, 2025
Merged

more refactoring #191

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
c0b2e02
more refactoring
StuartFerguson Oct 14, 2025
3dfb204
Merge branch 'main' into refactor/#148_reduce_method_params
StuartFerguson Oct 14, 2025
573a712
fix build failure
StuartFerguson Oct 14, 2025
b1d3cf2
Merge branch 'refactor/#148_reduce_method_params' of ssh://github.com…
StuartFerguson Oct 14, 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
2 changes: 1 addition & 1 deletion CallbackHander.Testing/TestData.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -43,7 +43,7 @@ public static CallbackMessageAggregate RecordedCallbackMessageAggregate()
{
CallbackMessageAggregate aggregate = new();
aggregate.RecordCallback(TestData.CallbackId, TestData.TypeString, (MessageFormat)TestData.MessageFormat,
TestData.CallbackMessage, TestData.Reference, TestData.Destinations, EstateReference, MerchantReference);
TestData.CallbackMessage, TestData.Destinations,(TestData.Reference, EstateReference, MerchantReference));

return aggregate;
}
Expand Down
4 changes: 2 additions & 2 deletions CallbackHandler.BusinessLogic/Services/CallbackDomainService.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -40,8 +40,8 @@ public async Task<Result> RecordCallback(CallbackCommands.RecordCallbackCommand
DomainServiceHelper.HandleGetAggregateResult(getResult, command.CallbackId, false);

CallbackMessageAggregate aggregate = callbackMessageAggregateResult.Data;
Result stateResult = aggregate.RecordCallback(command.CallbackId, command.TypeString, command.MessageFormat, command.CallbackMessage, command.Reference, command.Destinations,
Guid.Parse(estateReference), Guid.Parse(merchantReference));
Result stateResult = aggregate.RecordCallback(command.CallbackId, command.TypeString, command.MessageFormat, command.CallbackMessage, command.Destinations,
(command.Reference, Guid.Parse(estateReference), Guid.Parse(merchantReference)));
if (stateResult.IsFailed)
return stateResult;
return await this.AggregateRepository.SaveChanges(aggregate, cancellationToken);
Expand Down
4 changes: 2 additions & 2 deletions CallbackHandler.CallbackMessageAggregate.Tests/CallbackMessageAggregateTests.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22,8 +22,8 @@ public void CallbackMessageAggregate_RecordCallback_CallbackIsRecorded()
{
CallbackMessageAggregate aggregate = new();

Result result = aggregate.RecordCallback(TestData.CallbackId, TestData.TypeString, MessageFormat.JSON, TestData.CallbackMessage, TestData.Reference, TestData.Destinations,
TestData.EstateReference, TestData.MerchantReference);
Result result = aggregate.RecordCallback(TestData.CallbackId, TestData.TypeString, MessageFormat.JSON, TestData.CallbackMessage, TestData.Destinations,
(TestData.Reference, TestData.EstateReference, TestData.MerchantReference));
result.IsSuccess.ShouldBeTrue();

aggregate.ShouldSatisfyAllConditions(() => aggregate.CallbackMessage.ShouldBe(TestData.CallbackMessage),
Expand Down
6 changes: 2 additions & 4 deletions CallbackHandler.CallbackMessageAggregate/CallbackMessageAggregate.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -54,12 +54,10 @@ public static Result RecordCallback(this CallbackMessageAggregate aggregate,
String typeString,
MessageFormat messageFormat,
String callbackMessage,
String reference,
String[] destinations,
Guid estateId,
Guid merchantId) {
(String reference, Guid estateId, Guid merchantId) referenceFields) {
foreach (String destination in destinations) {
CallbackReceivedEvent callbackReceivedEvent = new (aggregateId, typeString, (Int32)messageFormat, callbackMessage, reference, destination, estateId, merchantId);
CallbackReceivedEvent callbackReceivedEvent = new (aggregateId, typeString, (Int32)messageFormat, callbackMessage, referenceFields.reference, destination, referenceFields.estateId, referenceFields.merchantId);

aggregate.ApplyAndAppend(callbackReceivedEvent);
}
Expand Down
Loading