src/KPI Generator/KPI Generator.csproj

@@ -7,7 +7,7 @@
 		<AssemblyName>Coscine.KpiGenerator</AssemblyName>
 		<ImplicitUsings>enable</ImplicitUsings>
 		<Nullable>enable</Nullable>
-		<Version>0.1.14</Version>
+		<Version>0.1.15</Version>
 	</PropertyGroup>
 
 	<PropertyGroup>

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

@@ -3,6 +3,7 @@ using Coscine.Database.Models;
 using Coscine.Database.ReturnObjects;
 using Coscine.KpiGenerator.Utils;
 using Coscine.Metadata;
+using LinqToDB.Common;
 using Microsoft.Extensions.Logging;
 using Newtonsoft.Json;
 using NLog.Extensions.Logging;
@@ -15,19 +16,16 @@ public class UserReporting : Reporting<UserReportingOptions>
 {
     private readonly ILogger<UserReporting> _logger;
 
-    private readonly ExternalAuthenticatorModel _externalAuthenticatorModel;
     private readonly ExternalIdModel _externalIdModel;
     private readonly ProjectRoleModel _projectRoleModel;
     private readonly ProjectModel _projectModel;
     private readonly RoleModel _roleModel;
     private readonly UserModel _userModel;
     private readonly LogModel _logModel;
-    private readonly IEnumerable<ExternalAuthenticator> _loginProviders;
 
     public UserReporting(UserReportingOptions options) : base(options)
     {
         ReportingFileName = "users.json";
-        _externalAuthenticatorModel = new ExternalAuthenticatorModel();
         _externalIdModel = new ExternalIdModel();
         _projectRoleModel = new ProjectRoleModel();
         _projectModel = new ProjectModel();
@@ -35,7 +33,6 @@ public class UserReporting : Reporting<UserReportingOptions>
         _userModel = new UserModel();
         _logModel = new LogModel();
 
-        _loginProviders = _externalAuthenticatorModel.GetAll();
         _logger = LoggerFactory.Create(builder => builder.AddNLog()).CreateLogger<UserReporting>();
     }
 
@@ -90,23 +87,17 @@ public class UserReporting : Reporting<UserReportingOptions>
         var organizationsFromUsers = GetTopLevelOrganizationsFromEntries(returnObjects.SelectMany(ro => ro.Organizations));
         foreach (var entry in organizationsFromUsers)
         {
-            var organization = Organizations.Find(o => o.RorUrl.Equals(entry.RorUrl));
-            if (organization is null)
-            {
-                organization = _otherOrganization;
-                Console.WriteLine($"   WARNING!: Organization \"{entry.RorUrl}\" could not be correctly identified. Will use \"{_otherOrganization.RorUrl}\".");
-                _logger.LogWarning("Organization {ror} could not be correctly identified.", entry.RorUrl);
-            }
-
             var returnObjectsForOrganization = returnObjects.Where(ro => ro.Organizations.Select(o => o.RorUrl).Any(e => e.Contains(entry.RorUrl))).ToList();
 
             var reportingFile = new ReportingFileObject
             {
-                Path = GetReportingPathOrganization(organization.RorUrl, ReportingFileName),
+                Path = GetReportingPathOrganization(entry.RorUrl, ReportingFileName),
                 Content = ConvertStringContentsToStream(JsonConvert.SerializeObject(returnObjectsForOrganization, Formatting.Indented))
             };
+
             reportingFilesPerOrganization.Add(reportingFile);
-            Console.WriteLine($" - {GetType().Name}: \"{GetReportingPathOrganization(organization.RorUrl, ReportingFileName)}\" generated successfully");
+
+            Console.WriteLine($" - {GetType().Name}: \"{GetReportingPathOrganization(entry.RorUrl, ReportingFileName)}\" generated successfully");
             _logger.LogInformation("{Name}: Generated successfully {ReportingFile}.", GetType().Name, reportingFile);
         }
         return reportingFilesPerOrganization;