Fixed portfolio retrieval

PostFundManagement.Application/Abstractions/Services/IGovernanceService.cs

@@ -19,7 +19,10 @@ public interface IGovernanceService
     Task<Result<Programme[]>> GetProgrammesAsync(string portfolioIdHash, CancellationToken cancellationToken = default);
 
     [Log]
-    Task<Result<Portfolio[]>> GetPorfoliosAsync(string organisationIdHash, CancellationToken cancellationToken = default);
+    Task<Result<Portfolio[]>> GetPorfoliosAsync(Pagination pagination, CancellationToken cancellationToken = default);
+
+    [Log]
+    Task<Result<Portfolio[]>> GetOrganisationPorfoliosAsync(string organisationIdHash, CancellationToken cancellationToken = default);
 
     [Log]
     Task<Result<Organisation[]>> GetOrganisationsAsync(Pagination pagination, CancellationToken cancellationToken = default);

PostFundManagement.Application/Services/Governance/GovernanceCacheService.cs

@@ -122,19 +122,19 @@ public sealed class GovernanceCacheService(GovernanceService service, IDistribut
             return Result.Ok(cached.FromJson<Organisation[]>());
         }));
 
-    public async Task<Result<Portfolio[]>> GetPorfoliosAsync(string organisationIdHash, CancellationToken cancellationToken = default) =>
+    public async Task<Result<Portfolio[]>> GetOrganisationPorfoliosAsync(string organisationIdHash, CancellationToken cancellationToken = default) =>
         await Result.Try((Func<Task<Result<Portfolio[]>>>)(async () =>
         {
             if (!await featureManager.IsEnabledAsync(ServiceCachingFeature))
-                return await service.GetPorfoliosAsync(organisationIdHash, cancellationToken);
+                return await service.GetOrganisationPorfoliosAsync(organisationIdHash, cancellationToken);
 
-            var cacheKey = HashService.ToMd5Hash($"getportfolios-{organisationIdHash}").Value;
+            var cacheKey = HashService.ToMd5Hash($"getorganisationportfolios-{organisationIdHash}").Value;
 
             var cached = await cache.GetStringAsync(cacheKey, cancellationToken);
 
             if (string.IsNullOrWhiteSpace(cached))
             {
-                var result = await service.GetPorfoliosAsync(organisationIdHash, cancellationToken);
+                var result = await service.GetOrganisationPorfoliosAsync(organisationIdHash, cancellationToken);
 
                 if (result.IsFailed) return result;
 
@@ -331,4 +331,28 @@ public sealed class GovernanceCacheService(GovernanceService service, IDistribut
 
     public async Task<Result> UpdateTenantUserAsync(UpdateTenantUserRequest request, Guid userId, CancellationToken cancellationToken = default) =>
         await service.UpdateTenantUserAsync(request, userId, cancellationToken);
+
+    public async Task<Result<Portfolio[]>> GetPorfoliosAsync(Pagination pagination, CancellationToken cancellationToken = default) =>
+        await Result.Try((Func<Task<Result<Portfolio[]>>>)(async () =>
+        {
+            if (!await featureManager.IsEnabledAsync(ServiceCachingFeature))
+                return await service.GetPorfoliosAsync(pagination, cancellationToken);
+
+            var cacheKey = HashService.ToMd5Hash($"getportfolios-{pagination.Page}-{pagination.PageSize}").Value;
+
+            var cached = await cache.GetStringAsync(cacheKey, cancellationToken);
+
+            if (string.IsNullOrWhiteSpace(cached))
+            {
+                var result = await service.GetPorfoliosAsync(pagination, cancellationToken);
+
+                if (result.IsFailed) return result;
+
+                await cache.SetStringAsync(cacheKey, result.Value.ToJson(), cacheOptions, cancellationToken);
+
+                return result.Value;
+            }
+
+            return Result.Ok(cached.FromJson<Portfolio[]>());
+        }));
 }

PostFundManagement.Application/Services/Governance/GovernanceService.cs

@@ -32,7 +32,7 @@ public sealed class GovernanceService(IDbContextFactory<ApplicationDbContext> co
             return Result.Ok(programmes.Select(p => p.Map()).ToArray());
         }));
 
-    public async Task<Result<Portfolio[]>> GetPorfoliosAsync(string organisationIdHash, CancellationToken cancellationToken = default) =>
+    public async Task<Result<Portfolio[]>> GetOrganisationPorfoliosAsync(string organisationIdHash, CancellationToken cancellationToken = default) =>
         await Result.Try((Func<Task<Result<Portfolio[]>>>)(async () =>
         {
             var decodeResult = hashService.DecodeLongIdHash(organisationIdHash);
@@ -44,7 +44,8 @@ public sealed class GovernanceService(IDbContextFactory<ApplicationDbContext> co
             await using var context = await contextFactory.CreateDbContextAsync(cancellationToken);
 
             var portfolios = await context.Portfolios.AsNoTracking()
-                .Where(f => f.Id == decodeResult.Value)
+                .Include(i => i.Organisation)
+                .Where(f => f.OrganisationId == decodeResult.Value)
                 .OrderByDescending(o => o.CreatedAt)
                 .ToListAsync(cancellationToken);
 
@@ -471,4 +472,17 @@ public sealed class GovernanceService(IDbContextFactory<ApplicationDbContext> co
 
             return Result.OkIf(await context.SaveChangesAsync(cancellationToken) > 0, CreateError.Create("Failed to create instrument"));
         }));
+
+    public async Task<Result<Portfolio[]>> GetPorfoliosAsync(Pagination pagination, CancellationToken cancellationToken = default) =>
+        await Result.Try((Func<Task<Result<Portfolio[]>>>)(async () =>
+        {
+            await using var context = await contextFactory.CreateDbContextAsync(cancellationToken);
+
+            var portfolios = await context.Portfolios.AsNoTracking()
+                .Skip((pagination.Page - 1) * pagination.PageSize)
+                .Take(pagination.PageSize)
+                .ToListAsync(cancellationToken);
+
+            return Result.Ok(portfolios.Select(p => p.Map()).ToArray());
+        }));
 }