From 7e6f14b3b68a8633c7d9772b161b512af969e1a7 Mon Sep 17 00:00:00 2001
From: Petar Hristov <hristov@itc.rwth-aachen.de>
Date: Wed, 5 Oct 2022 16:24:15 +0200
Subject: [PATCH] Orgas

---
 .../Reportings/Project/ProjectReporting.cs    | 19 +++++++------------
 .../Reportings/Project/ReturnObject.cs        |  2 +-
 2 files changed, 8 insertions(+), 13 deletions(-)

diff --git a/src/KPI Generator/Reportings/Project/ProjectReporting.cs b/src/KPI Generator/Reportings/Project/ProjectReporting.cs
index d1d32fb..e3fd25a 100644
--- a/src/KPI Generator/Reportings/Project/ProjectReporting.cs	
+++ b/src/KPI Generator/Reportings/Project/ProjectReporting.cs	
@@ -55,7 +55,7 @@ public class ProjectReporting : Reporting<ProjectReportingOptions>
             {
                 Id = projectReturnObject.Id,
                 DateCreated = projectReturnObject.DateCreated,
-                Organizations = GetOrganizations(projectReturnObject.Id),
+                Organizations = GetOrganizations(projectReturnObject),
                 Disciplines = projectReturnObject.Disciplines.ToList(),
                 Deleted = projectReturnObject.Deleted,
                 ProjectVisibilityId = projectReturnObject.Visibility.Id,
@@ -90,25 +90,20 @@ public class ProjectReporting : Reporting<ProjectReportingOptions>
         return reportingFilesPerOrganization;
     }
 
-    private IEnumerable<ProjectQuotaReturnObject> GetResourceTypeQuota(Guid projectId)
+    private List<ProjectQuotaReturnObject> GetResourceTypeQuota(Guid projectId)
     {
-        var resourceTypes = _resourceTypeModel.GetAllWhere(x => x.Enabled == true);
+        var resourceTypes = _resourceTypeModel.GetAllWhere(x => x.Enabled == true && x.);
 
-        return resourceTypes.Select(x => Helpers.CreateProjectQuotaReturnObject(x, projectId));
+        return resourceTypes.Select(x => Helpers.CreateProjectQuotaReturnObject(x, projectId)).ToList();
     }
 
-    private List<Organization> GetOrganizations(Guid projectID)
+    private List<Organization> GetOrganizations(ProjectObject project)
     {
         var result = new List<Organization>();
-        var projectInstituteModel = new ProjectInstituteModel();
-        var organizations = from projectInstitute in projectInstituteModel.GetAllWhere((ProjectInstitute projectInstitute) => projectInstitute.ProjectId == projectID)
-                            select projectInstitute.OrganizationUrl;
-
-        foreach (var entry in organizations)
+        foreach (var entry in project.Organizations)
         {
-            result.Add(FetchOrganizationByRor(entry));
+            result.Add(FetchOrganizationByRor(entry.Url));
         }
-
         return result;
     }
 }
\ No newline at end of file
diff --git a/src/KPI Generator/Reportings/Project/ReturnObject.cs b/src/KPI Generator/Reportings/Project/ReturnObject.cs
index ada8c9b..c38577f 100644
--- a/src/KPI Generator/Reportings/Project/ReturnObject.cs	
+++ b/src/KPI Generator/Reportings/Project/ReturnObject.cs	
@@ -16,5 +16,5 @@ public class ReturnObject
     public Guid ProjectVisibilityId { get; set; }
     public string? GrantId { get; set; }
     public int? Members { get; set; } = null;
-    public IEnumerable<ProjectQuotaReturnObject> ResourceTypeQuota { get; set; } = null!;
+    public List<ProjectQuotaReturnObject> ResourceTypeQuota { get; set; } = new();
 }
\ No newline at end of file
-- 
GitLab