C# backend updates

Author: pmachapman

src/SIL.XForge.Scripture/Controllers/SFProjectsRpcController.cs

@@ -188,12 +188,24 @@ public async Task<IRpcMethodResult> UpdateSettings(string projectId, SFProjectSe
                     { "CheckingAnswerExport", settings?.CheckingAnswerExport },
                     { "SourceParatextId", settings?.SourceParatextId },
                     { "BiblicalTermsEnabled", settings?.BiblicalTermsEnabled?.ToString() },
-                    { "AdditionalTrainingDataFiles", settings?.AdditionalTrainingDataFiles?.ToString() },
-                    { "AlternateSourceParatextId", settings?.AlternateSourceParatextId },
-                    { "AlternateTrainingSourceEnabled", settings?.AlternateTrainingSourceEnabled?.ToString() },
-                    { "AlternateTrainingSourceParatextId", settings?.AlternateTrainingSourceParatextId },
-                    { "AdditionalTrainingSourceEnabled", settings?.AdditionalTrainingSourceEnabled?.ToString() },
-                    { "AdditionalTrainingSourceParatextId", settings?.AdditionalTrainingSourceParatextId },
+                    {
+                        "AdditionalTrainingDataFiles",
+                        settings?.AdditionalTrainingDataFiles is null
+                            ? null
+                            : string.Join(',', settings.AdditionalTrainingDataFiles)
+                    },
+                    {
+                        "DraftingSourcesParatextIds",
+                        settings?.DraftingSourcesParatextIds is null
+                            ? null
+                            : string.Join(',', settings.DraftingSourcesParatextIds)
+                    },
+                    {
+                        "TrainingSourcesParatextIds",
+                        settings?.TrainingSourcesParatextIds is null
+                            ? null
+                            : string.Join(',', settings.TrainingSourcesParatextIds)
+                    },
                     { "CheckingEnabled", settings?.CheckingEnabled?.ToString() },
                     { "TranslationSuggestionsEnabled", settings?.TranslationSuggestionsEnabled?.ToString() },
                     { "UsersSeeEachOthersResponses", settings?.UsersSeeEachOthersResponses?.ToString() },

src/SIL.XForge.Scripture/Models/DraftConfig.cs

@@ -4,12 +4,8 @@ namespace SIL.XForge.Scripture.Models;
 
 public class DraftConfig
 {
-    public bool AdditionalTrainingSourceEnabled { get; set; }
-    public TranslateSource? AdditionalTrainingSource { get; set; }
-    public bool AlternateSourceEnabled { get; set; }
-    public TranslateSource? AlternateSource { get; set; }
-    public bool AlternateTrainingSourceEnabled { get; set; }
-    public TranslateSource? AlternateTrainingSource { get; set; }
+    public IList<TranslateSource> DraftingSources { get; set; } = [];
+    public IList<TranslateSource> TrainingSources { get; set; } = [];
     public IList<ProjectScriptureRange> LastSelectedTrainingScriptureRanges { get; set; } = [];
     public IList<string> LastSelectedTrainingDataFiles { get; set; } = [];
     public IList<ProjectScriptureRange> LastSelectedTranslationScriptureRanges { get; set; } = [];

src/SIL.XForge.Scripture/Models/SFProjectSettings.cs

@@ -13,27 +13,16 @@ public class SFProjectSettings
     public bool? TranslationSuggestionsEnabled { get; set; }
     public string? SourceParatextId { get; set; }
     public bool? BiblicalTermsEnabled { get; set; }
-
-    [Obsolete("For backwards compatibility with older frontend clients. Deprecated November 2024.")]
-    public bool? TranslateShareEnabled { get; set; }
-
-    // pre-translation settings
-    [Obsolete("For backwards compatibility with older frontend clients. Deprecated June 2025.")]
-    public bool? AdditionalTrainingData { get; set; }
     public IEnumerable<string>? AdditionalTrainingDataFiles { get; set; }
-    public bool? AdditionalTrainingSourceEnabled { get; set; }
-    public string? AdditionalTrainingSourceParatextId { get; set; }
+
+    [Obsolete("For backwards compatibility with older frontend clients. Deprecated October 2025.")]
     public bool? AlternateSourceEnabled { get; set; }
-    public string? AlternateSourceParatextId { get; set; }
-    public bool? AlternateTrainingSourceEnabled { get; set; }
-    public string? AlternateTrainingSourceParatextId { get; set; }
+    public IEnumerable<string>? DraftingSourcesParatextIds { get; set; }
+    public IEnumerable<string>? TrainingSourcesParatextIds { get; set; }
 
     // checking settings
     public bool? CheckingEnabled { get; set; }
     public bool? UsersSeeEachOthersResponses { get; set; }
-
-    [Obsolete("For backwards compatibility with older frontend clients. Deprecated November 2024.")]
-    public bool? CheckingShareEnabled { get; set; }
     public string? CheckingAnswerExport { get; set; }
     public bool? HideCommunityCheckingText { get; set; }
 

src/SIL.XForge.Scripture/Services/MachineApiService.cs

@@ -1949,48 +1949,12 @@ await projectDoc.SubmitJson0OpAsync(op =>
         // We use project service, as it provides permission and token checks
         string jobId = await projectService.SyncAsync(curUserId, buildConfig.ProjectId);
 
-        // Store the project ids in a hashset to prevent duplicates
-        HashSet<string> syncProjectIds = [];
-
-        // If we have an alternate source, sync that first
-        string alternateSourceProjectId = projectDoc.Data.TranslateConfig.DraftConfig.AlternateSource?.ProjectRef;
-        if (
-            projectDoc.Data.TranslateConfig.DraftConfig.AlternateSourceEnabled
-            && !string.IsNullOrWhiteSpace(alternateSourceProjectId)
-        )
-        {
-            syncProjectIds.Add(alternateSourceProjectId);
-        }
-
-        // If we have an alternate training source, sync that next
-        string alternateTrainingSourceProjectId = projectDoc
-            .Data
-            .TranslateConfig
-            .DraftConfig
-            .AlternateTrainingSource
-            ?.ProjectRef;
-        if (
-            projectDoc.Data.TranslateConfig.DraftConfig.AlternateTrainingSourceEnabled
-            && !string.IsNullOrWhiteSpace(alternateTrainingSourceProjectId)
-        )
-        {
-            syncProjectIds.Add(alternateTrainingSourceProjectId);
-        }
-
-        // If we have an additional training source, sync that next
-        string additionalTrainingSourceProjectId = projectDoc
-            .Data
-            .TranslateConfig
-            .DraftConfig
-            .AdditionalTrainingSource
-            ?.ProjectRef;
-        if (
-            projectDoc.Data.TranslateConfig.DraftConfig.AdditionalTrainingSourceEnabled
-            && !string.IsNullOrWhiteSpace(additionalTrainingSourceProjectId)
-        )
-        {
-            syncProjectIds.Add(additionalTrainingSourceProjectId);
-        }
+        // Store the project ids to sync in a hashset to prevent duplicates
+        HashSet<string> syncProjectIds =
+        [
+            .. projectDoc.Data.TranslateConfig.DraftConfig.TrainingSources.Select(s => s.ProjectRef),
+            .. projectDoc.Data.TranslateConfig.DraftConfig.DraftingSources.Select(s => s.ProjectRef),
+        ];
 
         // Remove the source project, as it was synced when the target was synced
         string sourceProjectId = projectDoc.Data.TranslateConfig.Source?.ProjectRef;