Remove downloading of draft when retrieving last completed build (#3610)

Co-authored-by: Nathaniel Paulus <[email protected]>

Author: pmachapman

src/SIL.XForge.Scripture/ClientApp/e2e/workflows/localized-screenshots.ts

@@ -417,9 +417,15 @@ export async function localizedScreenshots(
   await navLocator(page, 'settings').click();
   await navLocator(page, 'generate_draft').click();
   await expect(page.getByText('The draft is ready')).toBeVisible();
-  // Wait for the draft to finalize
-  await expect(page.getByText('Draft is Finishing')).toBeVisible();
-  await expect(page.getByText('Draft is Finishing')).not.toBeVisible({ timeout: 15_000 });
+  // Wait for draft to finalize. In some cases it may already have finalized, so if it doesn't show up, skip it
+  let finishing: boolean;
+  try {
+    await expect(page.getByText('Draft is Finishing')).toBeVisible({ timeout: 15_000 });
+    finishing = true;
+  } catch {
+    finishing = false;
+  }
+  if (finishing) await expect(page.getByText('Draft is Finishing')).not.toBeVisible({ timeout: 15_000 });
 
   // Select formatting options
   await user.click(page.getByRole('button', { name: 'Formatting options' }));

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

@@ -1063,36 +1063,16 @@ CancellationToken cancellationToken
 
         try
         {
-            // Get the last build and the last completed build
+            // Get the last completed build
             IList<TranslationBuild> translationBuilds = await translationEnginesClient.GetAllBuildsAsync(
                 translationEngineId,
                 cancellationToken
             );
-            TranslationBuild? lastTranslationBuild = translationBuilds.LastOrDefault();
             TranslationBuild? lastCompletedTranslationBuild = translationBuilds
                 .Where(b => b.State == JobState.Completed)
                 .MaxBy(b => b.DateFinished);
-
-            // See if the very last build has completed
-            if (lastTranslationBuild?.State == JobState.Completed)
-            {
-                // See if the current scripture range has changed
-                string currentScriptureRange = GetDraftedScriptureRange(lastTranslationBuild);
-                if (
-                    !string.IsNullOrWhiteSpace(currentScriptureRange)
-                    && project.TranslateConfig.DraftConfig.CurrentScriptureRange != currentScriptureRange
-                )
-                {
-                    backgroundJobClient.Enqueue<IMachineApiService>(r =>
-                        r.RetrievePreTranslationStatusAsync(sfProjectId, CancellationToken.None)
-                    );
-                }
-
-                buildDto = CreateDto(lastTranslationBuild);
-            }
-            else if (lastCompletedTranslationBuild is not null)
+            if (lastCompletedTranslationBuild is not null)
             {
-                // The very last build is active, so return the last completed build
                 buildDto = CreateDto(lastCompletedTranslationBuild);
             }
         }

test/SIL.XForge.Scripture.Tests/Services/MachineApiServiceTests.cs

@@ -1869,76 +1869,7 @@ public async Task GetLastCompletedPreTranslationBuildAsync_ServalAdminDoesNotNee
     }
 
     [Test]
-    public async Task GetLastCompletedPreTranslationBuildAsync_RetrievePreTranslationStatusAsyncCall_Success()
-    {
-        // Set up test environment
-        var env = new TestEnvironment();
-        const string buildDtoId = $"{Project01}.{Build01}";
-        const double percentCompleted = 0;
-        const int revision = 43;
-        const JobState state = JobState.Completed;
-        env.TranslationEnginesClient.GetAllBuildsAsync(TranslationEngine01, CancellationToken.None)
-            .Returns(
-                Task.FromResult<IList<TranslationBuild>>(
-                    [
-                        new TranslationBuild
-                        {
-                            Url = "https://example.com",
-                            Id = Build01,
-                            Engine = new ResourceLink { Id = "engineId", Url = "https://example.com" },
-                            Message = MachineApiService.BuildStateCompleted,
-                            Progress = percentCompleted,
-                            Revision = revision,
-                            State = state,
-                            DateFinished = DateTimeOffset.UtcNow,
-                            Pretranslate =
-                            [
-                                new PretranslateCorpus
-                                {
-                                    ParallelCorpus = new ResourceLink
-                                    {
-                                        Id = ParallelCorpusId01,
-                                        Url = "https://example.com",
-                                    },
-                                    SourceFilters =
-                                    [
-                                        new ParallelCorpusFilter
-                                        {
-                                            Corpus = { Id = ParallelCorpusId01, Url = "https://example.com" },
-                                            ScriptureRange = "GEN",
-                                        },
-                                    ],
-                                },
-                            ],
-                        },
-                    ]
-                )
-            );
-        _ = env.Projects.Get(Project01);
-
-        // SUT
-        ServalBuildDto? actual = await env.Service.GetLastCompletedPreTranslationBuildAsync(
-            User01,
-            Project01,
-            false,
-            CancellationToken.None
-        );
-
-        // Verify that a job was scheduled and the correct build was returned
-        env.BackgroundJobClient.Received(1).Create(Arg.Any<Job>(), Arg.Any<IState>());
-        Assert.IsNotNull(actual);
-        Assert.AreEqual(MachineApiService.BuildStateCompleted, actual.Message);
-        Assert.AreEqual(percentCompleted, actual.PercentCompleted);
-        Assert.AreEqual(revision, actual.Revision);
-        Assert.AreEqual(state.ToString().ToUpperInvariant(), actual.State);
-        Assert.AreEqual(buildDtoId, actual.Id);
-        Assert.AreEqual(MachineApi.GetBuildHref(Project01, Build01), actual.Href);
-        Assert.AreEqual(Project01, actual.Engine.Id);
-        Assert.AreEqual(MachineApi.GetEngineHref(Project01), actual.Engine.Href);
-    }
-
-    [Test]
-    public async Task GetLastCompletedPreTranslationBuildAsync_NoRetrievePreTranslationStatusAsyncCallWhenActiveBuild_Success()
+    public async Task GetLastCompletedPreTranslationBuildAsync_Success()
     {
         // Set up test environment
         var env = new TestEnvironment();
@@ -1993,9 +1924,6 @@ public async Task GetLastCompletedPreTranslationBuildAsync_NoRetrievePreTranslat
             CancellationToken.None
         );
 
-        // RetrievePreTranslationStatusAsync is run via a background job, so we verify that no new job was scheduled
-        env.BackgroundJobClient.DidNotReceive().Create(Arg.Any<Job>(), Arg.Any<IState>());
-
         TestEnvironment.AssertCoreBuildProperties(CompletedTranslationBuild, actual);
     }