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/1357-ymlFile
  • Hotfix/1370-swaggerDescription
  • Hotfix/2087-efNet6
  • Hotfix/2562-organizations
  • Issue/1910-MigrationtoNET6.0
  • Issue/2228-userOrganization
  • Issue/2295-singleOrganizationFix
  • Issue/2309-docs
  • Product/1094-fasterQuery
  • Product/1180-genericOrganizationMembershipFunction
  • Product/1287-dotnet5Sharepoint
  • Sprint/2020-20
  • Sprint/2020-21
  • Sprint/2020-22
  • Sprint/2021-02
  • Sprint/2021-03
  • Sprint/2021-05
  • Sprint/2021-08
  • Sprint/2022-01
  • Topic/1165-fasterQuery
  • Topic/1281-genericOrganizationMembershipFunction
  • Topic/1335-dotnet5Apis
  • dev
  • gitkeep
  • master
  • v1.1.0
  • v1.1.1
  • v1.2.0
  • v1.2.1
  • v1.2.2
  • v1.2.3
  • v1.3.0
  • v1.3.1
  • v1.4.0
  • v1.4.1
  • v1.5.0
  • v2.0.0
  • v2.0.1
  • v2.0.2
  • v2.0.3
  • v2.1.0
  • v2.1.1
  • v2.1.2
  • v2.2.0
  • v2.2.1
  • v2.2.2
  • v2.2.3
  • v2.2.4
  • v2.2.5
49 results

Target

Select target project
  • coscine/backend/apis/organization
1 result
Select Git revision
  • Hotfix/1357-ymlFile
  • Hotfix/1370-swaggerDescription
  • Hotfix/2087-efNet6
  • Hotfix/2562-organizations
  • Issue/1910-MigrationtoNET6.0
  • Issue/2228-userOrganization
  • Issue/2295-singleOrganizationFix
  • Issue/2309-docs
  • Product/1094-fasterQuery
  • Product/1180-genericOrganizationMembershipFunction
  • Product/1287-dotnet5Sharepoint
  • Sprint/2020-20
  • Sprint/2020-21
  • Sprint/2020-22
  • Sprint/2021-02
  • Sprint/2021-03
  • Sprint/2021-05
  • Sprint/2021-08
  • Sprint/2022-01
  • Topic/1165-fasterQuery
  • Topic/1281-genericOrganizationMembershipFunction
  • Topic/1335-dotnet5Apis
  • dev
  • gitkeep
  • master
  • v1.1.0
  • v1.1.1
  • v1.2.0
  • v1.2.1
  • v1.2.2
  • v1.2.3
  • v1.3.0
  • v1.3.1
  • v1.4.0
  • v1.4.1
  • v1.5.0
  • v2.0.0
  • v2.0.1
  • v2.0.2
  • v2.0.3
  • v2.1.0
  • v2.1.1
  • v2.1.2
  • v2.2.0
  • v2.2.1
  • v2.2.2
  • v2.2.3
  • v2.2.4
  • v2.2.5
49 results
Show changes
Commits on Source (3)
......@@ -149,11 +149,11 @@ namespace Coscine.Api.Organization.Controllers
}
/// <summary>
/// Converts the organization triples to return objects
/// Converts the organization triples to return objects.
/// </summary>
/// <param name="list"></param>
/// <param name="fetchEmail"></param>
/// <returns></returns>
/// <param name="list">The list of triples to be converted into <see cref="OrganizationObject"/>s.</param>
/// <param name="fetchEmail">Optional boolean flag indicating whether to fetch the organization's email. Default is false.</param>
/// <returns>A <see cref="WrapperObject"/> containing the list of converted <see cref="OrganizationObject"/>s.</returns>
private WrapperObject GetObjectForTripleList(IEnumerable<Triple> list, bool fetchEmail = false)
{
var wrapperObject = new WrapperObject();
......@@ -162,32 +162,9 @@ namespace Coscine.Api.Organization.Controllers
var organization = new OrganizationObject
{
DisplayName = triple.Object.ToString(),
Url = triple.Subject.ToString()
Url = triple.Subject.ToString(),
Email = fetchEmail ? _rdfStoreConnector.GetOrganizationEmailByRorUrl(triple.Subject.ToString()) : null
};
if (fetchEmail)
{
var graph = _rdfStoreConnector.GetGraph(organization.Url);
var contactInformations = graph.GetTriplesWithSubjectPredicate(
graph.CreateUriNode(new Uri(organization.Url)),
graph.CreateUriNode(new Uri("https://purl.org/coscine/terms/resource#contactInformation"))
);
foreach (var contactInformation in contactInformations)
{
var mboxes = graph.GetTriplesWithSubjectPredicate(
contactInformation.Object,
graph.CreateUriNode(new Uri("http://xmlns.com/foaf/0.1/mbox"))
);
foreach (var mbox in mboxes)
{
organization.Email = mbox.Object.ToString().Replace("mailto:", "");
break;
}
if (organization.Email != null)
{
break;
}
}
}
wrapperObject.Data.Add(organization);
}
return wrapperObject;
......
......@@ -5,12 +5,12 @@
<AssemblyName>Coscine.Api.Organization</AssemblyName>
<GenerateDocumentationFile>true</GenerateDocumentationFile>
<TargetFramework>net6.0</TargetFramework>
<Version>2.2.3</Version>
<Version>2.2.4</Version>
</PropertyGroup>
<PropertyGroup>
<Authors>RWTH Aachen University</Authors>
<Company>IT Center, RWTH Aachen University</Company>
<Copyright>2022 IT Center, RWTH Aachen University</Copyright>
<Copyright>2023 IT Center, RWTH Aachen University</Copyright>
<Description>Organization is a part of the Coscine group.</Description>
<PackageLicenseExpression>MIT</PackageLicenseExpression>
<PackageProjectUrl>https://git.rwth-aachen.de/coscine/backend/apis/Organization</PackageProjectUrl>
......