src/KPI Generator/KPI Generator.csproj

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

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

 using Coscine.Database.Models;
-using Coscine.Database.ReturnObjects;
 using Coscine.KpiGenerator.Utils;
 using Coscine.ResourceTypes;
 using Coscine.ResourceTypes.Base;
@@ -111,7 +110,7 @@ public class ResourceReporting : Reporting<ResourceReportingOptions>
         }
     }
 
-    private ResourceQuotaReturnObject? GetResourceQuota(Database.DataModel.Resource resource)
+    private QuotaReturnObject? GetResourceQuota(Database.DataModel.Resource resource)
     {
         BaseResourceType? resourceTypeDefinition;
         try
@@ -128,7 +127,8 @@ public class ResourceReporting : Reporting<ResourceReportingOptions>
         {
             try
             {
-                return ResourceTypes.Helpers.CreateResourceQuotaReturnObject(resource, resourceTypeDefinition);
+                var quota = ResourceTypes.Helpers.CreateResourceQuotaReturnObject(resource, resourceTypeDefinition);
+                return new QuotaReturnObject(quota);
             }
             catch (Exception ex)
             {

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

@@ -19,6 +19,21 @@ public class ReturnObject
     public List<DisciplineObject> Disciplines { get; set; } = new();
     public string? License { get; set; } = null;
     public string ApplicationProfile { get; set; } = null!;
-    public ResourceQuotaReturnObject? ResourceQuota { get; set; } = null!;
+    public QuotaReturnObject? ResourceQuota { get; set; } = null!;
+}
+
+public class QuotaReturnObject
+{
+    public Guid Id { get; set; }
+    public QuotaDimObject Used { get; set; } = null!;
+    public float UsedPercentage { get; set; }
+    public QuotaDimObject Reserved { get; set; } = null!;
 
+    public QuotaReturnObject(ResourceQuotaReturnObject resourceQuotaReturnObject)
+    {
+        Id = resourceQuotaReturnObject.Id;
+        Used = resourceQuotaReturnObject.Used;
+        UsedPercentage = resourceQuotaReturnObject.UsedPercentage;
+        Reserved = resourceQuotaReturnObject.Reserved;
+    }
 }

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

@@ -5,7 +5,6 @@ using Coscine.Metadata;
 using Microsoft.Extensions.Logging;
 using Newtonsoft.Json;
 using NLog.Extensions.Logging;
-using System.Collections.Generic;
 using VDS.RDF.Query;
 using static KPIGenerator.Utils.CommandLineOptions;