Merge pull request #4200 from specklesystems/jrm/ifc-nuget-bump2

Bump nuget + IFC Importer args

packages/fileimport-service/src/controller/daemon.ts

@@ -164,6 +164,7 @@ async function doTask(
             info.streamId,
             `File upload: ${info.fileName}`,
             existingBranch?.id || '',
+            info.branchName,
             regionName
           ],
           {

packages/fileimport-service/src/ifc-dotnet/Program.cs

@@ -4,31 +4,45 @@ 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);
-      File.WriteAllText(outputPath, JsonSerializer.Serialize(new { success = true, commitId }));
+      ImporterArgs args = new()
+      {
+        ServerUrl = new(url),
+        FilePath = filePath,
+        ProjectId = projectId,
+        ModelId = modelId,
+        ModelName = modelName,
+        VersionMessage = versionMessage,
+        Token = token
+      };
+
+      var version = await Import.Ifc(args);
+      File.WriteAllText(outputPath, JsonSerializer.Serialize(new { success = true, commitId = version.id }));
     }
     catch (Exception e)
     {
@@ -42,9 +56,10 @@ rootCommand.SetHandler(
   },
   filePathArgument,
   outputPathArgument,
-  streamIdArgument,
-  commitMessageArgument,
+  projectIdArgument,
+  versionMessageArgument,
   modelIdArgument,
+  modelNameArgument,
   regionNameArgument
 );
 await rootCommand.InvokeAsync(args);

packages/fileimport-service/src/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>