feat(api): Add versionId to ModelIngestion (#448)

* Add version id to ingestion query

* and the sub

* Add project & user ids

* test

src/Speckle.Sdk/Api/Blob/BlobApi.cs

@@ -193,30 +193,7 @@ public sealed class BlobApi : IBlobApi
     using var response = await _unauthedClient.SendAsync(requestMessage, cancellationToken).ConfigureAwait(false);
     response.EnsureSuccessStatusCode();
 
-    return ParseEtagHeader(response.Headers);
-  }
-
-  private static string ParseEtagHeader(HttpResponseHeaders headers)
-  {
-    if (!headers.TryGetValues("ETag", out var etagValues))
-    {
-      throw new ArgumentException(
-        "Response does not have an ETag attached to it, cannot use this as an upload",
-        nameof(headers)
-      );
-    }
-
-    var etagValuesArray = etagValues.ToArray();
-
-    if (etagValuesArray.Length != 1)
-    {
-      throw new ArgumentException(
-        $"Expected Etag header to have a single value but got {etagValuesArray.Length}",
-        nameof(headers)
-      );
-    }
-
-    return etagValuesArray[0];
+    return BlobApiHelpers.ParseEtagHeader(response.Headers);
   }
 
   /// <summary>

src/Speckle.Sdk/Api/GraphQL/Models/ModelIngestion.cs

@@ -6,7 +6,8 @@ public sealed class ModelIngestion
   public required DateTime createdAt { get; init; }
   public required DateTime updatedAt { get; init; }
   public required string modelId { get; init; }
+  public required string projectId { get; init; }
+  public required string userId { get; init; }
   public required bool cancellationRequested { get; init; }
   public required ModelIngestionStatusData statusData { get; init; }
-  // public required LimitedUser user { get; init; }
 }

src/Speckle.Sdk/Api/GraphQL/Models/ModelIngestionStatusData.cs

@@ -6,4 +6,5 @@ public sealed class ModelIngestionStatusData
 {
   public required ModelIngestionStatus status { get; init; }
   public required string? progressMessage { get; init; }
+  public required string? versionId { get; init; }
 }

src/Speckle.Sdk/Api/GraphQL/Resources/ModelIngestionResource.cs

@@ -44,6 +44,8 @@ public sealed class ModelIngestionResource
               createdAt
               updatedAt
               modelId
