Move sem-dom count updates into WordService

imnasnainaec · imnasnainaec · commit faf07eb11519 · 2026-01-16T16:43:56.000-05:00
diff --git a/Backend.Tests/Controllers/AudioControllerTests.cs b/Backend.Tests/Controllers/AudioControllerTests.cs
@@ -35,10 +35,11 @@ public void Dispose()
         public void Setup()
         {
             _projRepo = new ProjectRepositoryMock();
+            var semDomCountRepo = new SemanticDomainCountRepositoryMock();
             _wordRepo = new WordRepositoryMock();
             _permissionService = new PermissionServiceMock();
-            var semDomCountService = new SemanticDomainCountService(new SemanticDomainCountRepositoryMock());
-            _wordService = new WordService(_wordRepo, semDomCountService);
+            var semDomCountService = new SemanticDomainCountService(semDomCountRepo);
+            _wordService = new WordService(semDomCountRepo, _wordRepo, semDomCountService);
             _audioController = new AudioController(_wordRepo, _wordService, _permissionService);
 
             _projId = _projRepo.Create(new Project { Name = "AudioControllerTests" }).Result!.Id;
diff --git a/Backend.Tests/Controllers/LiftControllerTests.cs b/Backend.Tests/Controllers/LiftControllerTests.cs
@@ -51,10 +51,10 @@ public void Setup()
             _wordRepo = new WordRepositoryMock();
             _liftService = new LiftService();
             var semDomCountService = new SemanticDomainCountService(semDomCountRepo);
-            _wordService = new WordService(_wordRepo, semDomCountService);
+            _wordService = new WordService(semDomCountRepo, _wordRepo, semDomCountService);
             _liftController = new LiftController(_projRepo, new SemanticDomainRepositoryMock(), semDomCountRepo,
                 _speakerRepo, _wordRepo, _liftService, new HubContextMock<ExportHub>(), new PermissionServiceMock(),
-                semDomCountService, new MockLogger());
+                _wordService, new MockLogger());
 
             _projId = _projRepo.Create(new Project { Name = ProjName }).Result!.Id;
             _file = new FormFile(_stream, 0, _stream.Length, "Name", FileName);
diff --git a/Backend.Tests/Controllers/MergeControllerTests.cs b/Backend.Tests/Controllers/MergeControllerTests.cs
@@ -38,9 +38,10 @@ public void Setup()
                 new ServiceCollection().AddMemoryCache().BuildServiceProvider().GetRequiredService<IMemoryCache>();
             _mergeBlacklistRepo = new MergeBlacklistRepositoryMock();
             _mergeGraylistRepo = new MergeGraylistRepositoryMock();
+            var semDomCountRepo = new SemanticDomainCountRepositoryMock();
             _wordRepo = new WordRepositoryMock();
-            var semDomCountService = new SemanticDomainCountService(new SemanticDomainCountRepositoryMock());
-            _wordService = new WordService(_wordRepo, semDomCountService);
+            var semDomCountService = new SemanticDomainCountService(semDomCountRepo);
+            _wordService = new WordService(semDomCountRepo, _wordRepo, semDomCountService);
             _mergeService = new MergeService(_cache, _mergeBlacklistRepo, _mergeGraylistRepo, _wordRepo, _wordService);
             var notifyService = new HubContextMock<MergeHub>();
             var permissionService = new PermissionServiceMock();
diff --git a/Backend.Tests/Controllers/WordControllerTests.cs b/Backend.Tests/Controllers/WordControllerTests.cs
@@ -31,9 +31,10 @@ public void Dispose()
         [SetUp]
         public void Setup()
         {
+            var semDomCountRepo = new SemanticDomainCountRepositoryMock();
             _wordRepo = new WordRepositoryMock();
-            var semDomCountService = new SemanticDomainCountService(new SemanticDomainCountRepositoryMock());
-            _wordService = new WordService(_wordRepo, semDomCountService);
+            var semDomCountService = new SemanticDomainCountService(semDomCountRepo);
+            _wordService = new WordService(semDomCountRepo, _wordRepo, semDomCountService);
             _permissionService = new PermissionServiceMock();
             _wordController = new WordController(_wordRepo, _wordService, _permissionService);
         }
