diff --git a/src/KpiGenerator/Reportings/Project/ProjectReporting.cs b/src/KpiGenerator/Reportings/Project/ProjectReporting.cs index e8bee5ee1d5235deb95e48cac58a5b1ed03fe0da..fd98154f5b31dc2773782ce480686c2b5533ee9a 100644 --- a/src/KpiGenerator/Reportings/Project/ProjectReporting.cs +++ b/src/KpiGenerator/Reportings/Project/ProjectReporting.cs @@ -82,7 +82,11 @@ public class ProjectReporting { _logger.LogDebug("Working on projects asynchronously..."); var projects = PaginationHelper.GetAllAsync<ProjectAdminDtoPagedResponse, ProjectAdminDto>( - (currentPage) => _adminApi.GetAllProjectsAsync(includeDeleted: false, includeQuotas: true, includePublicationRequests: true, pageNumber: currentPage, pageSize: 50)); + (currentPage) => + { + _logger.LogDebug("Getting page {page} of projects...", currentPage); + return _adminApi.GetAllProjectsAsync(includeDeleted: false, includeQuotas: true, includePublicationRequests: true, pageNumber: currentPage, pageSize: 50); + }); var reportingFiles = new List<ReportingFileObject>(); var returnObjects = new List<ProjectReport>(); diff --git a/src/KpiGenerator/Reportings/Resource/ResourceReporting.cs b/src/KpiGenerator/Reportings/Resource/ResourceReporting.cs index 48fb60b78c12173a504a2c19233f4601be17f7be..f13df44b91c4dafe2c4ca2693fb84550eb330955 100644 --- a/src/KpiGenerator/Reportings/Resource/ResourceReporting.cs +++ b/src/KpiGenerator/Reportings/Resource/ResourceReporting.cs @@ -44,15 +44,6 @@ public class ResourceReporting _kpiConfiguration = kpiConfiguration.CurrentValue; _reportingConfiguration = reportingConfiguration.CurrentValue; ReportingFileName = _kpiConfiguration.ResourceKpi.FileName; - - var configuration = new Configuration() - { - BasePath = $"{_reportingConfiguration.Endpoint.TrimEnd('/')}/coscine", - ApiKeyPrefix = { { "Authorization", "Bearer" } }, - ApiKey = { { "Authorization", _reportingConfiguration.ApiKey } }, - Timeout = TimeSpan.FromSeconds(300) // 5 minutes - }; - _adminApi = adminApi; } @@ -90,12 +81,20 @@ public class ResourceReporting { _logger.LogDebug("Getting all projects..."); var projects = await PaginationHelper.GetAllAsync<ProjectAdminDtoPagedResponse, ProjectAdminDto>( - (currentPage) => _adminApi.GetAllProjectsAsync(includeDeleted: true, pageNumber: currentPage, pageSize: 50)).ToListAsync(); + (currentPage) => + { + _logger.LogDebug("Getting page {page} of projects...", currentPage); + return _adminApi.GetAllProjectsAsync(includeDeleted: true, pageNumber: currentPage, pageSize: 50); + }).ToListAsync(); _logger.LogDebug("Got all projects."); _logger.LogDebug("Working on resources asynchronously..."); var resources = PaginationHelper.GetAllAsync<ResourceAdminDtoPagedResponse, ResourceAdminDto>( - (currentPage) => _adminApi.GetAllResourcesAsync(includeDeleted: false, includeQuotas: true, pageNumber: currentPage, pageSize: 50)); + (currentPage) => + { + _logger.LogDebug("Getting page {page} of resources...", currentPage); + return _adminApi.GetAllResourcesAsync(includeDeleted: false, includeQuotas: true, pageNumber: currentPage, pageSize: 50); + }); var reportingFiles = new List<ReportingFileObject>(); var returnObjects = new List<ResourceReport>(); diff --git a/src/KpiGenerator/Reportings/User/UserReporting.cs b/src/KpiGenerator/Reportings/User/UserReporting.cs index 8db2ad4d1e6c4720e521f501d80a401e2d6bbda6..65867cae53e192dc6c83a781681eeb2ed1d9a8f8 100644 --- a/src/KpiGenerator/Reportings/User/UserReporting.cs +++ b/src/KpiGenerator/Reportings/User/UserReporting.cs @@ -94,7 +94,11 @@ public class UserReporting _logger.LogDebug("Working on users asynchronously..."); var users = PaginationHelper.GetAllAsync<UserDtoPagedResponse, UserDto>( - (currentPage) => _adminApi.GetAllUsersAsync(tosAccepted: true, pageNumber: currentPage, pageSize: 50)); + (currentPage) => + { + _logger.LogDebug("Getting page {page} of users...", currentPage); + return _adminApi.GetAllUsersAsync(tosAccepted: true, pageNumber: currentPage, pageSize: 50); + }); var reportingFiles = new List<ReportingFileObject>(); var returnObjects = new List<UserReport>();