Release: Sprint/2022 23

This Merge Request is automatically created

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

@@ -62,7 +62,7 @@ public class ProjectReporting : Reporting<ProjectReportingOptions>
                 Organizations = GetOrganizations(projectReturnObject),
                 Disciplines = projectReturnObject.Disciplines.ToList(),
                 Deleted = projectReturnObject.Deleted,
-                ProjectVisibilityId = projectReturnObject.Visibility.Id,
+                ProjectVisibility = projectReturnObject.Visibility,
                 GrantId = projectReturnObject.GrantId,
                 Users = _projectRoleModel.GetAllWhere(x => x.ProjectId == projectReturnObject.Id).Count(),
                 ResourceTypeQuota = GetResourceTypeQuota(projectReturnObject.Id)
@@ -86,11 +86,6 @@ public class ProjectReporting : Reporting<ProjectReportingOptions>
             }
 
             var returnObjectsForOrganization = returnObjects.Where(ro => ro.Organizations.Select(o => o.RorUrl).Any(e => e.Contains(entry.RorUrl))).ToList();
-            // Additional condition to process old RWTH Entries (Could be removed after entries in virtuoso are migrated to their correct RoRs)
-            if (entry.RorUrl.Equals(RwthRor))
-            {
-                returnObjectsForOrganization.AddRange(returnObjects.Where(ro => ro.Organizations.Select(o => o.RorUrl).Any(e => e.Contains("www.rwth-aachen.de"))).ToList());
-            }
 
             reportingFilesPerOrganization.Add(new ReportingFileObject
             {