diff --git a/Backend.Tests/Services/MergeServiceTests.cs b/Backend.Tests/Services/MergeServiceTests.cs
@@ -30,9 +30,10 @@ public void Setup()
                 new ServiceCollection().AddMemoryCache().BuildServiceProvider().GetRequiredService<IMemoryCache>();
             _mergeBlacklistRepo = new MergeBlacklistRepositoryMock();
             _mergeGraylistRepo = new MergeGraylistRepositoryMock();
+            var semDomCountRepo = new SemanticDomainCountRepositoryMock();
             _wordRepo = new WordRepositoryMock();
-            var semDomCountService = new SemanticDomainCountService(new SemanticDomainCountRepositoryMock());
-            _wordService = new WordService(_wordRepo, semDomCountService);
+            var semDomCountService = new SemanticDomainCountService(semDomCountRepo);
+            _wordService = new WordService(semDomCountRepo, _wordRepo, semDomCountService);
             _mergeService = new MergeService(_cache, _mergeBlacklistRepo, _mergeGraylistRepo, _wordRepo, _wordService);
         }
 
diff --git a/Backend.Tests/Services/WordServiceTests.cs b/Backend.Tests/Services/WordServiceTests.cs
@@ -19,9 +19,10 @@ internal sealed class WordServiceTests
         [SetUp]
         public void Setup()
         {
+            var semDomCountRepo = new SemanticDomainCountRepositoryMock();
             _wordRepo = new WordRepositoryMock();
-            var semDomCountService = new SemanticDomainCountService(new SemanticDomainCountRepositoryMock());
-            _wordService = new WordService(_wordRepo, semDomCountService);
+            var semDomCountService = new SemanticDomainCountService(semDomCountRepo);
+            _wordService = new WordService(semDomCountRepo, _wordRepo, semDomCountService);
         }
 
         [Test]
