Skip to content
GitLab
Explore
Sign in
Primary navigation
Search or go to…
Project
K
KPI Reporting Generator
Manage
Activity
Members
Labels
Plan
Wiki
Code
Merge requests
Repository
Branches
Commits
Tags
Repository graph
Compare revisions
Locked files
Build
Pipelines
Jobs
Pipeline schedules
Artifacts
Deploy
Releases
Package registry
Container registry
Model registry
Operate
Environments
Terraform modules
Analyze
Value stream analytics
Contributor analytics
CI/CD analytics
Repository analytics
Code review analytics
Insights
Model experiments
Help
Help
Support
GitLab documentation
Compare GitLab plans
GitLab community forum
Contribute to GitLab
Provide feedback
Terms and privacy
Keyboard shortcuts
?
Snippets
Groups
Projects
Show more breadcrumbs
Coscine
backend
scripts
KPI Reporting Generator
Commits
3e6c04eb
Commit
3e6c04eb
authored
2 years ago
by
CoscineBot
Browse files
Options
Downloads
Patches
Plain Diff
Fix: Organization and Institutes
parent
aeb96fe0
No related branches found
No related tags found
1 merge request
!22
Fix: Organizations could contain the information of Institutes
Pipeline
#870189
passed
2 years ago
Stage: build
Changes
2
Pipelines
1
Show whitespace changes
Inline
Side-by-side
Showing
2 changed files
src/KPI Generator/Reporting.cs
+0
-2
0 additions, 2 deletions
src/KPI Generator/Reporting.cs
src/KPI Generator/Reportings/User/UserReporting.cs
+10
-0
10 additions, 0 deletions
src/KPI Generator/Reportings/User/UserReporting.cs
with
10 additions
and
2 deletions
src/KPI Generator/Reporting.cs
+
0
−
2
View file @
3e6c04eb
...
...
@@ -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
};
...
...
This diff is collapsed.
Click to expand it.
src/KPI Generator/Reportings/User/UserReporting.cs
+
10
−
0
View file @
3e6c04eb
...
...
@@ -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
:
...
...
This diff is collapsed.
Click to expand it.
Preview
0%
Loading
Try again
or
attach a new file
.
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Save comment
Cancel
Please
register
or
sign in
to comment