Skip to content
Snippets Groups Projects
Commit 0b1741a7 authored by Petar Hristov's avatar Petar Hristov :speech_balloon:
Browse files

Merge branch 'dev' into 'master'

Release: Sprint/2022 15 :robot:

See merge request !59
parents 7a298fce ec5e5eac
No related branches found
No related tags found
1 merge request!59Release: Sprint/2022 15 :robot:
......@@ -4,7 +4,9 @@ using Coscine.Api.Metadata.ParameterObjects;
using Coscine.Api.Metadata.Util;
using Coscine.ApiCommons;
using Coscine.Configuration;
using Coscine.Database.DataModel;
using Coscine.Database.Models;
using Coscine.Logging;
using Coscine.Metadata;
using GitLabApiClient;
using GitLabApiClient.Models.Branches.Requests;
......@@ -12,6 +14,7 @@ using GitLabApiClient.Models.Commits.Requests.CreateCommitRequest;
using GitLabApiClient.Models.MergeRequests.Requests;
using Microsoft.AspNetCore.Authorization;
using Microsoft.AspNetCore.Mvc;
using Microsoft.Extensions.Logging;
using Newtonsoft.Json.Linq;
using System;
using System.Collections.Generic;
......@@ -34,6 +37,7 @@ namespace Coscine.Api.Metadata.Controllers
private readonly Authenticator _authenticator;
private readonly Emitter _emitter;
private readonly IConfiguration _configuration;
private readonly CoscineLogger _coscineLogger;
private readonly ResourceModel _resourceModel;
private readonly RdfStoreConnector _rdfStoreConnector;
......@@ -46,9 +50,10 @@ namespace Coscine.Api.Metadata.Controllers
/// <summary>
/// MetadataController constructor specifying an authenticator and a ResourceModel.
/// </summary>
public MetadataController()
public MetadataController(ILogger<MetadataController> logger)
{
_configuration = Program.Configuration;
_coscineLogger = new CoscineLogger(logger);
_authenticator = new Authenticator(this, _configuration);
_resourceModel = new ResourceModel();
_rdfStoreConnector = new RdfStoreConnector(_configuration.GetStringAndWait("coscine/local/virtuoso/additional/url"));
......@@ -261,7 +266,22 @@ namespace Coscine.Api.Metadata.Controllers
MergeRequestURL = newMergeRequest.WebUrl
});
LogAnalyticsApplicationProfileRequest(user, applicationProfile.Name, newMergeRequest.WebUrl);
return NoContent();
}
private void LogAnalyticsApplicationProfileRequest(User user, string applicationProfileName, string mergeRequestUrl)
{
_coscineLogger.AnalyticsLog(
new AnalyticsLogObject
{
Type = "Action",
Operation = "Merge Request Application Profile",
UserId = user.Id.ToString(),
ApplicationsProfile = applicationProfileName,
ExternalInfo = mergeRequestUrl
});
}
}
}
<Project Sdk="Microsoft.NET.Sdk">
<Project Sdk="Microsoft.NET.Sdk">
<PropertyGroup>
<OutputType>Exe</OutputType>
<RootNamespace>Coscine.Api.Metadata</RootNamespace>
......@@ -10,16 +10,17 @@
<PropertyGroup>
<Authors>RWTH Aachen University</Authors>
<Company>IT Center, RWTH Aachen University</Company>
<Copyright>2021 IT Center, RWTH Aachen University</Copyright>
<Copyright>2022 IT Center, RWTH Aachen University</Copyright>
<Description>Metadata is a part of the Coscine group.</Description>
<PackageLicenseExpression>MIT</PackageLicenseExpression>
<PackageProjectUrl>https://git.rwth-aachen.de/coscine/backend/apis/Metadata</PackageProjectUrl>
<PackageRequireLicenseAcceptance>false</PackageRequireLicenseAcceptance>
</PropertyGroup>
<ItemGroup>
<PackageReference Include="Coscine.Action" Version="2.*-*" />
<PackageReference Include="Coscine.Action" Version="3.*-*" />
<PackageReference Include="Coscine.ApiCommons" Version="2.*-*" />
<PackageReference Include="Coscine.Metadata" Version="2.*-*" />
<PackageReference Include="Coscine.Logging" Version="2.*-*" />
<PackageReference Include="GitLabApiClient" Version="1.8.1-beta.5" />
</ItemGroup>
</Project>
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment