Merge remote-tracking branch 'remotes/origin/master' into Product/801-refactorFileMetadata

src/App.config

@@ -141,7 +141,7 @@
       </dependentAssembly>
       <dependentAssembly>
         <assemblyIdentity name="Coscine.Database" publicKeyToken="767d77427707b70a" culture="neutral" />
-        <bindingRedirect oldVersion="0.0.0.0-1.19.0.0" newVersion="1.19.0.0" />
+        <bindingRedirect oldVersion="0.0.0.0-1.22.0.0" newVersion="1.22.0.0" />
       </dependentAssembly>
       <dependentAssembly>
         <assemblyIdentity name="LinqKit" publicKeyToken="bc217f8844052a91" culture="neutral" />

src/Controllers/MetadataController.cs

 using Coscine.ApiCommons;
+using Coscine.ApiCommons.Exceptions;
 using Coscine.Database.Models;
 using Coscine.Database.Util;
 using Coscine.Metadata;
@@ -119,5 +120,54 @@ namespace Coscine.Api.Metadata.Controllers
 
             return Json(json);
         }
+
+        [HttpGet("[controller]/instances/{projectId}/{className}")]
+        public IActionResult GetClassInstances(Guid projectId, string className)
+        {
+            var user = _authenticator.GetUser();
+            ProjectModel projectModel = new ProjectModel();
+            if (projectModel.HasAccess(user, projectModel.GetById(projectId), UserRoles.Owner, UserRoles.Member))
+            {
+                if (!Uri.TryCreate(HttpUtility.UrlDecode(className), UriKind.Absolute, out Uri uri))
+                {
+                    throw new ArgumentException("ClassName is not a valid Uri.");
+                }
+                var graph = _util.GetClassGraph(uri);
+
+                var de = new JArray();
+                foreach (var kv in _util.GetVocabularyLabels(graph, "de"))
+                {
+                    JObject obj = new JObject
+                    {
+                        ["value"] = kv.Key,
+                        ["name"] = kv.Value
+                    };
+                    de.Add(obj);
+                }
+
+                var en = new JArray();
+                foreach (var kv in _util.GetVocabularyLabels(graph, "en"))
+                {
+                    JObject obj = new JObject
+                    {
+                        ["value"] = kv.Key,
+                        ["name"] = kv.Value
+                    };
+                    en.Add(obj);
+                }
+
+                JObject json = new JObject
+                {
+                    ["de"] = de,
+                    ["en"] = en
+                };
+
+                return Json(json);
+            }
+            else
+            {
+                throw new NotAuthorizedException("User is no project member!");
+            }
+        }
     }
 }

src/Metadata.csproj

@@ -48,20 +48,20 @@
     <Reference Include="Consul, Version=0.7.2.6, Culture=neutral, PublicKeyToken=20a6ad9a81df1d95, processorArchitecture=MSIL">
       <HintPath>packages\Consul.0.7.2.6\lib\net45\Consul.dll</HintPath>
     </Reference>
-    <Reference Include="Coscine.ApiCommons, Version=1.7.2.0, Culture=neutral, PublicKeyToken=af4c1345df96546b, processorArchitecture=MSIL">
-      <HintPath>packages\Coscine.ApiCommons.1.7.2\lib\net461\Coscine.ApiCommons.dll</HintPath>
+    <Reference Include="Coscine.ApiCommons, Version=1.8.0.0, Culture=neutral, PublicKeyToken=af4c1345df96546b, processorArchitecture=MSIL">
+      <HintPath>packages\Coscine.ApiCommons.1.8.0\lib\net461\Coscine.ApiCommons.dll</HintPath>
     </Reference>
     <Reference Include="Coscine.Configuration, Version=1.5.0.0, Culture=neutral, PublicKeyToken=ce3d7a32d7dc1e5a, processorArchitecture=MSIL">
       <HintPath>packages\Coscine.Configuration.1.5.0\lib\net461\Coscine.Configuration.dll</HintPath>
     </Reference>
-    <Reference Include="Coscine.Database, Version=1.19.0.0, Culture=neutral, PublicKeyToken=767d77427707b70a, processorArchitecture=MSIL">
-      <HintPath>packages\Coscine.Database.1.19.0\lib\net461\Coscine.Database.dll</HintPath>
+    <Reference Include="Coscine.Database, Version=1.22.0.0, Culture=neutral, PublicKeyToken=767d77427707b70a, processorArchitecture=MSIL">
+      <HintPath>packages\Coscine.Database.1.22.0\lib\net461\Coscine.Database.dll</HintPath>
     </Reference>
     <Reference Include="Coscine.Logging, Version=1.2.0.0, Culture=neutral, PublicKeyToken=e1ed402bc3f6525e, processorArchitecture=MSIL">
       <HintPath>packages\Coscine.Logging.1.2.0\lib\net461\Coscine.Logging.dll</HintPath>
     </Reference>
-    <Reference Include="Coscine.Metadata, Version=1.1.2.0, Culture=neutral, processorArchitecture=MSIL">
-      <HintPath>packages\Coscine.Metadata.1.1.2\lib\net461\Coscine.Metadata.dll</HintPath>
+    <Reference Include="Coscine.Metadata, Version=1.2.0.0, Culture=neutral, processorArchitecture=MSIL">
+      <HintPath>packages\Coscine.Metadata.1.2.0\lib\net461\Coscine.Metadata.dll</HintPath>
     </Reference>
     <Reference Include="dotNetRDF, Version=2.5.0.0, Culture=neutral, PublicKeyToken=6055ffe4c97cc780, processorArchitecture=MSIL">
       <HintPath>packages\dotNetRDF.2.5.0\lib\net40\dotNetRDF.dll</HintPath>

src/packages.config

@@ -2,11 +2,11 @@
 <packages>
   <package id="Castle.Core" version="4.4.0" targetFramework="net461" />
   <package id="Consul" version="0.7.2.6" targetFramework="net461" />
-  <package id="Coscine.ApiCommons" version="1.7.2" targetFramework="net461" />
+  <package id="Coscine.ApiCommons" version="1.8.0" targetFramework="net461" />
   <package id="Coscine.Configuration" version="1.5.0" targetFramework="net461" />
-  <package id="Coscine.Database" version="1.19.0" targetFramework="net461" />
+  <package id="Coscine.Database" version="1.22.0" targetFramework="net461" />
   <package id="Coscine.Logging" version="1.2.0" targetFramework="net461" />
-  <package id="Coscine.Metadata" version="1.1.2" targetFramework="net461" />
+  <package id="Coscine.Metadata" version="1.2.0" targetFramework="net461" />
   <package id="dotNetRDF" version="2.5.0" targetFramework="net461" />
   <package id="dotNetRDF.Data.Virtuoso" version="2.5.0" targetFramework="net461" />
   <package id="EntityFramework" version="6.2.0" targetFramework="net461" />