fix api client generation

cmu-sei · Oct 28, 2024 · db6d8e9 · db6d8e9
1 parent 8968fd1
commit db6d8e9
Show file tree

Hide file tree

Showing 3 changed files with 27 additions and 24 deletions.
diff --git a/src/TopoMojo.Agent/TopoMojo.Agent.csproj b/src/TopoMojo.Agent/TopoMojo.Agent.csproj
@@ -9,7 +9,10 @@
 
   <ItemGroup>
     <PackageReference Include="Microsoft.AspNetCore.SignalR.Client" Version="8.0.0" />
-    <PackageReference Include="TopoMojo.Api.Client" Version="2.3.1" />
+  </ItemGroup>
+
+  <ItemGroup>
+    <ProjectReference Include="..\TopoMojo.Api.Client\TopoMojo.Api.Client.csproj" />
   </ItemGroup>
 
 </Project>
diff --git a/src/TopoMojo.Api.Client/TopoMojo.Api.Client.csproj b/src/TopoMojo.Api.Client/TopoMojo.Api.Client.csproj
@@ -11,11 +11,11 @@
     <PackageId>TopoMojo.Api.Client</PackageId>
     <PackageLicenseExpression>BSD-3-Clause</PackageLicenseExpression>
     <RepositoryUrl>https://github.com/cmu-sei/TopoMojo</RepositoryUrl>
-    <Version>2.3.1</Version>
+    <Version>2.3.2</Version>
   </PropertyGroup>
 
   <ItemGroup>
-    <PackageReference Include="System.Text.Json" Version="8.0.4" />
+    <PackageReference Include="System.Text.Json" Version="8.0.5" />
   </ItemGroup>
 
 </Project>
diff --git a/src/TopoMojo.Api/Features/Gamespace/ChallengeModels.cs b/src/TopoMojo.Api/Features/Gamespace/ChallengeModels.cs
@@ -20,24 +20,24 @@ public class ChallengeView
 
     public class ChallengeProgressView
     {
-        public required string Id { get; set; }
-        public required int Attempts { get; set; }
-        public required long ExpiresAtTimestamp { get; set; }
-        public required int MaxAttempts { get; set; }
-        public required int MaxPoints { get; set; }
-        public required DateTimeOffset? LastScoreTime { get; set; }
-        public required double? NextSectionPreReqThisSection { get; set; }
-        public required double? NextSectionPreReqTotal { get; set; }
-        public required double Score { get; set; }
-        public required VariantView Variant { get; set; }
-        public required string Text { get; set; }
+        public string Id { get; set; }
+        public int Attempts { get; set; }
+        public long ExpiresAtTimestamp { get; set; }
+        public int MaxAttempts { get; set; }
+        public int MaxPoints { get; set; }
+        public DateTimeOffset? LastScoreTime { get; set; }
+        public double? NextSectionPreReqThisSection { get; set; }
+        public double? NextSectionPreReqTotal { get; set; }
+        public double Score { get; set; }
+        public VariantView Variant { get; set; } = new();
+        public string Text { get; set; }
     }
 
     public class VariantView
     {
-        public required string Text { get; set; }
-        public required ICollection<SectionView> Sections { get; set; } = [];
-        public required int TotalSectionCount { get; set; }
+        public string Text { get; set; }
+        public ICollection<SectionView> Sections { get; set; } = [];
+        public int TotalSectionCount { get; set; }
     }
 
     public class SectionView
@@ -64,13 +64,13 @@ public class QuestionView
 
     public class QuestionSetEligibility
     {
-        public required int SetIndex { get; set; }
-        public required bool IsComplete { get; set; }
-        public required bool IsEligible { get; set; }
-        public required double PreReqPrevSection { get; set; }
-        public required double PreReqTotal { get; set; }
-        public required double WeightScoredPreviousSection { get; set; }
-        public required double WeightScoredTotal { get; set; }
+        public int SetIndex { get; set; }
+        public bool IsComplete { get; set; }
+        public bool IsEligible { get; set; }
+        public double PreReqPrevSection { get; set; }
+        public double PreReqTotal { get; set; }
+        public double WeightScoredPreviousSection { get; set; }
+        public double WeightScoredTotal { get; set; }
     }
 
     public class SectionSubmission