WIP: Resource and user

src/KPI Generator/MappingProfiles/MappingProfiles.cs

@@ -33,19 +33,19 @@ public class MappingProfiles : Profile
             .ForMember(rr => rr.ResourceQuota, opt => opt.Ignore())
             .ForMember(rr => rr.ResourceType, opt => opt.MapFrom(dto => dto.Type.SpecificType));
 
-        CreateMap<UserAdminDto, UserReport>()
+        CreateMap<UserDto, UserReport>()
             .ForMember(ur => ur.Disciplines, opt => opt.MapFrom(dto => dto.Disciplines))
             .ForMember(ur => ur.Institutes, opt => opt.MapFrom(dto => dto.Institutes))
             .ForMember(ur => ur.LatestActivity, opt => opt.Ignore())
-            .ForMember(ur => ur.LoginProviders, opt => opt.MapFrom(dto => dto.LoginProviders))
+            .ForMember(ur => ur.LoginProviders, opt => opt.MapFrom(dto => dto.Identities))
             .ForMember(ur => ur.Organizations, opt => opt.MapFrom(dto => dto.Organizations))
-            .ForMember(ur => ur.RelatedProjects, opt => opt.MapFrom(dto => dto.ProjectRoles));
+            .ForMember(ur => ur.RelatedProjects, opt => opt.Ignore());
 
         CreateMap<ProjectRoleDto, RelatedProject>()
             .ForMember(rp => rp.ProjectId, opt => opt.MapFrom(dto => dto.Project.Id))
             .ForMember(rp => rp.Role, opt => opt.MapFrom(dto => dto.Role.DisplayName));
 
-        CreateMap<LoginProviderDtp, LoginProvider>()
+        CreateMap<IdentityProviderDto, LoginProvider>()
             .ForMember(lp => lp.Id, opt => opt.MapFrom(dto => dto.Id))
             .ForMember(lp => lp.DisplayName, opt => opt.MapFrom(dto => dto.DisplayName));
 

src/KPI Generator/Program.cs

@@ -38,7 +38,7 @@ public class Program
                 //(CompleteReportingOptions opts) => _serviceProvider.GetRequiredService<CompleteReporting>().Run(opts),
                 (ProjectReportingOptions opts) => _serviceProvider.GetRequiredService<ProjectReporting>().RunAsync(opts).Result,
                 (ResourceReportingOptions opts) => _serviceProvider.GetRequiredService<ResourceReporting>().RunAsync(opts).Result,
-                //(UserReportingOptions opts) => _serviceProvider.GetRequiredService<UserReporting>().Run(opts),
+                (UserReportingOptions opts) => _serviceProvider.GetRequiredService<UserReporting>().RunAsync(opts).Result,
                 //(ApplicationProfileReportingOptions opts) => _serviceProvider.GetRequiredService<ApplicationProfileReporting>().Run(opts),
                 //(SystemReportingOptions opts) => _serviceProvider.GetRequiredService<SystemReporting>().Run(opts),
                 HandleParseError
@@ -121,7 +121,7 @@ public class Program
         //services.AddTransient<CompleteReporting>();
         services.AddTransient<ProjectReporting>();
         services.AddTransient<ResourceReporting>();
-        //services.AddTransient<UserReporting>();
+        services.AddTransient<UserReporting>();
         //services.AddTransient<ApplicationProfileReporting>();
         //services.AddTransient<SystemReporting>();
 

src/KPI Generator/Reportings/Resource/ResourceReporting.cs

@@ -56,7 +56,7 @@ public class ResourceReporting
 
         foreach (var returnObject in returnObjects)
         {
-            // TODO: Fix User issue
+            // TODO: Fix User issue in the context of project quota
             var quota = await ProjectResourceQuotaApi.GetQuotaForResourceForProjectAsync(returnObject.RelatedProjectId, new Guid(returnObject.Id));
             var project = await ProjectApi.GetProjectAsync(returnObject.RelatedProjectId);
 

src/KPI Generator/Reportings/User/ResourceReporting.cs → src/KPI Generator/Reportings/User/UserReporting.cs

@@ -2,6 +2,7 @@
 using Coscine.ApiClient;
 using Coscine.ApiClient.Core.Api;
 using Coscine.ApiClient.Core.Client;
+using Coscine.ApiClient.Core.Model;
 using Coscine.KpiGenerator.Models;
 using Coscine.KpiGenerator.Utils;
 using Newtonsoft.Json;
@@ -45,12 +46,14 @@ public class UserReporting
 
     public async Task<IEnumerable<ReportingFileObject>> GenerateReportingAsync()
     {
-        var users = await RequestUtil.WrapPagedRequest<UserAdminDtoPagedResponse, UserAdminDto>(
+        var users = await RequestUtil.WrapPagedRequest<UserDtoPagedResponse, UserDto>(
             (currentPage) => AdminApi.GetAllUsersAsync(pageNumber: currentPage, pageSize: 150));
 
         var reportingFiles = new List<ReportingFileObject>();
         var returnObjects = _mapper.Map<List<UserReport>>(users);
 
+        // TODO: Map latest activity and related projects
+
         // General File
         reportingFiles.Add(new ReportingFileObject
         {