From 009ef3da93c8b8432fc99e10c36a2688142c719e Mon Sep 17 00:00:00 2001 From: David Schimmel Date: Thu, 28 Jan 2021 11:06:34 +0100 Subject: [PATCH 1/2] Update: extend analytics logs (coscine/issues#1221) --- src/Tree/App.config | 8 +++-- src/Tree/Controllers/TreeController.cs | 44 +++++++++++++++++++++++--- src/Tree/Tree.csproj | 12 +++---- src/Tree/packages.config | 4 +-- 4 files changed, 54 insertions(+), 14 deletions(-) diff --git a/src/Tree/App.config b/src/Tree/App.config index 20153e8..f2d19a6 100644 --- a/src/Tree/App.config +++ b/src/Tree/App.config @@ -149,7 +149,7 @@ - + @@ -205,7 +205,11 @@ - + + + + + diff --git a/src/Tree/Controllers/TreeController.cs b/src/Tree/Controllers/TreeController.cs index 71f7488..eeaee87 100644 --- a/src/Tree/Controllers/TreeController.cs +++ b/src/Tree/Controllers/TreeController.cs @@ -145,7 +145,23 @@ namespace Coscine.Api.Tree.Controllers )) ); - LogAnalytics("View MD", resourceId, path, user); + if (resource.ApplicationProfile[resource.ApplicationProfile.Length - 1] != '/') + { + resource.ApplicationProfile += '/'; + } + string metadataCompleteness = null; + try + { + var metadata = jObject.SelectToken("data").SelectToken("metadataStorage").First.First.First; + var shapesGraph = (Graph)_rdfStoreConnector.GetGraph(resource.ApplicationProfile); + metadataCompleteness = GetMetadataCompleteness(metadata, shapesGraph); + } + catch (Exception e) + { + metadataCompleteness = "Error"; + } + + LogAnalytics("Update MD", resourceId, path, user, metadataCompleteness); return Json(jObject); } catch @@ -258,12 +274,12 @@ namespace Coscine.Api.Tree.Controllers if (_rdfStoreConnector.HasGraph(graphNameUri)) { _rdfStoreConnector.ClearGraph(graphNameUri); - LogAnalytics("Update MD", resourceId, path, user); + LogAnalytics("Update MD", resourceId, path, user, GetMetadataCompleteness(innerBlock, shapesGraph)); } else { _rdfStoreConnector.CreateNamedGraph(graphNameUri); - LogAnalytics("Upload MD", resourceId, path, user); + LogAnalytics("Upload MD", resourceId, path, user, GetMetadataCompleteness(innerBlock, shapesGraph)); } // BaseUri must be set for the sparql query @@ -330,7 +346,8 @@ namespace Coscine.Api.Tree.Controllers /// Resource of the id /// Name of the file /// User object - private void LogAnalytics(string operation, string resourceId, string filename, User user) + /// Metadata Completeness + private void LogAnalytics(string operation, string resourceId, string filename, User user, string metadataCompleteness = null) { if (CoscineLoggerConfiguration.IsLogLevelActivated(LogType.Analytics)) { @@ -340,8 +357,27 @@ namespace Coscine.Api.Tree.Controllers _analyticsLogObject.ResourceId = resourceId; _analyticsLogObject.ProjectId = _projectResourceModel.GetProjectForResource(new Guid(resourceId)).ToString(); _analyticsLogObject.RoleId = _projectRoleModel.GetGetUserRoleForProject(new Guid(_analyticsLogObject.ProjectId), user.Id).ToString(); + _analyticsLogObject.ApplicationsProfile = _resourceModel.CreateReturnObjectFromDatabaseObject(_resourceModel.GetById(new Guid(resourceId))).ApplicationProfile; + _analyticsLogObject.MetadataCompleteness = metadataCompleteness; _coscineLogger.AnalyticsLog(_analyticsLogObject); } } + + /// + /// Gets metadata completeness by comparing submitted values to the application profile specific shape graph + /// + /// + /// + /// + private string GetMetadataCompleteness (JToken valueTokens, IGraph shapesGraph) + { + NodeFactory nodeFactory = new NodeFactory(); + UriNode uriNode = (UriNode)nodeFactory.CreateUriNode(new Uri("http://www.w3.org/ns/shacl#property")); + + int total = shapesGraph.GetTriplesWithPredicate(uriNode).Count(); + int present = valueTokens.Count(); + + return $"{present}/{total}"; + } } } diff --git a/src/Tree/Tree.csproj b/src/Tree/Tree.csproj index 5d3b7b8..fdd1ec3 100644 --- a/src/Tree/Tree.csproj +++ b/src/Tree/Tree.csproj @@ -56,17 +56,17 @@ ..\packages\Coscine.Configuration.1.5.0\lib\net461\Coscine.Configuration.dll - - ..\packages\Coscine.Database.1.27.0\lib\net461\Coscine.Database.dll + + ..\packages\Coscine.Database.1.28.0-topic-1221-loggi0005\lib\net461\Coscine.Database.dll - - ..\packages\Coscine.Database.1.27.0\lib\net461\Coscine.Database.T4.dll + + ..\packages\Coscine.Database.1.28.0-topic-1221-loggi0005\lib\net461\Coscine.Database.T4.dll ..\packages\Coscine.JwtHandler.1.2.0\lib\net461\Coscine.JwtHandler.dll - - ..\packages\Coscine.Logging.1.2.0\lib\net461\Coscine.Logging.dll + + ..\packages\Coscine.Logging.1.3.0-topic-1221-loggi0001\lib\net461\Coscine.Logging.dll ..\packages\Coscine.Metadata.1.5.0\lib\net461\Coscine.Metadata.dll diff --git a/src/Tree/packages.config b/src/Tree/packages.config index 5cb7fdd..34afa10 100644 --- a/src/Tree/packages.config +++ b/src/Tree/packages.config @@ -3,9 +3,9 @@ - + - + -- GitLab From ef3fe5d4fe2ba6cc3bc6a8752d946159463d6bdb Mon Sep 17 00:00:00 2001 From: David Schimmel Date: Mon, 1 Feb 2021 14:25:00 +0100 Subject: [PATCH 2/2] add check for empty metadata --- src/Tree/Controllers/TreeController.cs | 11 ++++++++++- 1 file changed, 10 insertions(+), 1 deletion(-) diff --git a/src/Tree/Controllers/TreeController.cs b/src/Tree/Controllers/TreeController.cs index eeaee87..2d0d7a0 100644 --- a/src/Tree/Controllers/TreeController.cs +++ b/src/Tree/Controllers/TreeController.cs @@ -152,7 +152,16 @@ namespace Coscine.Api.Tree.Controllers string metadataCompleteness = null; try { - var metadata = jObject.SelectToken("data").SelectToken("metadataStorage").First.First.First; + JToken metadata; + if (jObject.SelectToken("data").SelectToken("metadataStorage").Count() > 0) + { + metadata = jObject.SelectToken("data").SelectToken("metadataStorage").First.First.First; + } + else + { + metadata = jObject.SelectToken("data").SelectToken("metadataStorage"); + } + var shapesGraph = (Graph)_rdfStoreConnector.GetGraph(resource.ApplicationProfile); metadataCompleteness = GetMetadataCompleteness(metadata, shapesGraph); } -- GitLab