Skip to content
Snippets Groups Projects

Compare revisions

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

Source

Select target project
No results found
Select Git revision
  • Hotfix/1316-nullCheck
  • Hotfix/1357-ymlFile
  • Hotfix/1370-swaggerDescription
  • Hotfix/1516-pidFix
  • Hotfix/2087-efNet6
  • Hotfix/82-updateDepsOfAPIs
  • Issue/1321-pidEnquiryOverhaul
  • Issue/1910-MigrationtoNET6.0
  • Issue/2259-updatePids
  • Issue/2309-docs
  • Product/1116-pidApiExtension
  • Product/1188-LoggingExtended
  • Product/1287-dotnet5Sharepoint
  • Product/789-userContactEmail
  • Sprint/2020-20
  • Sprint/2020-21
  • Sprint/2020-22
  • Sprint/2021-01
  • Sprint/2021-02
  • Sprint/2021-04
  • Sprint/2021-05
  • Sprint/2021-08
  • Sprint/2021-11
  • Sprint/2021-23
  • Sprint/2022-01
  • Topic/1202-pidApiExtension
  • Topic/1221-LogginExtendedNew
  • Topic/1221-LoggingExtended
  • Topic/1294-contactChangeFunctionality
  • Topic/1335-dotnet5Apis
  • dev
  • gitkeep
  • master
  • product/1182-testsForPidApi
  • topic/1203-testForPidApi
  • v1.1.0
  • v1.1.1
  • v1.1.2
  • v1.2.0
  • v1.2.1
  • v2.0.0
  • v2.0.1
  • v2.1.0
  • v2.2.0
  • v2.2.1
  • v2.2.2
  • v2.2.3
  • v2.2.4
  • v2.2.5
  • v2.2.6
  • v2.3.0
  • v2.3.1
  • v2.3.2
  • v2.4.0
  • v2.4.1
  • v2.4.2
56 results

Target

Select target project
  • coscine/backend/apis/pid
1 result
Select Git revision
  • Hotfix/1316-nullCheck
  • Hotfix/1357-ymlFile
  • Hotfix/1370-swaggerDescription
  • Hotfix/1516-pidFix
  • Hotfix/2087-efNet6
  • Hotfix/82-updateDepsOfAPIs
  • Issue/1321-pidEnquiryOverhaul
  • Issue/1910-MigrationtoNET6.0
  • Issue/2259-updatePids
  • Issue/2309-docs
  • Product/1116-pidApiExtension
  • Product/1188-LoggingExtended
  • Product/1287-dotnet5Sharepoint
  • Product/789-userContactEmail
  • Sprint/2020-20
  • Sprint/2020-21
  • Sprint/2020-22
  • Sprint/2021-01
  • Sprint/2021-02
  • Sprint/2021-04
  • Sprint/2021-05
  • Sprint/2021-08
  • Sprint/2021-11
  • Sprint/2021-23
  • Sprint/2022-01
  • Topic/1202-pidApiExtension
  • Topic/1221-LogginExtendedNew
  • Topic/1221-LoggingExtended
  • Topic/1294-contactChangeFunctionality
  • Topic/1335-dotnet5Apis
  • dev
  • gitkeep
  • master
  • product/1182-testsForPidApi
  • topic/1203-testForPidApi
  • v1.1.0
  • v1.1.1
  • v1.1.2
  • v1.2.0
  • v1.2.1
  • v2.0.0
  • v2.0.1
  • v2.1.0
  • v2.2.0
  • v2.2.1
  • v2.2.2
  • v2.2.3
  • v2.2.4
  • v2.2.5
  • v2.2.6
  • v2.3.0
  • v2.3.1
  • v2.3.2
  • v2.4.0
  • v2.4.1
  • v2.4.2
56 results
Show changes

Commits on Source 3

