Tweak serialization

.config/dotnet-tools.json

@@ -24,7 +24,7 @@
       "rollForward": false
     },
     "dotnet-ef": {
-      "version": "10.0.0-rc.1.25451.107",
+      "version": "9.0.9",
       "commands": [
         "dotnet-ef"
       ],

.gitignore

@@ -385,4 +385,5 @@ python_project_root/
 DotWrap/
 # /tests/BeamOs.Tests.Common/SolvedProblems/**/*.g.cs
 
-*.user.props
+*.user.props
+*.user.cs

Directory.Packages.props

@@ -124,7 +124,7 @@
     <PackageVersion Include="Testcontainers.MsSql" Version="4.1.0" />
     <PackageVersion Include="Testcontainers.PostgreSql" Version="4.1.0" />
     <PackageVersion Include="TngTech.ArchUnitNET" Version="0.11.3" />
-    <PackageVersion Include="TUnit" Version="0.61.13" />
+    <PackageVersion Include="TUnit" Version="0.63.3" />
     <PackageVersion Include="Verify" Version="30.18.0" />
     <PackageVersion Include="Verify.SourceGenerators" Version="2.5.0" />
     <PackageVersion Include="Verify.TUnit" Version="30.18.0" />

codeGen/BeamOs.CodeGen.ApiGenerator/ApiGenerators/AbstractGeneratorFromEndpoints.cs

@@ -78,7 +78,9 @@ public async Task GenerateClients()
 
             if (!Path.Exists(this.DestinationPath))
             {
-                Directory.CreateDirectory(this.DestinationPath);
+                throw new DirectoryNotFoundException(
+                    $"Destination path '{this.DestinationPath}' not found."
+                );
             }
 
             await File.WriteAllTextAsync(

global.json

@@ -1,6 +1,6 @@
 {
   "sdk": {
-    "version": "10.0.0",
+    "version": "9.0.0",
     "rollForward": "latestMinor"
   }
 }

scripts/codegen.sh

@@ -1,4 +1,5 @@
 #!/bin/bash
+
 SCRIPT_DIR="$(cd "$(dirname "${BASH_SOURCE[0]}")" && pwd)"
 BEAMOS_ROOT="$(cd "$SCRIPT_DIR/.." && pwd)"
 

src/Common/BeamOs.Common.Api/BeamOsBaseEndpointExtensions.cs

@@ -7,8 +7,26 @@
 
 namespace BeamOs.Common.Api;
 
-public static class BeamOsBaseEndpointExtensions
+internal static class BeamOsBaseEndpointExtensions
 {
+    extension<TRequest, TResponse>(BeamOsBaseEndpoint<TRequest, TResponse> result)
+    {
+        /// <summary>
+        /// Do not remove. This method says 0 usages, but that is not true. It is used instead of ExecuteAsync when
+        /// generating strongly typed api clients
+        /// </summary>
+        /// <param name="req"></param>
+        /// <param name="ct"></param>
+        /// <returns></returns>
+#pragma warning disable CA1822 // Mark members as static
+        internal TResponse GetResponseTypeForClientGenerationPurposes(
+#pragma warning restore CA1822 // Mark members as static
+        )
+        {
+            return default!;
+        }
+    }
+
     extension<TResponse>(Result<TResponse> result)
     {
         /// <summary>
@@ -66,6 +84,24 @@ [EnumeratorCancellation] CancellationToken ct
     }
 #endif
 }
+public static class BeamOsBaseEndpointMoreExtensions
+{
+    extension<TResponse>(Result<TResponse> result)
+        where TResponse : IResult
+    {
+#pragma warning disable IDE0060 // Remove unused parameter
+        public IResult ToWebResult(CancellationToken ct = default)
+#pragma warning restore IDE0060 // Remove unused parameter
+        {
+            if (result.IsSuccess)
+            {
+                return TypedResults.Ok(result.Value);
+            }
+            return BeamOsErrorUtils.MapErrorToResult(result.Error);
+        }
+    }
+}
+
 
 internal static class BeamOsErrorUtils
 {

src/Identity/BeamOs.Identity/IUserApiTokenService.cs

@@ -6,7 +6,7 @@ public interface IUserApiTokenService
 {
     public Task<Result<ApiTokenResponse>> CreateToken(CreateApiTokenRequest token);
 
-    public Task<Result<List<ApiTokenResponse>>> GetTokens();
+    public Task<Result<ICollection<ApiTokenResponse>>> GetTokens();
 
     public Task RevokeToken(string tokenName);
 }
@@ -46,9 +46,9 @@ public Task<Result<ApiTokenResponse>> CreateToken(CreateApiTokenRequest token)
         return Task.FromResult(result);
     }
 
-    public Task<Result<List<ApiTokenResponse>>> GetTokens()
+    public Task<Result<ICollection<ApiTokenResponse>>> GetTokens()
     {
-        Result<List<ApiTokenResponse>> result = this.apiTokenResponses;
+        Result<ICollection<ApiTokenResponse>> result = this.apiTokenResponses;
         return Task.FromResult(result);
     }
 

src/StructuralAnalysis/BeamOs.StructuralAnalysis.Api/DependencyInjection.cs

@@ -1,6 +1,7 @@
 using System.Reflection;
 using BeamOs.Common.Api;
 using BeamOs.StructuralAnalysis.Infrastructure;
+using BeamOs.StructuralAnalysis.Sdk;
 using Microsoft.EntityFrameworkCore;
 using ServiceScan.SourceGenerator;
 
@@ -84,6 +85,17 @@ public static async Task InitializeBeamOsDb(this WebApplication app)
         {
             using var scope = app.Services.CreateScope();
             await BeamOs.StructuralAnalysis.Infrastructure.DependencyInjection.MigrateDb(scope);
+
+            var apiClient = scope.ServiceProvider.GetRequiredService<BeamOsResultApiClient>();
+            foreach (var model in Tests.Common.AllSolvedProblems.ModelFixtures())
+            {
+                if (await model.CreateOnly(apiClient))
+                {
+                    await apiClient
+                        .Models[model.Id]
+                        .Analyze.Opensees.RunOpenSeesAnalysisAsync(new());
+                }
+            }
         }
     }
 }

