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
Compare revisions
v0.1.14 to v0.1.15
Compare revisions
Changes are shown as if the
source
revision was being merged into the
target
revision.
Learn more about comparing revisions.
Source
coscine/backend/scripts/kpi-generator
Select target project
No results found
v0.1.15
Select Git revision
Loading items
Swap
Target
coscine/backend/scripts/kpi-generator
Select target project
coscine/backend/scripts/kpi-generator
1 result
v0.1.14
Select Git revision
Loading items
Show changes
Only incoming changes from source
Include changes to target since source was created
Compare
Commits on Source (2)
Fix: Generate per organization
· aa1e01f6
Petar Hristov
authored
2 years ago
aa1e01f6
Chore: 0.1.15
· 39326837
CoscineBot
authored
2 years ago
# [0.1.15](
v0.1.14...v0.1.15
) (2023-01-06) ## Fix * Generate per organization
39326837
Show whitespace changes
Inline
Side-by-side
Showing
2 changed files
src/KPI Generator/KPI Generator.csproj
+1
-1
1 addition, 1 deletion
src/KPI Generator/KPI Generator.csproj
src/KPI Generator/Reportings/User/UserReporting.cs
+5
-14
5 additions, 14 deletions
src/KPI Generator/Reportings/User/UserReporting.cs
with
6 additions
and
15 deletions
src/KPI Generator/KPI Generator.csproj
View file @
39326837
...
...
@@ -7,7 +7,7 @@
<AssemblyName>Coscine.KpiGenerator</AssemblyName>
<ImplicitUsings>enable</ImplicitUsings>
<Nullable>enable</Nullable>
<Version>0.1.1
4
</Version>
<Version>0.1.1
5
</Version>
</PropertyGroup>
<PropertyGroup>
...
...
This diff is collapsed.
Click to expand it.
src/KPI Generator/Reportings/User/UserReporting.cs
View file @
39326837
...
...
@@ -3,6 +3,7 @@ using Coscine.Database.Models;
using
Coscine.Database.ReturnObjects
;
using
Coscine.KpiGenerator.Utils
;
using
Coscine.Metadata
;
using
LinqToDB.Common
;
using
Microsoft.Extensions.Logging
;
using
Newtonsoft.Json
;
using
NLog.Extensions.Logging
;
...
...
@@ -15,19 +16,16 @@ public class UserReporting : Reporting<UserReportingOptions>
{
private
readonly
ILogger
<
UserReporting
>
_logger
;
private
readonly
ExternalAuthenticatorModel
_externalAuthenticatorModel
;
private
readonly
ExternalIdModel
_externalIdModel
;
private
readonly
ProjectRoleModel
_projectRoleModel
;
private
readonly
ProjectModel
_projectModel
;
private
readonly
RoleModel
_roleModel
;
private
readonly
UserModel
_userModel
;
private
readonly
LogModel
_logModel
;
private
readonly
IEnumerable
<
ExternalAuthenticator
>
_loginProviders
;
public
UserReporting
(
UserReportingOptions
options
)
:
base
(
options
)
{
ReportingFileName
=
"users.json"
;
_externalAuthenticatorModel
=
new
ExternalAuthenticatorModel
();
_externalIdModel
=
new
ExternalIdModel
();
_projectRoleModel
=
new
ProjectRoleModel
();
_projectModel
=
new
ProjectModel
();
...
...
@@ -35,7 +33,6 @@ public class UserReporting : Reporting<UserReportingOptions>
_userModel
=
new
UserModel
();
_logModel
=
new
LogModel
();
_loginProviders
=
_externalAuthenticatorModel
.
GetAll
();
_logger
=
LoggerFactory
.
Create
(
builder
=>
builder
.
AddNLog
()).
CreateLogger
<
UserReporting
>();
}
...
...
@@ -90,23 +87,17 @@ public class UserReporting : Reporting<UserReportingOptions>
var
organizationsFromUsers
=
GetTopLevelOrganizationsFromEntries
(
returnObjects
.
SelectMany
(
ro
=>
ro
.
Organizations
));
foreach
(
var
entry
in
organizationsFromUsers
)
{
var
organization
=
Organizations
.
Find
(
o
=>
o
.
RorUrl
.
Equals
(
entry
.
RorUrl
));
if
(
organization
is
null
)
{
organization
=
_otherOrganization
;
Console
.
WriteLine
(
$" WARNING!: Organization \"
{
entry
.
RorUrl
}
\" could not be correctly identified. Will use \"
{
_otherOrganization
.
RorUrl
}
\"."
);
_logger
.
LogWarning
(
"Organization {ror} could not be correctly identified."
,
entry
.
RorUrl
);
}
var
returnObjectsForOrganization
=
returnObjects
.
Where
(
ro
=>
ro
.
Organizations
.
Select
(
o
=>
o
.
RorUrl
).
Any
(
e
=>
e
.
Contains
(
entry
.
RorUrl
))).
ToList
();
var
reportingFile
=
new
ReportingFileObject
{
Path
=
GetReportingPathOrganization
(
organization
.
RorUrl
,
ReportingFileName
),
Path
=
GetReportingPathOrganization
(
entry
.
RorUrl
,
ReportingFileName
),
Content
=
ConvertStringContentsToStream
(
JsonConvert
.
SerializeObject
(
returnObjectsForOrganization
,
Formatting
.
Indented
))
};
reportingFilesPerOrganization
.
Add
(
reportingFile
);
Console
.
WriteLine
(
$" -
{
GetType
().
Name
}
: \"
{
GetReportingPathOrganization
(
organization
.
RorUrl
,
ReportingFileName
)}
\" generated successfully"
);
Console
.
WriteLine
(
$" -
{
GetType
().
Name
}
: \"
{
GetReportingPathOrganization
(
entry
.
RorUrl
,
ReportingFileName
)}
\" generated successfully"
);
_logger
.
LogInformation
(
"{Name}: Generated successfully {ReportingFile}."
,
GetType
().
Name
,
reportingFile
);
}
return
reportingFilesPerOrganization
;
...
...
This diff is collapsed.
Click to expand it.