src/KpiGenerator.Tests/ProjectReportingTests.cs

@@ -26,7 +26,6 @@ public class ProjectReportingTests
     private IOptionsMonitor<ReportingConfiguration> _reportingConfiguration = null!;
 
     private IAdminApi _adminApi = null!;
-    private IProjectQuotaApi _projectQuotaApi = null!;
 
     private ProjectReporting _projectReporting = null!; // System Under Test
 
@@ -71,7 +70,6 @@ public class ProjectReportingTests
         _reportingConfiguration.CurrentValue.Returns(reportingConfig);
 
         _adminApi = Substitute.For<IAdminApi>();
-        _projectQuotaApi = Substitute.For<ProjectQuotaApi>();
     }
 
     #region GenerateReportingAsync Tests
@@ -96,7 +94,7 @@ public class ProjectReportingTests
                 var pagination = new Pagination(currentPage: 1, pageSize: 2, totalCount: 2, totalPages: 1);
                 return Task.FromResult(new ProjectAdminDtoPagedResponse(data: projects, pagination: pagination, statusCode: 200, traceId: "dummy-trace-id"));
             });
-        _projectReporting = new ProjectReporting(_mapper, _logger, _gitlabStorageService, _localStorageService, _kpiConfiguration, _reportingConfiguration, _adminApi, _projectQuotaApi);
+        _projectReporting = new ProjectReporting(_mapper, _logger, _gitlabStorageService, _localStorageService, _kpiConfiguration, _reportingConfiguration, _adminApi);
 
         // Act
         var result = await _projectReporting.GenerateReportingAsync();
@@ -128,7 +126,7 @@ public class ProjectReportingTests
                 var pagination = new Pagination(currentPage: 1, pageSize: 0, totalCount: 0, totalPages: 1);
                 return Task.FromResult(new ProjectAdminDtoPagedResponse(data: [], pagination: pagination, statusCode: 200, traceId: "dummy-trace-id"));
             });
-        _projectReporting = new ProjectReporting(_mapper, _logger, _gitlabStorageService, _localStorageService, _kpiConfiguration, _reportingConfiguration, _adminApi, _projectQuotaApi);
+        _projectReporting = new ProjectReporting(_mapper, _logger, _gitlabStorageService, _localStorageService, _kpiConfiguration, _reportingConfiguration, _adminApi);
 
         // Act
         var result = await _projectReporting.GenerateReportingAsync();
@@ -155,7 +153,7 @@ public class ProjectReportingTests
             };
 
         // We want to ensure that GenerateReportingAsync returns some test objects
-        _projectReporting = Substitute.ForPartsOf<ProjectReporting>(_mapper, _logger, _gitlabStorageService, _localStorageService, _kpiConfiguration, _reportingConfiguration, _adminApi, _projectQuotaApi);
+        _projectReporting = Substitute.ForPartsOf<ProjectReporting>(_mapper, _logger, _gitlabStorageService, _localStorageService, _kpiConfiguration, _reportingConfiguration, _adminApi);
         _projectReporting
             .Configure()
             .GenerateReportingAsync()
@@ -195,7 +193,7 @@ public class ProjectReportingTests
             };
 
         // Partial mock to override GenerateReportingAsync
-        _projectReporting = Substitute.ForPartsOf<ProjectReporting>(_mapper, _logger, _gitlabStorageService, _localStorageService, _kpiConfiguration, _reportingConfiguration, _adminApi, _projectQuotaApi);
+        _projectReporting = Substitute.ForPartsOf<ProjectReporting>(_mapper, _logger, _gitlabStorageService, _localStorageService, _kpiConfiguration, _reportingConfiguration, _adminApi);
         _projectReporting
             .Configure()
             .GenerateReportingAsync()
@@ -235,7 +233,7 @@ public class ProjectReportingTests
             };
 
         // Partial mock to override GenerateReportingAsync
-        _projectReporting = Substitute.ForPartsOf<ProjectReporting>(_mapper, _logger, _gitlabStorageService, _localStorageService, _kpiConfiguration, _reportingConfiguration, _adminApi, _projectQuotaApi);
+        _projectReporting = Substitute.ForPartsOf<ProjectReporting>(_mapper, _logger, _gitlabStorageService, _localStorageService, _kpiConfiguration, _reportingConfiguration, _adminApi);
         _projectReporting
             .Configure()
             .GenerateReportingAsync()
