src/KPI Generator/KPI Generator.csproj

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

src/KPI Generator/Reporting.cs

@@ -287,12 +287,16 @@ public abstract class Reporting<O> where O : class
             "
         };
         using var results = RdfStoreConnector.QueryEndpoint.QueryWithResultSet(_queryString.ToString());
+        if (!results.IsEmpty)
+        {
             var inst = results.Select(x => x.Value("inst").ToString()).ToList()[0];   // Get the value for ?inst
             if (!string.IsNullOrWhiteSpace(inst))
             {
                 Console.WriteLine($"   Organization {organization} found to match {inst}");
-            organization = inst;
+                return inst;
+            }
         }
+        Console.WriteLine($"   Could not find match for {organization}");
         return organization;
     }
 }
\ No newline at end of file

src/KPI Generator/Reportings/Project/ProjectReporting.cs

-using AngleSharp.Dom;
-using Coscine.Database.DataModel;
+using Coscine.Database.DataModel;
 using Coscine.Database.Models;
 using Coscine.Database.ReturnObjects;
 using Coscine.ResourceTypes;

src/KPI Generator/Reportings/System/ReturnObject.cs

@@ -5,5 +5,5 @@
 /// </summary>
 public class ReturnObject
 {
-    public List<MaintenanceBannerObject> Banners { get; set; } = new();
+    public List<MaintenanceBannerObject>? Banners { get; set; } = new();
 }
\ No newline at end of file

src/KPI Generator/Reportings/System/SystemReporting.cs

@@ -44,7 +44,7 @@ public class SystemReporting : Reporting<SystemReportingOptions>
         };
     }
 
-    private async Task<List<MaintenanceBannerObject>> GetMaintenanceBannersAsync()
+    private async Task<List<MaintenanceBannerObject>?> GetMaintenanceBannersAsync()
     {
         var httpClient = new HttpClient();
         var requestMessage = new HttpRequestMessage()
@@ -60,6 +60,10 @@ public class SystemReporting : Reporting<SystemReportingOptions>
 
         var result = await httpClient.SendAsync(requestMessage);
         var responseBody = JsonConvert.DeserializeObject<List<MaintenanceBannerObject>>(result.Content.ReadAsStringAsync().Result);
+        if (responseBody is null)
+        {
+            return null;
+        }
         return responseBody.OrderBy(e => e.StartAt).ToList();
     }
 }

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

@@ -188,8 +188,11 @@ public class UserReporting : Reporting<UserReportingOptions>
             {
                 Console.WriteLine($"   No {searchedEntityType} found for user with ID \"{id}\" and login provider {orcidLoginProvider.DisplayName}");
             }
+            else
+            {
                 result.Add(orgOrcid);
             }
+        }
 
         return result.DistinctBy(e => e.RorUrl).ToList();
     }