From 4f3b77d76d437906ddd72435e6833d48d6780645 Mon Sep 17 00:00:00 2001
From: Jedd Morgan <45512892+JR-Morgan@users.noreply.github.com>
Date: Fri, 14 Mar 2025 15:47:11 +0000
Subject: [PATCH 1/2] Bump nuget + IFC Importer args

---
 .../fileimport-service/ifc-dotnet/Program.cs  | 33 ++++++++++++++-----
 .../ifc-dotnet/ifc-converter.csproj           |  2 +-
 packages/fileimport-service/src/daemon.js     |  1 +
 3 files changed, 26 insertions(+), 10 deletions(-)

diff --git a/packages/fileimport-service/ifc-dotnet/Program.cs b/packages/fileimport-service/ifc-dotnet/Program.cs
index 6c694292e..6f6818bbc 100644
--- a/packages/fileimport-service/ifc-dotnet/Program.cs
+++ b/packages/fileimport-service/ifc-dotnet/Program.cs
@@ -4,30 +4,44 @@ using Speckle.Importers.Ifc;
 using Speckle.Sdk.Common;
 using Speckle.Sdk.Models.Extensions;
 
-var filePathArgument = new Argument<string>(name: "filePath");
+var filePathArgument = new Argument<string>("filePath");
 var outputPathArgument = new Argument<string>("outputPath");
-var streamIdArgument = new Argument<string>("streamId");
-var commitMessageArgument = new Argument<string>("commitMessage");
+var projectIdArgument = new Argument<string>("projectId");
+var versionMessageArgument = new Argument<string>("versionMessage");
 var modelIdArgument = new Argument<string>("modelId");
+var modelNameArgument = new Argument<string>("modelName");
 var regionNameArgument = new Argument<string>("regionName");
 
 var rootCommand = new RootCommand
 {
   filePathArgument,
   outputPathArgument,
-  streamIdArgument,
-  commitMessageArgument,
+  projectIdArgument,
+  versionMessageArgument,
   modelIdArgument,
+  modelNameArgument,
   regionNameArgument,
 };
+
 rootCommand.SetHandler(
-  async (filePath, outputPath, streamId, commitMessage, modelId, _) =>
+  async (filePath, outputPath, projectId, versionMessage, modelId, modelName, _) =>
   {
     try
     {
       var token = Environment.GetEnvironmentVariable("USER_TOKEN").NotNull("USER_TOKEN is missing");
       var url = Environment.GetEnvironmentVariable("SPECKLE_SERVER_URL") ?? "http://127.0.0.1:3000";
-      var commitId = await Import.Ifc(url, filePath, streamId, modelId, commitMessage, token);
+      ImporterArgs args = new()
+      {
+        ServerUrl = new(url),
+        FilePath = filePath,
+        ProjectId = projectId,
+        ModelId = modelId,
+        ModelName = modelName,
+        VersionMessage = versionMessage,
+        Token = token
+      };
+
+      var commitId = await Import.Ifc(args);
       File.WriteAllText(outputPath, JsonSerializer.Serialize(new { success = true, commitId }));
     }
     catch (Exception e)
@@ -42,9 +56,10 @@ rootCommand.SetHandler(
   },
   filePathArgument,
   outputPathArgument,
-  streamIdArgument,
-  commitMessageArgument,
+  projectIdArgument,
+  versionMessageArgument,
   modelIdArgument,
+  modelNameArgument,
   regionNameArgument
 );
 await rootCommand.InvokeAsync(args);
diff --git a/packages/fileimport-service/ifc-dotnet/ifc-converter.csproj b/packages/fileimport-service/ifc-dotnet/ifc-converter.csproj
index df2c94ad1..42a5aad86 100644
--- a/packages/fileimport-service/ifc-dotnet/ifc-converter.csproj
+++ b/packages/fileimport-service/ifc-dotnet/ifc-converter.csproj
@@ -10,7 +10,7 @@
 
     <ItemGroup>
       <PackageReference Include="Microsoft.Extensions.DependencyInjection" Version="8.0.1" />
-      <PackageReference Include="Speckle.Importers.Ifc" Version="3.0.2-adam.3-38-gbdabd10b" />
+      <PackageReference Include="Speckle.Importers.Ifc" Version="3.0.0-jedd-test.2" />
       <PackageReference Include="System.CommandLine" Version="2.0.0-beta4.22272.1" />
     </ItemGroup>
 
diff --git a/packages/fileimport-service/src/daemon.js b/packages/fileimport-service/src/daemon.js
index a23f3abfe..52ff96a61 100644
--- a/packages/fileimport-service/src/daemon.js
+++ b/packages/fileimport-service/src/daemon.js
@@ -144,6 +144,7 @@ async function doTask(mainDb, regionName, taskDb, task) {
             info.streamId,
             `File upload: ${info.fileName}`,
             existingBranch?.id || '',
+            info.branchName,
             regionName
           ],
           {

From 365457d9be900a273467cace4477ea75884bd747 Mon Sep 17 00:00:00 2001
From: Jedd Morgan <45512892+JR-Morgan@users.noreply.github.com>
Date: Fri, 14 Mar 2025 15:52:28 +0000
Subject: [PATCH 2/2] versionid

---
 packages/fileimport-service/src/ifc-dotnet/Program.cs | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/packages/fileimport-service/src/ifc-dotnet/Program.cs b/packages/fileimport-service/src/ifc-dotnet/Program.cs
index 6f6818bbc..55fc7ff50 100644
--- a/packages/fileimport-service/src/ifc-dotnet/Program.cs
+++ b/packages/fileimport-service/src/ifc-dotnet/Program.cs
@@ -41,8 +41,8 @@ rootCommand.SetHandler(
         Token = token
       };
 
-      var commitId = await Import.Ifc(args);
-      File.WriteAllText(outputPath, JsonSerializer.Serialize(new { success = true, commitId }));
+      var version = await Import.Ifc(args);
+      File.WriteAllText(outputPath, JsonSerializer.Serialize(new { success = true, commitId = version.id }));
     }
     catch (Exception e)
     {