Skip to content

Fix merchant address update failing due to random GUIDs for AddressId and ContactId #832

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
StuartFerguson merged 5 commits into from
Apr 10, 2026
Merged

Fix merchant address update failing due to random GUIDs for AddressId and ContactId #832

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
fed5721
Initial plan
Copilot Apr 10, 2026
130ec0a
Fix: Use correct AddressId and ContactId when updating merchant address
Copilot Apr 10, 2026
e0feeb7
Fix CountrySelector to match by code OR name, update test fixtures
Copilot Apr 10, 2026
9db149a
Add Components.Shared using to _Imports.razor so CountrySelector reso…
Copilot Apr 10, 2026
0d08f62
Fix CountrySelector Value binding missing @ prefix in Edit.razor and …
Copilot Apr 10, 2026
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 EstateManagementUI.BlazorServer.Tests/Pages/Merchants/MerchantsEditPageTests.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1208,7 +1208,7 @@ private void SetupSuccessfulDataLoad(Guid merchantId,
Town = "Test Town",
Region = "Test Region",
PostalCode = "12345",
Country = "GB",
Country = "United Kingdom",
ContactId = Guid.NewGuid(),
ContactName = "Test Contact",
ContactEmailAddress = "[email protected]",
Expand Down
8 changes: 7 additions & 1 deletion EstateManagementUI.BlazorServer.Tests/UIServices/MerchantUIServiceTests.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -277,15 +277,19 @@ public async Task UpdateMerchant_SendsUpdateCommand_AndReturnsSuccess()
var estateId = Guid.NewGuid();
var merchantId = Guid.NewGuid();

var addressId = Guid.NewGuid();
var contactId = Guid.NewGuid();
var editModel = new BlazorServer.Models.MerchantModels.MerchantEditModel
{
MerchantName = "Upd",
SettlementSchedule = "S",
AddressId = addressId,
AddressLine1 = "A1",
Town = "T",
Region = "R",
PostalCode = "P",
Country = "C",
Country = "United Kingdom",
ContactId = contactId,
ContactName = "CN",
ContactEmailAddress = "e@x",
ContactPhoneNumber = "ph"
Expand All @@ -303,7 +307,9 @@ public async Task UpdateMerchant_SendsUpdateCommand_AndReturnsSuccess()
c.MerchantId == merchantId &&
c.Name == editModel.MerchantName &&
c.SettlementSchedule == editModel.SettlementSchedule &&
c.MerchantAddress.AddressId == addressId &&
c.MerchantAddress.AddressLine1 == editModel.AddressLine1 &&
c.MerchantContact.ContactId == contactId &&
c.MerchantContact.ContactName == editModel.ContactName
), It.IsAny<CancellationToken>()), Times.Once);
}
Expand Down
2 changes: 1 addition & 1 deletion EstateManagementUI.BlazorServer/Components/Pages/Merchants/Edit.razor
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -153,7 +153,7 @@
<label class="block text-sm font-medium text-gray-700 mb-1">
Country <span class="text-red-500">*</span>
</label>
<CountrySelector Value="merchantEditModel.Country" ValueChanged="@((string value) => merchantEditModel.Country = value)" ValueExpression="@(() => merchantEditModel.Country)" class="input w-full" name="Country"/>
<CountrySelector Value="@merchantEditModel.Country" ValueChanged="@((string value) => merchantEditModel.Country = value)" ValueExpression="@(() => merchantEditModel.Country)" class="input w-full" name="Country"/>
<ValidationMessage For="@(() => merchantEditModel.Country)" class="text-red-600 text-sm mt-1"/>
</div>
</div>
Expand Down
2 changes: 1 addition & 1 deletion EstateManagementUI.BlazorServer/Components/Pages/Merchants/New.razor
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -121,7 +121,7 @@
<label class="block text-sm font-medium text-gray-700 mb-1">
Country <span class="text-red-500">*</span>
</label>
<CountrySelector Value="model.Country" ValueChanged="@((string value) => model.Country = value)" ValueExpression="@(() => model.Country)" class="input w-full" name="Country" />
<CountrySelector Value="@model.Country" ValueChanged="@((string value) => model.Country = value)" ValueExpression="@(() => model.Country)" class="input w-full" name="Country" />
<ValidationMessage For="@(() => model.Country)" class="text-red-600 text-sm mt-1" />
</div>
</div>
Expand Down
4 changes: 2 additions & 2 deletions EstateManagementUI.BlazorServer/Components/Shared/CountrySelector.razor
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@
<span class="truncate flex items-center gap-2">
@if (!string.IsNullOrEmpty(Value))
{
var selected = Countries.FirstOrDefault(c => c.Name == Value);
var selected = Countries.FirstOrDefault(c => c.Name == Value || c.Code == Value);
if (selected != null)
{
<span class="text-xl">@selected.Flag</span>
Expand Down Expand Up @@ -40,7 +40,7 @@
{
@foreach (var country in Countries)
{
var isSelected = Value == country.Name;
var isSelected = Value == country.Name || Value == country.Code;

<button type="button"
@onclick="@(() => SelectCountry(country.Name))"
Expand Down
1 change: 1 addition & 0 deletions EstateManagementUI.BlazorServer/Components/_Imports.razor
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,5 +12,6 @@
@using EstateManagementUI.BlazorServer.Components
@using EstateManagementUI.BlazorServer.Components.Layout
@using EstateManagementUI.BlazorServer.Components.Permissions
@using EstateManagementUI.BlazorServer.Components.Shared
@using EstateManagementUI.BlazorServer.Models
@using EstateManagementUI.BlazorServer.Permissions
4 changes: 2 additions & 2 deletions EstateManagementUI.BlazorServer/UIServices/MerchantUIService.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -187,8 +187,8 @@ public async Task<Result> UpdateMerchant(CorrelationId correlationId,
Guid estateId,
Guid merchantId,
MerchantModels.MerchantEditModel editMerchantModel) {
MerchantCommands.MerchantAddress address = new(Guid.NewGuid(), editMerchantModel.AddressLine1, editMerchantModel.Town, editMerchantModel.Region, editMerchantModel.PostalCode, editMerchantModel.Country);
MerchantCommands.MerchantContact contact = new(Guid.NewGuid(), editMerchantModel.ContactName, editMerchantModel.ContactEmailAddress, editMerchantModel.ContactPhoneNumber);
MerchantCommands.MerchantAddress address = new(editMerchantModel.AddressId, editMerchantModel.AddressLine1, editMerchantModel.Town, editMerchantModel.Region, editMerchantModel.PostalCode, editMerchantModel.Country);
MerchantCommands.MerchantContact contact = new(editMerchantModel.ContactId, editMerchantModel.ContactName, editMerchantModel.ContactEmailAddress, editMerchantModel.ContactPhoneNumber);

MerchantCommands.UpdateMerchantCommand command = new(correlationId, estateId, merchantId, editMerchantModel.MerchantName, editMerchantModel.SettlementSchedule,
address,contact);
Expand Down
Loading