src/StructuralAnalysis/BeamOs.StructuralAnalysis.Core/OpenSees/OpenSeesAnalysisModel.cs

@@ -135,10 +135,10 @@ private async Task RunTclWithOpenSees(string tclFileWithPath, string outputDir)
         }
         else if (RuntimeInformation.IsOSPlatform(OSPlatform.Linux))
         {
-            if (Directory.Exists("/root/OpenSees/build/bin"))
+            if (Directory.Exists("/opt/OpenSees/build/bin"))
             {
                 // i don't know why, but the executable is much faster when built in the docker container
-                exePath = "/root/OpenSees/build/bin/OpenSees";
+                exePath = "/opt/OpenSees/build/bin/OpenSees";
             }
             else
             {

src/StructuralAnalysis/BeamOs.StructuralAnalysis.Core/PhysicalModel/ModelAggregate/ModelCreatedEvent.cs

@@ -3,6 +3,6 @@
 
 namespace BeamOs.StructuralAnalysis.Domain.PhysicalModel.ModelAggregate;
 
-internal record struct ModelCreatedEvent(Guid ModelId, int? UserId = null)
+public record struct ModelCreatedEvent(Guid ModelId, int? UserId = null)
     : IDomainEvent,
         INotification;

src/WebApp/BeamOs.WebApp.Components/Features/Identity/UserSettings/UserSettings.razor

@@ -256,7 +256,7 @@
     }
 
     private ApiUsageResponse? UsageSummary;
-    private List<ApiTokenResponse>? ApiTokens;
+    private ICollection<ApiTokenResponse>? ApiTokens;
 
     protected override async Task OnInitializedAsync()
     {

src/WebApp/BeamOs.WebApp.Components/Features/ModelsPage/ModelPageState.cs

@@ -23,7 +23,29 @@ public ModelPageState(IReadOnlyCollection<ModelInfoResponse> modelResponses)
 
     static ModelPageState()
     {
-        List<ModelInfoResponse> sampleModels = [];
+        SampleModelResponses =
+        [
+            new(
+                Guid.Parse("4ce66084-4ac1-40bc-99ae-3d0f334c66fa"),
+                "Twisty Bowl Framing",
+                "A crazy twisting bowl type structure. Made by Bjorn Steinhagen in grasshopper and then sent to beamOS using Speckle",
+                new ModelSettings(
+                    unitSettings: new UnitSettingsContract
+                    {
+                        LengthUnit = LengthUnitContract.Inch,
+                        ForceUnit = ForceUnitContract.KilopoundForce,
+                        AngleUnit = AngleUnitContract.Radian,
+                    },
+                    analysisSettings: new AnalysisSettings
+                    {
+                        Element1DAnalysisType = Element1dAnalysisType.Timoshenko,
+                    },
+                    yAxisUp: true
+                ),
+                DateTimeOffset.Parse("2023-11-01T12:00:00Z"),
+                "Sample"
+            ),
+        ];
         // foreach (var modelBuilder in AllSolvedProblems.ModelFixtures())
         // {
         //     // Only add sample models from SAP2000 because they look the coolest
@@ -43,6 +65,5 @@ static ModelPageState()
         //         )
         //     );
         // }
-        SampleModelResponses = sampleModels;
     }
 }

tests/Directory.Build.props

@@ -5,7 +5,8 @@
   <PropertyGroup>
     <TUnitImplictUsings>false</TUnitImplictUsings>
     <BeamOsStructuralAnalysisSdkRef>false</BeamOsStructuralAnalysisSdkRef>
-    <UseBeamOsPackage Condition="'$(ContinuousIntegrationEnv)' == 'true' or '$(BeamOsVersion)' != ''">true</UseBeamOsPackage>
+    <!-- <UseBeamOsPackage Condition="'$(ContinuousIntegrationEnv)' == 'true' or '$(BeamOsVersion)' != ''">true</UseBeamOsPackage> -->
+    <UseBeamOsPackage>false</UseBeamOsPackage>
   </PropertyGroup>
 
   <!-- Use project references locally, but use nuget package in CI -->