@@ -272,7 +270,7 @@ public class ProjectReportingTests
             };
 
         // Partial mock
-        _projectReporting = Substitute.ForPartsOf<ProjectReporting>(_mapper, _logger, _gitlabStorageService, _localStorageService, _kpiConfiguration, _reportingConfiguration, _adminApi, _projectQuotaApi);
+        _projectReporting = Substitute.ForPartsOf<ProjectReporting>(_mapper, _logger, _gitlabStorageService, _localStorageService, _kpiConfiguration, _reportingConfiguration, _adminApi);
         _projectReporting
             .Configure()
             .GenerateReportingAsync()

src/KpiGenerator/KpiGenerator.csproj

@@ -7,7 +7,7 @@
 		<AssemblyName>Coscine.KpiGenerator</AssemblyName>
 		<ImplicitUsings>enable</ImplicitUsings>
 		<Nullable>enable</Nullable>
-		<Version>1.2.7</Version>
+		<Version>1.2.8</Version>
 	</PropertyGroup>
 
 	<PropertyGroup>
@@ -21,7 +21,7 @@
 		<PackageReference Include="AutoMapper" Version="12.0.1" />
 		<PackageReference Include="AutoMapper.Extensions.Microsoft.DependencyInjection" Version="12.0.1" />
 		<PackageReference Include="CommandLineParser" Version="2.9.1" />
-		<PackageReference Include="Coscine.ApiClient" Version="1.9.4" />
+		<PackageReference Include="Coscine.ApiClient" Version="1.9.7" />
 		<PackageReference Include="dotNetRdf.Core" Version="3.1.1" />
 		<PackageReference Include="GitLabApiClient" Version="1.8.1-beta.5" />
 		<PackageReference Include="Microsoft.Extensions.Caching.Memory" Version="8.0.0" />

src/KpiGenerator/Program.cs

@@ -176,7 +176,7 @@ public class Program
             BasePath = $"{reportingConfiguration.Endpoint.TrimEnd('/')}/coscine",
             ApiKeyPrefix = { { "Authorization", "Bearer" } },
             ApiKey = { { "Authorization", reportingConfiguration.ApiKey } },
-            Timeout = 300000 // 5 minutes
+            Timeout = TimeSpan.FromSeconds(300) // 5 minutes
         };
         services.AddSingleton<IAdminApi>(new AdminApi(apiConfiguration));
         services.AddSingleton<IApplicationProfileApi>(new ApplicationProfileApi(apiConfiguration));

src/KpiGenerator/Reportings/Project/ProjectReporting.cs

@@ -22,7 +22,6 @@ public class ProjectReporting
     private readonly KpiConfiguration _kpiConfiguration;
     private readonly ReportingConfiguration _reportingConfiguration;
     private readonly IAdminApi _adminApi;
-    private readonly IProjectQuotaApi _projectQuotaApi;
 
     public ProjectReportingOptions Options { get; private set; } = null!;
     public string ReportingFileName { get; }
@@ -34,8 +33,7 @@ public class ProjectReporting
         [FromKeyedServices("local")] IStorageService localStorageService,
         IOptionsMonitor<KpiConfiguration> kpiConfiguration,
         IOptionsMonitor<ReportingConfiguration> reportingConfiguration,
-        IAdminApi adminApi,
-        IProjectQuotaApi projectQuotaApi
+        IAdminApi adminApi
     )
     {
         _mapper = mapper;
@@ -47,7 +45,6 @@ public class ProjectReporting
         ReportingFileName = _kpiConfiguration.ProjectKpi.FileName;
 
         _adminApi = adminApi;
-        _projectQuotaApi = projectQuotaApi;
     }
 
     public async Task<bool> RunAsync(ProjectReportingOptions reportingOptions)

src/KpiGenerator/Reportings/Resource/ResourceReporting.cs

@@ -50,7 +50,7 @@ public class ResourceReporting
             BasePath = $"{_reportingConfiguration.Endpoint.TrimEnd('/')}/coscine",
             ApiKeyPrefix = { { "Authorization", "Bearer" } },
             ApiKey = { { "Authorization", _reportingConfiguration.ApiKey } },
-            Timeout = 300000 // 5 minutes
+            Timeout = TimeSpan.FromSeconds(300) // 5 minutes
         };
 
         _adminApi = adminApi;