Compare revisions

Changes are shown as if the source revision was being merged into the target revision. Learn more about comparing revisions.

Source

Target

Show changes

Only incoming changes from source

Include changes to target after source was created

Commits on Source 3

Fix: Organizations could contain the information of Institutes · 97767e2a
Petar Hristov authored Dec 13, 2022

97767e2a
Merge branch 'Fix/xxxx-organization' into 'main' · 5c6dfbaf
Petar Hristov authored Dec 13, 2022
```
Fix: Organizations could contain the information of Institutes

See merge request !22
```
5c6dfbaf

Chore: 0.1.11 · 930dcabd

CoscineBot authored Dec 13, 2022

# [0.1.11](v0.1.10...v0.1.11) (2022-12-13)

## Fix
* Organizations could contain the information of Institutes
* Organizations could contain the information of Institutes

930dcabd

src/KPI Generator/KPI Generator.csproj

+1
−1

Original line number
Diff line number
Diff line

@@ -7,7 +7,7 @@

		<AssemblyName>Coscine.KpiGenerator</AssemblyName>

		<ImplicitUsings>enable</ImplicitUsings>

		<Nullable>enable</Nullable>

		<Version>0.1.10</Version>

		<Version>0.1.11</Version>

	</PropertyGroup>

	<PropertyGroup>

src/KPI Generator/Reporting.cs

+0
−2

Original line number
Diff line number
Diff line

@@ -19,7 +19,6 @@ public abstract class Reporting<O> where O : class

    public GitLabClient GitLabClient { get; set; }

    public List<Organization> Organizations { get; set; }

    public RdfStoreConnector RdfStoreConnector { get; init; }

    public SparqlRemoteEndpoint QueryEndpoint { get; init; }

    public ConsulConfiguration Configuration { get; }

    private static string HostUrl { get; } = "https://git.rwth-aachen.de/";

    private static string InstanceName { get; set; } = null!;

@@ -45,7 +44,6 @@ public abstract class Reporting<O> where O : class

        Options = options;

        Configuration = new ConsulConfiguration();

        RdfStoreConnector = new RdfStoreConnector(Configuration.GetStringAndWait("coscine/local/virtuoso/additional/url"));

        QueryEndpoint = new SparqlRemoteEndpoint(new Uri(Configuration.GetStringAndWait("coscine/local/virtuoso/additional/url")));

        GitLabClient = new GitLabClient(HostUrl, Configuration.GetStringAndWait("coscine/global/gitlabtoken"));

        Organizations = new List<Organization>() { _otherOrganization };

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

+10
−0

Original line number
Diff line number
Diff line

@@ -171,6 +171,16 @@ public class UserReporting : Reporting<UserReportingOptions>

                            Console.WriteLine($"   No {searchedEntityType} found for user with ID \"{id}\" and login provider {loginProvider.DisplayName}");

                            continue;

                        }

                        if (orgShibboleth.RorUrl.Contains('#'))

                        {

                            var orgTopLevelRor = orgShibboleth.RorUrl[..orgShibboleth.RorUrl.IndexOf('#')];

                            var orgTopLevel = FetchOrganizationByRor(orgTopLevelRor);

                            if (!orgTopLevel.RorUrl.Equals(_otherOrganization.RorUrl))

                            {

                                result.Add(orgTopLevel);

                                break;

                            }

                        }

                        result.Add(orgShibboleth);

                        break;

                    default:

Source

Target

Files