v3.0.3 to v3.0.4 · Coscine / backend / apis / Admin

src/Admin/Admin.csproj

+7
−7

Original line number
Diff line number
Diff line

@@ -5,22 +5,22 @@

		<AssemblyName>Coscine.Api.Admin</AssemblyName>

		<GenerateDocumentationFile>true</GenerateDocumentationFile>

		<TargetFramework>net6.0</TargetFramework>

		<Version>3.0.3</Version>

		<Version>3.0.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>Admin is a part of the Coscine group.</Description>

		<PackageLicenseExpression>MIT</PackageLicenseExpression>

		<PackageProjectUrl>https://git.rwth-aachen.de/coscine/backend/apis/Admin</PackageProjectUrl>

		<PackageRequireLicenseAcceptance>false</PackageRequireLicenseAcceptance>

	</PropertyGroup>

	<ItemGroup>

		<PackageReference Include="Coscine.Action" Version="2.*-*" />

		<PackageReference Include="Coscine.ApiCommons" Version="2.*-*" />

		<PackageReference Include="Coscine.Database" Version="2.*-*" />

		<PackageReference Include="Coscine.Metadata" Version="2.*-*" />

		<PackageReference Include="Coscine.ResourceTypes" Version="1.*-*" />

		<PackageReference Include="Coscine.Action" Version="*-*" />

		<PackageReference Include="Coscine.ApiCommons" Version="*-*" />

		<PackageReference Include="Coscine.Database" Version="*-*" />

		<PackageReference Include="Coscine.Metadata" Version="*-*" />

		<PackageReference Include="Coscine.ResourceTypes" Version="*-*" />

	</ItemGroup>

</Project>

src/Admin/Controllers/AdminController.cs

+10
−3

Original line number
Diff line number
Diff line

@@ -13,6 +13,7 @@ using Microsoft.AspNetCore.Authorization;

using Microsoft.AspNetCore.Mvc;

using Microsoft.Extensions.Logging;

using System;

using System.Collections.Generic;

using System.Linq;

namespace Coscine.Api.Admin.Controllers

@@ -66,8 +67,8 @@ namespace Coscine.Api.Admin.Controllers

        [HttpGet("[controller]/{projectString}")]

        public ActionResult<AdminProjectObject> GetProject(string projectString)

        {

            var user = _authenticator.GetUserId();

            if (!HasRole(user, _adminRole))

            var user = _authenticator.GetUser();

            if (!HasRole(user.Id.ToString(), _adminRole))

            {

                return Unauthorized($"User does not have the role \"{_adminRole}\".");

            }

@@ -88,7 +89,13 @@ namespace Coscine.Api.Admin.Controllers

                return NotFound("Project was not found.");

            }

            var quotas = _projectQuotaModel.GetAllWhere(x => x.ProjectId == project.Id);

            var listOfResources = ResourceTypeFactory.Instance.GetSpecificResourceTypes().Select(x => x.SpecificTypeName);

            var allResourceTypeIds = _resourceTypeModel.GetAllWhere((resourceType) => listOfResources.Contains(resourceType.SpecificType)).Select(e => e.Id).ToList();

            var quotas = _projectQuotaModel.GetAllWhere(pq =>

              pq.ProjectId == project.Id &&

              allResourceTypeIds.Contains(pq.ResourceTypeId)

            ).ToList();

            return new AdminProjectObject

            {

src/Admin/Util/OrganizationsHelper.cs0 → 100644

+30
−0

Original line number
Diff line number
Diff line

﻿using Coscine.Database.DataModel;

using Coscine.Database.Models;

using Coscine.Metadata;

using System.Collections.Generic;

using System.Linq;

namespace Coscine.Api.Admin.Util;

internal class OrganizationsHelper

{

    private static readonly ExternalIdModel _externalIdModel = new();

    private static readonly RdfStoreConnector _rdfStoreConnector = new(Program.Configuration.GetStringAndWait("coscine/local/virtuoso/additional/url"));

    public static IEnumerable<string> GetOrganization(User user)

    {

        // Bellow code taken from Organizations API

        var externalIds = _externalIdModel.GetAllWhere((externalId) => externalId.UserId == user.Id);

        var externalIdList = _externalIdModel.GetAllWhere((externalId) => externalId.UserId == user.Id).Select(x => x.ExternalId1).ToList();

        var externalOrganizations = externalIds.Select((externalId) => externalId.Organization);

        var triplesExternalIds = _rdfStoreConnector.GetTriples(null, null, null, 1, externalIdList);

        var triplesExternalOrganizations = externalOrganizations.SelectMany(x => _rdfStoreConnector.GetOrganizationByEntityId(x));

        return triplesExternalIds.Select(x => x.Subject.ToString())

            .Concat(triplesExternalOrganizations.Select(x => x.Subject.ToString()))

            .Distinct();

    }

}

 No newline at end of file

Compare revisions

Source

Target

Commits on Source 3

Files

src/Admin/Admin.csproj

src/Admin/Controllers/AdminController.cs

src/Admin/Util/OrganizationsHelper.cs