Skip to content

Commit

Permalink
Fix merging country for user (#70)
Browse files Browse the repository at this point in the history
Co-authored-by: Ivan Lieckens <ivanlieckens@hotmail.com>
  • Loading branch information
sc-ivanlieckens and IvanLieckens authored Jan 2, 2025
1 parent a19d2b2 commit dff8d33
Show file tree
Hide file tree
Showing 2 changed files with 6 additions and 1 deletion.
2 changes: 1 addition & 1 deletion azure-pipelines.yml
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
# Add steps that publish symbols, save build artifacts, deploy, and more:
# https://docs.microsoft.com/azure/devops/pipelines/apps/aspnet/build-aspnet-4

name: 4.17.0$(Rev:.r)
name: 4.17.1$(Rev:.r)

trigger:
- main
Expand Down
5 changes: 5 additions & 0 deletions src/Mvp.Selections.Data/Repositories/UserRepository.cs
Original file line number Diff line number Diff line change
Expand Up @@ -118,6 +118,11 @@ await Context.Comments.Where(c => c.User.Id == old.Id).ForEachAsync(comment =>
}
}

if (merged.Country == null && old.Country != null)
{
merged.Country = old.Country;
}

await RemoveAsync(old.Id);
}

Expand Down

0 comments on commit dff8d33

Please sign in to comment.