Merge branch 'dev' of https://git.rwth-aachen.de/coscine/backend/apis/treeapi...

Merge branch 'dev' of https://git.rwth-aachen.de/coscine/backend/apis/treeapi into Issue/1792-newMetadataStructure

README.md

@@ -2,4 +2,4 @@
 
 The TreeApi handles the retrieving or storing metadata to a certain path.
   
- 
+Check out the [docs](https://coscine.rwth-aachen.de/coscine/api/Coscine.Api.Tree/swagger). 

src/Tree/Controllers/TreeController.cs

@@ -125,7 +125,9 @@ namespace Coscine.Api.Tree.Controllers
                 resource.ApplicationProfile += '/';
             }
             
-            if (user == null || !_resourceModel.HasAccess(user, resource, UserRoles.Owner, UserRoles.Member))
+            // Rights Matrix (https://git.rwth-aachen.de/coscine/docs/private/internal-wiki/-/blob/master/coscine/Definition%20of%20rights%20Matrix.md)
+            // - Resource: View Resource (RCV, Metadatamanager)
+            if (user == null || !_resourceModel.HasAccess(user, resource, UserRoles.Owner, UserRoles.Member, UserRoles.Guest))
             {
                 return BadRequest("User has no Access to this resource.");
             }
@@ -368,15 +370,6 @@ namespace Coscine.Api.Tree.Controllers
                 resource.ApplicationProfile += '/';
             }
 
-            json[graphNameUri.AbsoluteUri]["http://www.w3.org/1999/02/22-rdf-syntax-ns#type"] = new JArray
-                {
-                    new JObject
-                    {
-                        ["value"] = resource.ApplicationProfile,
-                        ["type"] = "uri"
-                    }
-                };
-
             // throw bad request if empty node value is detected
             foreach (var node in json.First.First)
             {
@@ -430,7 +423,7 @@ namespace Coscine.Api.Tree.Controllers
             // Default values is not checked or added
 
             // validate the data
-            if (!_rdfStoreConnector.ValidateShacl(graph, graphNameUri))
+            if (!_rdfStoreConnector.ValidateShacl(graph, graphNameUri, new Uri(resource.ApplicationProfile)))
             {
                 return BadRequest("Data has the wrong format!");
             }

src/Tree/Tree.csproj

@@ -5,7 +5,7 @@
 		<AssemblyName>Coscine.Api.Tree</AssemblyName>
 		<GenerateDocumentationFile>true</GenerateDocumentationFile>
 		<TargetFramework>net6.0</TargetFramework>
-		<Version>2.8.15</Version>
+		<Version>2.9.2</Version>
 	</PropertyGroup>
 	<PropertyGroup>
 		<Authors>RWTH Aachen University</Authors>
@@ -17,11 +17,12 @@
 		<PackageRequireLicenseAcceptance>false</PackageRequireLicenseAcceptance>
 	</PropertyGroup>
 	<ItemGroup>
-		<PackageReference Include="Coscine.ApiCommons" Version="2.*-*" />
-		<PackageReference Include="Coscine.Database" Version="2.*-*" />
-		<PackageReference Include="Coscine.Logging" Version="2.*-*" />
-		<PackageReference Include="Coscine.Metadata" Version="2.*-*" />
-		<PackageReference Include="Coscine.ResourceTypes" Version="1.*-*" />
-		<PackageReference Include="Coscine.WaterbutlerHelper" Version="2.*-*" />
+		<PackageReference Include="Coscine.ApiCommons" Version="*-*" />
+		<PackageReference Include="Coscine.Database" Version="*-*" />
+		<PackageReference Include="Coscine.Logging" Version="*-*" />
+		<PackageReference Include="Coscine.Metadata" Version="*-*" />
+		<PackageReference Include="Coscine.ResourceTypes" Version="*-*" />
+		<PackageReference Include="Coscine.WaterbutlerHelper" Version="*" />
 	</ItemGroup>
 </Project>
+