ifritechnologies/pfm
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Refactored roganisation routines to use TenantOrganisation

Browse Source
This commit is contained in:
hermes
2026-09-25 04:01:31 +02:00
parent 4b806a3202
commit 24697776d0
1 changed files with 9 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files
PostFundManagement.Application/Services/Governance/GovernanceService.cs
+9 -7
View File
@@ -56,13 +56,14 @@ public sealed class GovernanceService(IDbContextFactory<ApplicationDbContext> co
{ {
await using var context = await contextFactory.CreateDbContextAsync(cancellationToken); await using var context = await contextFactory.CreateDbContextAsync(cancellationToken);
var organisations = await context.Organisations.AsNoTracking() var organisations = await context.TenantOrganisations.AsNoTracking()
.OrderBy(o => o.Name) .Include(i => i.Organisation)
.OrderBy(o => o.Organisation!.Name)
.Skip((pagination.Page - 1) * pagination.PageSize) .Skip((pagination.Page - 1) * pagination.PageSize)
.Take(pagination.PageSize) .Take(pagination.PageSize)
.ToListAsync(cancellationToken); .ToListAsync(cancellationToken);
return Result.Ok(organisations.Select(o => o.Map()).ToArray()); return Result.Ok(organisations.Select(o => o.Organisation!.Map()).ToArray());
})); }));
public async Task<Result<Organisation>> GetOrganisationAsync(string organisationIdHash, CancellationToken cancellationToken = default) => public async Task<Result<Organisation>> GetOrganisationAsync(string organisationIdHash, CancellationToken cancellationToken = default) =>
@@ -76,11 +77,12 @@ public sealed class GovernanceService(IDbContextFactory<ApplicationDbContext> co
await using var context = await contextFactory.CreateDbContextAsync(cancellationToken); await using var context = await contextFactory.CreateDbContextAsync(cancellationToken);
var organisation = await context.Organisations.AsNoTracking() var tenantOrganisation = await context.TenantOrganisations.AsNoTracking()
.FirstOrDefaultAsync(o => o.Id == decodeResult.Value, cancellationToken); .Include(i => i.OrganisationId)
.FirstOrDefaultAsync(o => o.OrganisationId == decodeResult.Value, cancellationToken);
return Result.FailIf(organisation is null, NotFoundError.New) return Result.FailIf(tenantOrganisation is null, NotFoundError.New)
.ToResult(organisation!.Map()); .ToResult(tenantOrganisation!.Organisation!.Map());
})); }));
public async Task<Result<Instrument[]>> GetInstrumentsAsync(string programmeIdHash, CancellationToken cancellationToken = default) => public async Task<Result<Instrument[]>> GetInstrumentsAsync(string programmeIdHash, CancellationToken cancellationToken = default) =>