using Coscine.Action; using Coscine.Action;
using Coscine.Action.EventArgs; using Coscine.Action.EventArgs;
using Coscine.Api.Pid.Models; using Coscine.Api.Pid.Models;
using Coscine.Configuration; using Coscine.Configuration;
...@@ -92,10 +92,11 @@ namespace Coscine.Api.Pid.Controllers ...@@ -92,10 +92,11 @@ namespace Coscine.Api.Pid.Controllers
if (projectId.HasValue) if (projectId.HasValue)
{ {
projectObject = _projectModel.CreateReturnObjectFromDatabaseObject(_projectModel.GetById(projectId.Value)); project = _projectModel.GetById(projectId.Value);
projectObject = _projectModel.CreateReturnObjectFromDatabaseObject(project);
var ownerId = _roleModel.GetAllWhere((x) => (x.DisplayName == "owner")).First().Id; var ownerId = _roleModel.GetAllWhere((x) => (x.DisplayName == "owner")).First().Id;
projectOwners = _projectRoleModel.GetAllWhere((x) => x.RoleId == ownerId && x.ProjectId == project.Id); projectOwners = _projectRoleModel.GetAllWhere((x) => x.RoleId == ownerId && x.ProjectId == projectId.Value);
} }
} }
else if (project != null) else if (project != null)
...@@ -127,6 +128,11 @@ namespace Coscine.Api.Pid.Controllers ...@@ -127,6 +128,11 @@ namespace Coscine.Api.Pid.Controllers
private void LogAnalyticsPidEnquiry(Project project, Resource resource, string applicationsProfile, string license, private void LogAnalyticsPidEnquiry(Project project, Resource resource, string applicationsProfile, string license,
IEnumerable<DisciplineObject> disciplines, IEnumerable<OrganizationObject> organizations, IEnumerable<ProjectRole> owners, string email) IEnumerable<DisciplineObject> disciplines, IEnumerable<OrganizationObject> organizations, IEnumerable<ProjectRole> owners, string email)
{ {
string visibility = null;
if (project != null && project.VisibilityId.HasValue)
{
visibility = _visibilityModel.GetById(project.VisibilityId.Value)?.DisplayName;
}
_coscineLogger.AnalyticsLog( _coscineLogger.AnalyticsLog(
new AnalyticsLogObject new AnalyticsLogObject
{ {
...@@ -138,7 +144,7 @@ namespace Coscine.Api.Pid.Controllers ...@@ -138,7 +144,7 @@ namespace Coscine.Api.Pid.Controllers
License = license, License = license,
Disciplines = disciplines?.Select(x => x.DisplayNameEn).ToList(), Disciplines = disciplines?.Select(x => x.DisplayNameEn).ToList(),
Organizations = organizations?.Select(x => x.DisplayName).ToList(), Organizations = organizations?.Select(x => x.DisplayName).ToList(),
Visibility = project.VisibilityId.HasValue ? _visibilityModel.GetById(project.VisibilityId.Value)?.DisplayName : null, Visibility = visibility,
UserList = owners?.Select(x => x.UserId.ToString()).ToList(), UserList = owners?.Select(x => x.UserId.ToString()).ToList(),
ExternalInfo = email == null ? null : HashMail(email), ExternalInfo = email == null ? null : HashMail(email),
}); });
......
...@@ -5,7 +5,7 @@ ...@@ -5,7 +5,7 @@
<AssemblyName>Coscine.Api.Pid</AssemblyName> <AssemblyName>Coscine.Api.Pid</AssemblyName>
<GenerateDocumentationFile>true</GenerateDocumentationFile> <GenerateDocumentationFile>true</GenerateDocumentationFile>
<TargetFramework>net5.0</TargetFramework> <TargetFramework>net5.0</TargetFramework>
<Version>2.2.1</Version> <Version>2.2.2</Version>
</PropertyGroup> </PropertyGroup>
<PropertyGroup> <PropertyGroup>
<Authors>RWTH Aachen University</Authors> <Authors>RWTH Aachen University</Authors>
......