Skip to content
Merged

Dev #2727

Changes from all commits
Commits
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
Original file line number Diff line number Diff line change
Expand Up @@ -10,6 +10,7 @@
using Volo.Abp.Domain.Repositories;
using Volo.Abp.MultiTenancy;
using Volo.Abp.TenantManagement;
using Volo.Abp.Uow;

namespace Unity.GrantManager.ApplicantProfile;

Expand All @@ -22,6 +23,7 @@ public class ApplicantTenantMapReconciler(
ITenantRepository tenantRepository,
IRepository<ApplicantTenantMap, Guid> applicantTenantMapRepository,
IRepository<ApplicationFormSubmission, Guid> applicationFormSubmissionRepository,
IUnitOfWorkManager unitOfWorkManager,
ILogger<ApplicantTenantMapReconciler> logger)
: IApplicantTenantMapReconciler, ITransientDependency
{
Expand All @@ -41,6 +43,7 @@ public class ApplicantTenantMapReconciler(
logger.LogDebug("Collecting submissions from tenant: {TenantName}", tenant.Name);

using (currentTenant.Change(tenant.Id))
using (var unitOfWork = unitOfWorkManager.Begin(requiresNew: true))
{
var submissionQueryable = await applicationFormSubmissionRepository.GetQueryableAsync();
var distinctOidcSubs = await submissionQueryable
Expand All @@ -49,6 +52,8 @@ public class ApplicantTenantMapReconciler(
.Distinct()
.ToListAsync();

await unitOfWork.CompleteAsync();

foreach (var oidcSub in distinctOidcSubs)
{
var subUsername = SubjectNormalizer.Normalize(oidcSub);
Expand Down Expand Up @@ -78,6 +83,7 @@ public class ApplicantTenantMapReconciler(
int totalMappingsUpdated = 0;

using (currentTenant.Change(null))
using (var unitOfWork = unitOfWorkManager.Begin(requiresNew: true))
{
var allSubUsernames = desiredMappings.Select(m => m.SubUsername).Distinct().ToList();

Expand Down Expand Up @@ -113,6 +119,8 @@ public class ApplicantTenantMapReconciler(
subUsername, tenantName);
}
}

await unitOfWork.CompleteAsync();
}

logger.LogInformation("ApplicantTenantMap reconciliation completed. Created: {Created}, Updated: {Updated}",
Expand Down
Loading