+              projectId
+              userId
               cancellationRequested
               statusData {
                 ... on HasModelIngestionStatus {
@@ -94,6 +96,8 @@ public sealed class ModelIngestionResource
             createdAt
             updatedAt
             modelId
+            projectId
+            userId
             cancellationRequested
             statusData {
               ... on HasModelIngestionStatus {
@@ -102,6 +106,10 @@ public sealed class ModelIngestionResource
               ... on HasProgressMessage {
                 progressMessage
               }
+              ... on ModelIngestionSuccessStatus
+              {
+                versionId
+              }
             }
           }
         }
@@ -142,6 +150,8 @@ public sealed class ModelIngestionResource
               createdAt
               updatedAt
               modelId
+              projectId
+              userId
               cancellationRequested
               statusData {
                 ... on HasModelIngestionStatus {
@@ -194,6 +204,8 @@ public sealed class ModelIngestionResource
               createdAt
               updatedAt
               modelId
+              projectId
+              userId
               cancellationRequested
               statusData {
                 ... on HasModelIngestionStatus {
@@ -245,6 +257,8 @@ public sealed class ModelIngestionResource
               createdAt
               updatedAt
               modelId
+              projectId
+              userId
               cancellationRequested
               statusData {
                 ... on HasModelIngestionStatus {
@@ -343,6 +357,8 @@ public sealed class ModelIngestionResource
               createdAt
               updatedAt
               modelId
+              projectId
+              userId
               cancellationRequested
               statusData {
                 ... on HasModelIngestionStatus {
@@ -398,6 +414,8 @@ public sealed class ModelIngestionResource
               createdAt
               updatedAt
               modelId
+              projectId
+              userId
               cancellationRequested
               statusData {
                 ... on HasModelIngestionStatus {
@@ -457,6 +475,8 @@ public sealed class ModelIngestionResource
               createdAt
               updatedAt
               modelId
+              projectId
+              userId
               cancellationRequested
               statusData {
                 ... on HasModelIngestionStatus {

src/Speckle.Sdk/Api/GraphQL/Resources/SubscriptionResource.cs

@@ -229,6 +229,8 @@ public sealed class SubscriptionResource : IDisposable
             createdAt
             updatedAt
             modelId
+            projectId
+            userId
             cancellationRequested
             statusData {
               ... on HasModelIngestionStatus {
@@ -237,6 +239,10 @@ public sealed class SubscriptionResource : IDisposable
               ... on HasProgressMessage {
                 progressMessage
               }
+              ... on ModelIngestionSuccessStatus
+              {
+                versionId
+              }
             }
           }
           type

src/Speckle.Sdk/Helpers/BlobApiHelpers.cs

@@ -0,0 +1,29 @@
+using System.Net.Http.Headers;
+
+namespace Speckle.Sdk.Helpers;
+
+public static class BlobApiHelpers
+{
+  public static string ParseEtagHeader(HttpResponseHeaders headers)
+  {
+    if (!headers.TryGetValues("ETag", out var etagValues))
+    {
+      throw new ArgumentException(
+        "Response does not have an ETag attached to it, cannot use this as an upload",
+        nameof(headers)
+      );
+    }
+
+    var etagValuesArray = etagValues.ToArray();
+
+    if (etagValuesArray.Length != 1)
+    {
+      throw new ArgumentException(
+        $"Expected Etag header to have a single value but got {etagValuesArray.Length}",
+        nameof(headers)
+      );
+    }
+
+    return etagValuesArray[0];
+  }
+}

src/Speckle.Sdk/Pipelines/Send/Uploader.cs

@@ -1,4 +1,5 @@
 using System.Net.Http.Headers;
+using System.Text;
 using Microsoft.Extensions.Logging;
 using Speckle.InterfaceGenerator;
 using Speckle.Newtonsoft.Json;
@@ -54,9 +55,9 @@ public sealed class Uploader : IDisposable
   public async Task Send(Stream fileStream)
   {
     PresignedUploadResponse presignedUploadResponse = await GetPresignedUrl().ConfigureAwait(false);
-    await UploadToS3(fileStream, presignedUploadResponse).ConfigureAwait(false);
+    var etag = await UploadToS3(fileStream, presignedUploadResponse).ConfigureAwait(false);
 
-    await TriggerProcessing().ConfigureAwait(false);
+    await TriggerProcessing(new() { Etag = etag }).ConfigureAwait(false);
   }
 
   private async Task<PresignedUploadResponse> GetPresignedUrl()
@@ -77,7 +78,7 @@ public sealed class Uploader : IDisposable
     return presignedUpload;
   }
 
-  private async Task UploadToS3(Stream fileStream, PresignedUploadResponse presignedUploadResponse)
+  private async Task<string> UploadToS3(Stream fileStream, PresignedUploadResponse presignedUploadResponse)
   {
     _logger.LogInformation("Uploading file to pre-signed url");
 
@@ -100,16 +101,21 @@ public sealed class Uploader : IDisposable
       .ConfigureAwait(false);
 
     uploadResponse.EnsureSuccessStatusCode();
+
+    return BlobApiHelpers.ParseEtagHeader(uploadResponse.Headers);
   }
 
-  private async Task TriggerProcessing()
+  private async Task TriggerProcessing(TriggerUploadRequest request)
   {
     Uri processUri = new($"projects/{_projectId}/modelingestion/{_ingestionId}/uploads/process", UriKind.Relative);
+    string requestBody = JsonConvert.SerializeObject(request);
+    using var content = new StringContent(requestBody, Encoding.UTF8, "application/json");
 
     using HttpResponseMessage processResponse = await _speckleClient
-      .PostAsync(processUri, null, _cancellationToken)
+      .PostAsync(processUri, content, _cancellationToken)
       .ConfigureAwait(false);
 
+    string body = await processResponse.Content.ReadAsStringAsync().ConfigureAwait(false);
     processResponse.EnsureSuccessStatusCode();
   }
 

src/Speckle.Sdk/Pipelines/Send/UploaderDTOs.cs

@@ -1,3 +1,4 @@
+using Speckle.Newtonsoft.Json;
 using Speckle.Sdk.Models;
 using Speckle.Sdk.Serialisation;
 
@@ -12,7 +13,8 @@ internal record PresignedUploadResponse
   public Dictionary<string, string> AdditionalRequestHeaders { get; init; } = new();
 }
 
-internal record ProcessUploadResponse
+internal readonly struct TriggerUploadRequest
 {
-  public required string ingestionId { get; init; }
+  [JsonProperty("etag")]
+  public required string Etag { get; init; }
 }

tests/Speckle.Sdk.Tests.Integration/Api/GraphQL/Resources/ModelIngestionResourceTests.cs

@@ -129,8 +129,10 @@ public sealed class ModelIngestionResourceTests : IAsyncLifetime
     ModelIngestionSuccessInput finish = new(ingest.id, _project.id, sendResult.RootId, "yay!");
     string versionId = await Sut.Complete(finish);
     Version version = await _testUser.Version.Get(versionId, _project.id);
+    ModelIngestion finalIngestion = await _testUser.Ingestion.Get(ingest.id, _project.id);
     Assert.Equal(version.id, versionId);
     Assert.Equal(sendResult.RootId, version.referencedObject);
+    Assert.Equal(finalIngestion.statusData.versionId, versionId);
   }
 
   [Fact]
@@ -147,6 +149,11 @@ public sealed class ModelIngestionResourceTests : IAsyncLifetime
     ModelIngestion res = await Sut.Get(ingest.id, _project.id);
     Assert.Equal(ingest.id, res.id);
     Assert.Equal(ingest.statusData.status, res.statusData.status);
+    Assert.Equal(ingest.statusData.versionId, res.statusData.versionId);
+    Assert.Null(res.statusData.versionId);
+    Assert.Equal(_model.id, res.modelId);
+    Assert.Equal(_project.id, res.projectId);
+    Assert.Equal(_testUser.Account.userInfo.id, res.userId);
   }
 
   [Fact]