Used deployment version

sillsdev · Oct 23, 2024 · 2cc125b · 2cc125b
1 parent 00a6d3f
commit 2cc125b
Show file tree

Hide file tree

Showing 6 changed files with 12 additions and 7 deletions.
diff --git a/src/Serval/src/Serval.Client/Client.g.cs b/src/Serval/src/Serval.Client/Client.g.cs
@@ -9816,8 +9816,8 @@ public partial class TranslationBuild
         [Newtonsoft.Json.JsonProperty("options", Required = Newtonsoft.Json.Required.Default, NullValueHandling = Newtonsoft.Json.NullValueHandling.Ignore)]
         public object? Options { get; set; } = default!;
 
-        [Newtonsoft.Json.JsonProperty("servalVersion", Required = Newtonsoft.Json.Required.Default, NullValueHandling = Newtonsoft.Json.NullValueHandling.Ignore)]
-        public string? ServalVersion { get; set; } = default!;
+        [Newtonsoft.Json.JsonProperty("deploymentVersion", Required = Newtonsoft.Json.Required.Default, NullValueHandling = Newtonsoft.Json.NullValueHandling.Ignore)]
+        public string? DeploymentVersion { get; set; } = default!;
 
     }
 

diff --git a/src/Serval/src/Serval.Shared/Configuration/ApiOptions.cs b/src/Serval/src/Serval.Shared/Configuration/ApiOptions.cs
@@ -6,5 +6,4 @@ public class ApiOptions
 
     public TimeSpan DefaultHttpRequestTimeout { get; set; } = TimeSpan.FromSeconds(58); // must be less than 60 seconds Cloudflare timeout
     public TimeSpan LongPollTimeout { get; set; } = TimeSpan.FromSeconds(40); // must be less than DefaultHttpRequestTimeout
-    public string ServalVersion { get; set; } = "1.0.0"; // Default value
 }
diff --git a/src/Serval/src/Serval.Translation/Contracts/TranslationBuildDto.cs b/src/Serval/src/Serval.Translation/Contracts/TranslationBuildDto.cs
@@ -27,5 +27,6 @@ public record TranslationBuildDto
     /// }
     /// </example>
     public object? Options { get; init; }
-    public string? ServalVersion { get; init; }
+    public string? DeploymentVersion { get; init; }
+    // public string? ServalVersion { get; init; }
 }
diff --git a/src/Serval/src/Serval.Translation/Controllers/TranslationEnginesController.cs b/src/Serval/src/Serval.Translation/Controllers/TranslationEnginesController.cs
@@ -9,6 +9,7 @@ public class TranslationEnginesController(
     IBuildService buildService,
     IPretranslationService pretranslationService,
     IOptionsMonitor<ApiOptions> apiOptions,
+    IConfiguration configuration,
     IUrlService urlService,
     ILogger<TranslationEnginesController> logger
 ) : ServalControllerBase(authService)
@@ -22,6 +23,7 @@ ILogger<TranslationEnginesController> logger
     private readonly IOptionsMonitor<ApiOptions> _apiOptions = apiOptions;
     private readonly IUrlService _urlService = urlService;
     private readonly ILogger<TranslationEnginesController> _logger = logger;
+    private readonly IConfiguration _configuration = configuration;
 
     // private readonly ServalSettings _servalSettings = apiOptions.Value;
 
@@ -1508,7 +1510,8 @@ private TranslationBuildDto Map(Build source)
             State = source.State,
             DateFinished = source.DateFinished,
             Options = source.Options,
-            ServalVersion = _apiOptions.CurrentValue.ServalVersion
+            // ServalVersion = _apiOptions.CurrentValue.ServalVersion
+            DeploymentVersion = _configuration.GetValue<string>("DeploymentVersion")
         };
     }
 

diff --git a/src/Serval/src/Serval.Translation/Models/Build.cs b/src/Serval/src/Serval.Translation/Models/Build.cs
@@ -15,5 +15,5 @@ public record Build : IEntity
     public JobState State { get; init; } = JobState.Pending;
     public DateTime? DateFinished { get; init; }
     public IReadOnlyDictionary<string, object>? Options { get; init; }
-    public string? ServalVersion { get; set; }
+    public string? DeploymentVersion { get; set; }
 }
diff --git a/src/Serval/test/Serval.ApiServer.IntegrationTests/TranslationEngineTests.cs b/src/Serval/test/Serval.ApiServer.IntegrationTests/TranslationEngineTests.cs
@@ -1392,9 +1392,11 @@ public async Task StartBuildForEngineByIdAsync(IEnumerable<string> scope, int ex
                 build = await client.GetCurrentBuildAsync(engineId);
                 Assert.That(build, Is.Not.Null);
 
+                Assert.That(build.DeploymentVersion, Is.EqualTo("1.6.3")); // Replace with actual expected version
+
                 // Fetch and assert ServalVersion from ApiOptions
                 // ApiOptions apiOptions = _env.GetRequiredService<IOptionsMonitor<ApiOptions>>().CurrentValue;
-                Assert.That(_env.ApiOptions.CurrentValue.ServalVersion, Is.Not.Null);
+                // Assert.That(_env.ApiOptions.CurrentValue.ServalVersion, Is.Not.Null);
                 // Assert.That(apiOptions.ServalVersion, Is.EqualTo("expected_version")); // Replace with the actual expected version
 
                 break;