Cleanup Controller

src/Tree/Controllers/TreeController.cs

-using Coscine.Api.Tree.Util;
 using Coscine.ApiCommons;
 using Coscine.ApiCommons.Factories;
 using Coscine.Configuration;
@@ -7,7 +6,6 @@ using Coscine.Database.Models;
 using Coscine.Database.Util;
 using Coscine.Logging;
 using Coscine.Metadata;
-using Coscine.Metadata.Util;
 using Coscine.ResourceTypes;
 using Coscine.ResourceTypes.Base;
 using Coscine.ResourceTypes.Base.Models;
@@ -37,6 +35,7 @@ namespace Coscine.Api.Tree.Controllers
         private readonly Authenticator _authenticator;
         private readonly ResourceModel _resourceModel;
         private readonly RdfStoreConnector _rdfStoreConnector;
+        private readonly CoscineLDPHelper _coscineLDPHelper;
         private readonly ProjectRoleModel _projectRoleModel;
         private readonly ProjectResourceModel _projectResourceModel;
         private readonly CoscineLogger _coscineLogger;
@@ -65,52 +64,7 @@ namespace Coscine.Api.Tree.Controllers
             var path = rule[rule.IndexOf("/")..];
             _blobApiLink = $"https://{host}{path}/blob/";
             _prefix = _configuration.GetStringAndWait("coscine/global/epic/prefix");
-        }
-
-        /// <summary>
-        /// Generates Id
-        /// </summary>
-        /// <param name="resourceId">Id of the resource</param>
-        /// <param name="path">Path to file</param>
-        /// <param name="retrieve">Is retrieve action?</param>
-        /// <returns> Uri </returns>
-        public Uri GenerateId(string resourceId, string path, bool retrieve = false, bool storing = false)
-        {
-            if (!path.StartsWith("/"))
-            {
-                path = "/" + path;
-            }
-
-            var currentId = _rdfStoreConnector.GetMetadataId(resourceId, path);
-            if (currentId == null && retrieve)
-            {
-                return GenerateOldId(resourceId, path);
-            }
-            else if (currentId == null || storing)
-            {
-                var newVersionGraph = new CustomUri($"https://purl.org/coscine/resources/{resourceId}{path}/@type=metadata&version={VersionUtil.GetNewVersion()}");
-                return newVersionGraph;
-            }
-            else
-            {
-                return new CustomUri(currentId);
-            }
-        }
-
-        /// <summary>
-        /// Generates Id
-        /// </summary>
-        /// <param name="resourceId">Id of the resource</param>
-        /// <param name="path">Path to file</param>
-        /// <returns> Uri </returns>
-        public Uri GenerateOldId(string resourceId, string path)
-        {
-            if (!path.StartsWith("/"))
-            {
-                path = "/" + path;
-            }
-
-            return new CustomUri($"https://hdl.handle.net/{_prefix}/{resourceId}@path={Uri.EscapeDataString(path)}");
+            _coscineLDPHelper = new CoscineLDPHelper(_rdfStoreConnector, _prefix);
         }
 
         /// <summary>
@@ -191,7 +145,7 @@ namespace Coscine.Api.Tree.Controllers
                 // Add to metadata infos, if no "physical" file for it exists
                 if (!metadataInfos.Any((metadataInfo) => metadataInfo.Key == path))
                 {
-                    metadataInfos.Add(new ResourceEntry(path, true, 0, GenerateId(resourceId, path, true).AbsoluteUri, null, DateTime.Now, DateTime.Now));
+                    metadataInfos.Add(new ResourceEntry(path, true, 0, _coscineLDPHelper.GenerateId(resourceId, path, true).AbsoluteUri, null, DateTime.Now, DateTime.Now));
                 }
 
                 var applicationProfileGraph = _rdfStoreConnector.GetGraph(resource.ApplicationProfile);
@@ -202,7 +156,7 @@ namespace Coscine.Api.Tree.Controllers
                 int metadataCount = 0;
                 foreach (var info in metadataInfos)
                 {
-                    var id = GenerateId(resourceId, info.Key, true);
+                    var id = _coscineLDPHelper.GenerateId(resourceId, info.Key, true);
                     if (_rdfStoreConnector.HasGraph(id.AbsoluteUri))
                     {
                         var graph = _rdfStoreConnector.GetGraph(id);
@@ -367,7 +321,7 @@ namespace Coscine.Api.Tree.Controllers
             // Ducktape solution for supporting multiple mimetypes
             var metadataObject = ObjectFactory<JToken>.DeserializeFromStream(Request.Body);
 
-            var graphNameUri = GenerateId(resourceId, path, false, true);
+            var graphNameUri = _coscineLDPHelper.GenerateId(resourceId, path, false, true);
 
             JObject json;
 

src/Tree/Util/CustomUri.cs

-using System;
-
-namespace Coscine.Api.Tree.Util
-{
-    /// <summary>
-    /// Adapts the returned ToString of a Uri
-    /// </summary>
-    public class CustomUri : Uri
-    {
-        /// <summary>
-        /// Constructs a Custom Uri
-        /// </summary>
-        /// <param name="uri"></param>
-        public CustomUri(string uri) : base(uri)
-        {
-
-        }
-
-        /// <summary>
-        /// Overwrites the ToString for returning the AbsoluteUri (for dotNetRDF)
-        /// </summary>
-        /// <returns></returns>
-        public override string ToString()
-        {
-            return AbsoluteUri;
-        }
-    }
-}