diff --git a/Backend/Controllers/LiftController.cs b/Backend/Controllers/LiftController.cs
@@ -25,7 +25,7 @@ namespace BackendFramework.Controllers
     public class LiftController(IProjectRepository projRepo, ISemanticDomainRepository semDomRepo,
         ISemanticDomainCountRepository semDomCountRepository, ISpeakerRepository speakerRepo, IWordRepository wordRepo,
         ILiftService liftService, IHubContext<ExportHub> notifyService, IPermissionService permissionService,
-        ISemanticDomainCountService semDomCountService, ILogger<LiftController> logger) : Controller
+        IWordService wordService, ILogger<LiftController> logger) : Controller
     {
         private readonly IProjectRepository _projRepo = projRepo;
         private readonly ISemanticDomainRepository _semDomRepo = semDomRepo;
@@ -35,7 +35,7 @@ public class LiftController(IProjectRepository projRepo, ISemanticDomainReposito
         private readonly ILiftService _liftService = liftService;
         private readonly IHubContext<ExportHub> _notifyService = notifyService;
         private readonly IPermissionService _permissionService = permissionService;
-        private readonly ISemanticDomainCountService _semDomCountService = semDomCountService;
+        private readonly IWordService _wordService = wordService;
         private readonly ILogger<LiftController> _logger = logger;
 
         private const string otelTagName = "otel.LiftController";
@@ -111,8 +111,7 @@ public async Task<IActionResult> DeleteFrontierAndFinishUploadLiftFile(string pr
             }
 
             // Delete all frontier words and load the LIFT data
-            await _wordRepo.DeleteAllFrontierWords(projectId);
-            await _semDomCountRepository.DeleteAllCounts(projectId);
+            await _wordService.ClearFrontier(projectId);
             return await FinishUploadLiftFile(projectId, userId, true);
         }
 
@@ -264,8 +263,8 @@ private async Task<IActionResult> AddImportToProject(string liftStoragePath, str
 
             int countWordsImported;
             // Sets the projectId of our parser to add words to that project
-            var liftMerger = _liftService.GetLiftImporterExporter(
-                projectId, proj.VernacularWritingSystem.Bcp47, _wordRepo, _semDomCountService);
+            var liftMerger =
+                _liftService.GetLiftImporterExporter(projectId, proj.VernacularWritingSystem.Bcp47, _wordService);
             var importedAnalysisWritingSystems = new List<WritingSystem>();
             var doesImportHaveDefinitions = false;
             var doesImportHaveGrammaticalInfo = false;
diff --git a/Backend/Interfaces/ILiftService.cs b/Backend/Interfaces/ILiftService.cs
@@ -8,8 +8,7 @@ namespace BackendFramework.Interfaces
 {
     public interface ILiftService : IDisposable
     {
-        ILiftMerger GetLiftImporterExporter(string projectId, string vernLang, IWordRepository wordRepo,
-            ISemanticDomainCountService semDomCountService);
+        ILiftMerger GetLiftImporterExporter(string projectId, string vernLang, IWordService wordService);
         Task<bool> LdmlImport(string dirPath, IProjectRepository projRepo, Project project);
         Task<string> LiftExport(string projectId, IProjectRepository projRepo, ISemanticDomainRepository semDomRepo,
             ISpeakerRepository speakerRepo, IWordRepository wordRepo);
diff --git a/Backend/Interfaces/IWordService.cs b/Backend/Interfaces/IWordService.cs
@@ -14,6 +14,7 @@ public interface IWordService
         Task<int> DeleteFrontierWords(string projectId, List<string> wordIds);
         Task<string?> MakeFrontierDeleted(string projectId, string userId, string wordId);
         Task<bool> RestoreFrontierWords(string projectId, List<string> wordIds);
+        Task<bool> ClearFrontier(string projectId);
         Task<string?> FindContainingWord(Word word);
     }
 }
diff --git a/Backend/Services/LiftService.cs b/Backend/Services/LiftService.cs
@@ -670,10 +670,9 @@ public static string MakeSafeXmlAttribute(string sInput)
             return SecurityElement.Escape(sInput);
         }
 
-        public ILiftMerger GetLiftImporterExporter(string projectId, string vernLang, IWordRepository wordRepo,
-        ISemanticDomainCountService semDomCountService)
+        public ILiftMerger GetLiftImporterExporter(string projectId, string vernLang, IWordService wordService)
         {
-            return new LiftMerger(projectId, vernLang, wordRepo, semDomCountService);
+            return new LiftMerger(projectId, vernLang, wordService);
         }
 
         private static void WriteRangeElement(XmlWriter liftRangesWriter,
@@ -707,13 +706,11 @@ private static void WriteFormElement(XmlWriter liftRangesWriter, string element,
             liftRangesWriter.WriteEndElement(); // end element
         }
 
-        private sealed class LiftMerger(string projectId, string vernLang, IWordRepository wordRepo,
-            ISemanticDomainCountService semDomCountService) : ILiftMerger
+        private sealed class LiftMerger(string projectId, string vernLang, IWordService wordService) : ILiftMerger
         {
             private readonly string _projectId = projectId;
             private readonly string _vernLang = vernLang;
-            private readonly IWordRepository _wordRepo = wordRepo;
-            private readonly ISemanticDomainCountService _semDomCountService = semDomCountService;
+            private readonly IWordService _wordService = wordService;
 
             private readonly List<SemanticDomainFull> _customSemDoms = [];
             private readonly List<Word> _importEntries = [];
@@ -764,8 +761,7 @@ public List<WritingSystem> GetImportAnalysisWritingSystems()
             /// <returns> The words saved. </returns>
             public async Task<List<Word>> SaveImportEntries()
             {
-                var savedWords = new List<Word>(await _wordRepo.Create(_importEntries));
-                await _semDomCountService.UpdateCountsForWords(savedWords);
+                var savedWords = new List<Word>(await _wordService.Create("", _importEntries));
                 _importEntries.Clear();
                 return savedWords;
             }
diff --git a/Backend/Services/WordService.cs b/Backend/Services/WordService.cs
@@ -8,16 +8,18 @@
 namespace BackendFramework.Services
 {
     /// <summary> More complex functions and application logic for <see cref="Word"/>s </summary>
-    public class WordService(IWordRepository wordRepo, ISemanticDomainCountService semDomCountService) : IWordService
+    public class WordService(ISemanticDomainCountRepository semDomCountRepo, IWordRepository wordRepo,
+        ISemanticDomainCountService semDomCountService) : IWordService
     {
+        private readonly ISemanticDomainCountRepository _semDomCountRepo = semDomCountRepo;
         private readonly IWordRepository _wordRepo = wordRepo;
         private readonly ISemanticDomainCountService _semDomCountService = semDomCountService;
 
         private const string otelTagName = "otel.WordService";
 
         /// <summary>
         /// Clear the given word's Id and Metadata to be generated by the word repo,
-        /// and add the given userId to EditedBy if it's not already last on the list.
+        /// and add the given userId to EditedBy if it's nonempty and not already last on the list.
         /// </summary>
         private static Word PrepEditedData(string userId, Word word)
         {
@@ -179,6 +181,18 @@ public async Task<bool> RestoreFrontierWords(string projectId, List<string> word
             return createdWord.Id;
         }
 
+        public async Task<bool> ClearFrontier(string projectId)
+        {
+            using var activity = OtelService.StartActivityWithTag(otelTagName, "clearing the Frontier");
+
+            var success = await _wordRepo.DeleteAllFrontierWords(projectId);
+            if (success)
+            {
+                await _semDomCountRepo.DeleteAllCounts(projectId);
+            }
+            return success;
+        }
+
         /// <summary> Checks if a word being added is a duplicate of a preexisting word. </summary>
         /// <returns> The id string of the existing word, or null if none. </returns>
         public async Task<string?> FindContainingWord(Word word)

Original file line number	Diff line number	Diff line change
`@@ -31,9 +31,10 @@ public void Dispose()`
`31`	`31`	`[SetUp]`
`32`	`32`	`public void Setup()`
`33`	`33`	`{`
	`34`	`+ var semDomCountRepo = new SemanticDomainCountRepositoryMock();`
`34`	`35`	`_wordRepo = new WordRepositoryMock();`
`35`		`- var semDomCountService = new SemanticDomainCountService(new SemanticDomainCountRepositoryMock());`
`36`		`- _wordService = new WordService(_wordRepo, semDomCountService);`
	`36`	`+ var semDomCountService = new SemanticDomainCountService(semDomCountRepo);`
	`37`	`+ _wordService = new WordService(semDomCountRepo, _wordRepo, semDomCountService);`
`37`	`38`	`_permissionService = new PermissionServiceMock();`
`38`	`39`	`_wordController = new WordController(_wordRepo, _wordService, _permissionService);`
`39`	`40`	`}`
Original file line number	Diff line number	Diff line change
`@@ -19,9 +19,10 @@ internal sealed class WordServiceTests`
`19`	`19`	`[SetUp]`
`20`	`20`	`public void Setup()`
`21`	`21`	`{`
	`22`	`+ var semDomCountRepo = new SemanticDomainCountRepositoryMock();`
`22`	`23`	`_wordRepo = new WordRepositoryMock();`
`23`		`- var semDomCountService = new SemanticDomainCountService(new SemanticDomainCountRepositoryMock());`
`24`		`- _wordService = new WordService(_wordRepo, semDomCountService);`
	`24`	`+ var semDomCountService = new SemanticDomainCountService(semDomCountRepo);`
	`25`	`+ _wordService = new WordService(semDomCountRepo, _wordRepo, semDomCountService);`
`25`	`26`	`}`
`26`	`27`
`27`	`28`	`[Test]`
Original file line number	Diff line number	Diff line change
`@@ -8,8 +8,7 @@ namespace BackendFramework.Interfaces`
`8`	`8`	`{`
`9`	`9`	`public interface ILiftService : IDisposable`
`10`	`10`	`{`
`11`		`- ILiftMerger GetLiftImporterExporter(string projectId, string vernLang, IWordRepository wordRepo,`
`12`		`- ISemanticDomainCountService semDomCountService);`
	`11`	`+ ILiftMerger GetLiftImporterExporter(string projectId, string vernLang, IWordService wordService);`
`13`	`12`	`Task<bool> LdmlImport(string dirPath, IProjectRepository projRepo, Project project);`
`14`	`13`	`Task<string> LiftExport(string projectId, IProjectRepository projRepo, ISemanticDomainRepository semDomRepo,`
`15`	`14`	`ISpeakerRepository speakerRepo, IWordRepository wordRepo);`
Original file line number	Diff line number	Diff line change
`@@ -14,6 +14,7 @@ public interface IWordService`
`14`	`14`	`Task<int> DeleteFrontierWords(string projectId, List<string> wordIds);`
`15`	`15`	`Task<string?> MakeFrontierDeleted(string projectId, string userId, string wordId);`
`16`	`16`	`Task<bool> RestoreFrontierWords(string projectId, List<string> wordIds);`
	`17`	`+ Task<bool> ClearFrontier(string projectId);`
`17`	`18`	`Task<string?> FindContainingWord(Word word);`
`18`	`19`	`}`
`19`	`20`	`}`
Original file line number	Diff line number	Diff line change
`@@ -670,10 +670,9 @@ public static string MakeSafeXmlAttribute(string sInput)`
`670`	`670`	`return SecurityElement.Escape(sInput);`
`671`	`671`	`}`
`672`	`672`
`673`		`- public ILiftMerger GetLiftImporterExporter(string projectId, string vernLang, IWordRepository wordRepo,`
`674`		`- ISemanticDomainCountService semDomCountService)`
	`673`	`+ public ILiftMerger GetLiftImporterExporter(string projectId, string vernLang, IWordService wordService)`
`675`	`674`	`{`
`676`		`- return new LiftMerger(projectId, vernLang, wordRepo, semDomCountService);`
	`675`	`+ return new LiftMerger(projectId, vernLang, wordService);`
`677`	`676`	`}`
`678`	`677`
`679`	`678`	`private static void WriteRangeElement(XmlWriter liftRangesWriter,`
`@@ -707,13 +706,11 @@ private static void WriteFormElement(XmlWriter liftRangesWriter, string element,`
`707`	`706`	`liftRangesWriter.WriteEndElement(); // end element`
`708`	`707`	`}`
`709`	`708`
`710`		`- private sealed class LiftMerger(string projectId, string vernLang, IWordRepository wordRepo,`
`711`		`- ISemanticDomainCountService semDomCountService) : ILiftMerger`
	`709`	`+ private sealed class LiftMerger(string projectId, string vernLang, IWordService wordService) : ILiftMerger`
`712`	`710`	`{`
`713`	`711`	`private readonly string _projectId = projectId;`
`714`	`712`	`private readonly string _vernLang = vernLang;`
`715`		`- private readonly IWordRepository _wordRepo = wordRepo;`
`716`		`- private readonly ISemanticDomainCountService _semDomCountService = semDomCountService;`
	`713`	`+ private readonly IWordService _wordService = wordService;`
`717`	`714`
`718`	`715`	`private readonly List<SemanticDomainFull> _customSemDoms = [];`
`719`	`716`	`private readonly List<Word> _importEntries = [];`
`@@ -764,8 +761,7 @@ public List<WritingSystem> GetImportAnalysisWritingSystems()`
`764`	`761`	`/// <returns> The words saved. </returns>`
`765`	`762`	`public async Task<List<Word>> SaveImportEntries()`
`766`	`763`	`{`
`767`		`- var savedWords = new List<Word>(await _wordRepo.Create(_importEntries));`
`768`		`- await _semDomCountService.UpdateCountsForWords(savedWords);`
	`764`	`+ var savedWords = new List<Word>(await _wordService.Create("", _importEntries));`
`769`	`765`	`_importEntries.Clear();`
`770`	`766`	`return savedWords;`
`771`	`767`	`}`