Skip to content

bugfix/AB#28442-FixdefaultingSite #1211

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
don-aot merged 1 commit into from
Mar 31, 2025
Merged

bugfix/AB#28442-FixdefaultingSite #1211

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
14 changes: 14 additions & 0 deletions ...s/Unity.GrantManager/src/Unity.GrantManager.Application/Applicants/ApplicantAppService.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,6 +15,8 @@
using Microsoft.Extensions.Logging;
using Unity.Payments.Integrations.Cas;
using Microsoft.Extensions.Logging.Abstractions;
using Unity.Payments.Suppliers;
using Unity.Payments.Domain.Suppliers;

namespace Unity.GrantManager.Applicants;

Expand All @@ -23,6 +25,7 @@ namespace Unity.GrantManager.Applicants;
[ExposeServices(typeof(ApplicantAppService), typeof(IApplicantAppService))]
public class ApplicantAppService(IApplicantRepository applicantRepository,
ISupplierService supplierService,
ISiteAppService siteAppService,
IApplicantAddressRepository addressRepository,
IOrgBookService orgBookService,
IApplicantAgentRepository applicantAgentRepository) : GrantManagerAppService, IApplicantAppService
Expand Down Expand Up @@ -65,6 +68,17 @@ public async Task<Applicant> RelateSupplierToApplicant(ApplicantSupplierEto appl
Applicant? applicant = await applicantRepository.GetAsync(applicantSupplierEto.ApplicantId);
ArgumentNullException.ThrowIfNull(applicant);
applicant.SupplierId = applicantSupplierEto.SupplierId;
applicant.SiteId = null; // Reset site id to null
// lookup sites if there is only one then set it as default
if (applicant.SupplierId != null)
{
List<Site> sites = await siteAppService.GetSitesBySupplierIdAsync(applicant.SupplierId.Value);
if (sites.Count == 1)
{
applicant.SiteId = sites.FirstOrDefault()?.Id;
}
}

await applicantRepository.UpdateAsync(applicant);
return applicant;
}
Expand Down