Merge branch 'Topic/853-refactorFileMetadataFE' into 'Product/801-refactorFileMetadata'

Topic/853 refactor file metadata fe

See merge request coscine/api/blobapi!2

src/Blob/App.config

@@ -163,6 +163,10 @@
         <assemblyIdentity name="Microsoft.Extensions.Configuration.Binder" publicKeyToken="adb9793829ddae60" culture="neutral" />
         <bindingRedirect oldVersion="0.0.0.0-3.1.5.0" newVersion="3.1.5.0" />
       </dependentAssembly>
+      <dependentAssembly>
+        <assemblyIdentity name="Coscine.Database" publicKeyToken="767d77427707b70a" culture="neutral" />
+        <bindingRedirect oldVersion="0.0.0.0-1.22.2.0" newVersion="1.22.2.0" />
+      </dependentAssembly>
     </assemblyBinding>
   </runtime>
 </configuration>
\ No newline at end of file

src/Blob/Blob.csproj

@@ -51,8 +51,8 @@
     <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.Api.WaterbutlerHelper, Version=1.0.0.0, Culture=neutral, processorArchitecture=MSIL">
-      <HintPath>..\packages\Coscine.Api.WaterbutlerHelper.1.0.0-topic-802-refact0008\lib\net461\Coscine.Api.WaterbutlerHelper.dll</HintPath>
+    <Reference Include="Coscine.Api.WaterbutlerHelper, Version=1.1.0.0, Culture=neutral, processorArchitecture=MSIL">
+      <HintPath>..\packages\Coscine.Api.WaterbutlerHelper.1.1.0-topic-853-refact0003\lib\net461\Coscine.Api.WaterbutlerHelper.dll</HintPath>
     </Reference>
     <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>
@@ -60,8 +60,8 @@
     <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.21.0.0, Culture=neutral, PublicKeyToken=767d77427707b70a, processorArchitecture=MSIL">
-      <HintPath>..\packages\Coscine.Database.1.21.0\lib\net461\Coscine.Database.dll</HintPath>
+    <Reference Include="Coscine.Database, Version=1.22.2.0, Culture=neutral, PublicKeyToken=767d77427707b70a, processorArchitecture=MSIL">
+      <HintPath>..\packages\Coscine.Database.1.22.2-product-801-refa0003\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>

src/Blob/Controllers/BlobController.cs

@@ -229,15 +229,13 @@ namespace Coscine.Api.Blob.Controllers
             else
             {
                 var provider = GetResourceTypeName(resource);
-                var infos = await _waterbutlerInterface.GetObjectInfoAsync(path, provider, authHeader);
+                var infos = await _waterbutlerInterface.GetObjectInfoAsync("/" + path, provider, authHeader);
 
                 // Not found, upload new
                 if (infos == null)
                 {
-                    var filename = path.EndsWith("/") ? path.Substring(0, path.Length - 1) : path;
-                    filename = path.Substring(path.LastIndexOf("/") + 1);
-                    var rootPath = path.EndsWith("/") ? path.Substring(0, path.Length - 1) : path;
-                    rootPath = path.Substring(0, path.Length - filename.Length);
+                    var filename = path.Substring(path.LastIndexOf("/") + 1);
+                    var rootPath = path.Substring(0, path.Length - filename.Length);
 
                     using (var response = await _waterbutlerInterface.UploadFileAsync(rootPath, filename, provider, authHeader, Request.Body))
                     {

src/Blob/packages.config

@@ -3,10 +3,10 @@
   <package id="AWSSDK.Core" version="3.3.107.8" targetFramework="net461" />
   <package id="AWSSDK.S3" version="3.3.111.9" targetFramework="net461" />
   <package id="Consul" version="0.7.2.6" targetFramework="net461" />
-  <package id="Coscine.Api.WaterbutlerHelper" version="1.0.0-topic-802-refact0008" targetFramework="net461" />
+  <package id="Coscine.Api.WaterbutlerHelper" version="1.1.0-topic-853-refact0003" 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.21.0" targetFramework="net461" />
+  <package id="Coscine.Database" version="1.22.2-product-801-refa0003" targetFramework="net461" />
   <package id="Coscine.Logging" version="1.2.0" targetFramework="net461" />
   <package id="EntityFramework" version="6.2.0" targetFramework="net461" />
   <package id="linq2db" version="2.6.4" targetFramework="net461" />