SF-3655 Do not update the draft in Mongo when another draft has started by pmachapman · Pull Request #3595 · sillsdev/web-xforge

pmachapman · 2025-11-30T20:52:52Z

This PR fixes a bug on QA, blocking its release to live, so I have marked as critical path.

This change is

codecov · 2025-11-30T21:00:56Z

Codecov Report

✅ All modified and coverable lines are covered by tests.
✅ Project coverage is 82.78%. Comparing base (b78d54a) to head (714a35b).
⚠️ Report is 1 commits behind head on master.
✅ All tests successful. No failed tests found.

Additional details and impacted files

@@            Coverage Diff             @@
##           master    #3595      +/-   ##
==========================================
- Coverage   82.78%   82.78%   -0.01%     
==========================================
  Files         610      610              
  Lines       37239    37249      +10     
  Branches     6100     6082      -18     
==========================================
+ Hits        30830    30835       +5     
- Misses       5481     5498      +17     
+ Partials      928      916      -12

☔ View full report in Codecov by Sentry.
📢 Have feedback on the report? Share it here.

marksvc · 2025-12-01T19:39:51Z

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

-                if (project.TranslateConfig.DraftConfig.CurrentScriptureRange != currentScriptureRange)
+                string currentScriptureRange = GetDraftedScriptureRange(lastTranslationBuild);
+                if (
+                    !string.IsNullOrWhiteSpace(currentScriptureRange)


📌 That's interesting. What are you thinking with regard to currentScriptureRange possibly being null or whitespace?

These will be older builds that did not use the scripture range format.

marksvc · 2025-12-01T20:26:47Z

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

+                string currentScriptureRange = GetDraftedScriptureRange(lastTranslationBuild);
+                if (
+                    !string.IsNullOrWhiteSpace(currentScriptureRange)
+                    && project.TranslateConfig.DraftConfig.CurrentScriptureRange != currentScriptureRange


📌 Actually, how would this be possible? If ExecuteWebhookAsync happens, and we mark a build as completed and run RetrievePreTranslationStatusAsync (from ExecuteWebhookAsync), wouldn't we have updated project.TranslateConfig.DraftConfig.CurrentScriptureRange from that completed build? Are we doing this because maybe we might not have heard back from a webhook, and so here we tidy up in case we had never heard back?

Are we doing this because maybe we might not have heard back from a webhook, and so here we tidy up in case we had never heard back?

Yes.

marksvc · 2025-12-01T22:11:36Z

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

+        );
+
+        // 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>());


📌 Oh, yes. Good fixing this check.

marksvc · 2025-12-01T22:54:36Z

Looks like still E2E failures :(

pmachapman

Reviewable status: 0 of 2 files reviewed, 3 unresolved discussions (waiting on @marksvc)

pmachapman · 2025-12-02T02:25:56Z

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

-                if (project.TranslateConfig.DraftConfig.CurrentScriptureRange != currentScriptureRange)
+                string currentScriptureRange = GetDraftedScriptureRange(lastTranslationBuild);
+                if (
+                    !string.IsNullOrWhiteSpace(currentScriptureRange)


These will be older builds that did not use the scripture range format.

pmachapman · 2025-12-02T02:25:57Z

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

+                string currentScriptureRange = GetDraftedScriptureRange(lastTranslationBuild);
+                if (
+                    !string.IsNullOrWhiteSpace(currentScriptureRange)
+                    && project.TranslateConfig.DraftConfig.CurrentScriptureRange != currentScriptureRange


Are we doing this because maybe we might not have heard back from a webhook, and so here we tidy up in case we had never heard back?

Yes.

pmachapman · 2025-12-02T02:25:57Z

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

+        );
+
+        // 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>());


Nateowami · 2025-12-09T19:11:45Z

Merging so we can finish testing on QA.

pmachapman added critical path PRs that are on our critical path and need attention to keep things moving. Priority 2nd. will require testing PR should not be merged until testers confirm testing is complete labels Nov 30, 2025

marksvc self-assigned this Dec 1, 2025

marksvc added the e2e Run e2e tests for this pull request label Dec 1, 2025

marksvc had a problem deploying to e2e_tests December 1, 2025 21:00 — with GitHub Actions Failure

marksvc approved these changes Dec 1, 2025

View reviewed changes

pmachapman removed the e2e Run e2e tests for this pull request label Dec 2, 2025

pmachapman commented Dec 2, 2025

View reviewed changes

pmachapman force-pushed the fix/SF-3655 branch 2 times, most recently from 4495143 to 060ae5c Compare December 2, 2025 22:42

pmachapman added ready to test and removed will require testing PR should not be merged until testers confirm testing is complete labels Dec 3, 2025

SF-3655 Do not update the draft in Mongo when another draft has started

714a35b

Nateowami force-pushed the fix/SF-3655 branch from 060ae5c to 714a35b Compare December 9, 2025 17:39

Nateowami added the e2e Run e2e tests for this pull request label Dec 9, 2025

Nateowami temporarily deployed to e2e_tests December 9, 2025 17:41 — with GitHub Actions Inactive

Nateowami merged commit 7d5fb11 into master Dec 9, 2025
27 of 28 checks passed

Nateowami deleted the fix/SF-3655 branch December 9, 2025 19:11

Uh oh!

Comments

Conversation

pmachapman commented Nov 30, 2025 • edited by irahopkinson Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Uh oh!

codecov bot commented Nov 30, 2025 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Codecov Report

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

marksvc commented Dec 1, 2025

Uh oh!

pmachapman left a comment

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Nateowami commented Dec 9, 2025

Uh oh!

Uh oh!

Reviewers

Assignees

Labels

Projects

Milestone

Development

Uh oh!

3 participants

pmachapman commented Nov 30, 2025 •

edited by irahopkinson

Loading

codecov bot commented Nov 30, 2025 •

edited

Loading