Respond to the bunny's nitpicks

imnasnainaec · imnasnainaec · commit ccccabe07b96 · 2026-01-20T13:00:14.000-05:00
diff --git a/Backend.Tests/Controllers/AudioControllerTests.cs b/Backend.Tests/Controllers/AudioControllerTests.cs
@@ -39,7 +39,7 @@ public void Setup()
             _wordRepo = new WordRepositoryMock();
             _permissionService = new PermissionServiceMock();
             var semDomCountService = new SemanticDomainCountService(semDomCountRepo);
-            _wordService = new WordService(semDomCountRepo, _wordRepo, semDomCountService);
+            _wordService = new WordService(_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,7 +51,7 @@ public void Setup()
             _wordRepo = new WordRepositoryMock();
             _liftService = new LiftService();
             var semDomCountService = new SemanticDomainCountService(semDomCountRepo);
-            _wordService = new WordService(semDomCountRepo, _wordRepo, semDomCountService);
+            _wordService = new WordService(_wordRepo, semDomCountService);
             _liftController = new LiftController(_projRepo, new SemanticDomainRepositoryMock(), _speakerRepo,
                 _wordRepo, _liftService, new HubContextMock<ExportHub>(), new PermissionServiceMock(), _wordService,
                 new MockLogger());
diff --git a/Backend.Tests/Controllers/MergeControllerTests.cs b/Backend.Tests/Controllers/MergeControllerTests.cs
@@ -41,7 +41,7 @@ public void Setup()
             var semDomCountRepo = new SemanticDomainCountRepositoryMock();
             _wordRepo = new WordRepositoryMock();
             var semDomCountService = new SemanticDomainCountService(semDomCountRepo);
-            _wordService = new WordService(semDomCountRepo, _wordRepo, semDomCountService);
+            _wordService = new WordService(_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
@@ -34,7 +34,7 @@ public void Setup()
             var semDomCountRepo = new SemanticDomainCountRepositoryMock();
             _wordRepo = new WordRepositoryMock();
             var semDomCountService = new SemanticDomainCountService(semDomCountRepo);
-            _wordService = new WordService(semDomCountRepo, _wordRepo, semDomCountService);
+            _wordService = new WordService(_wordRepo, semDomCountService);
             _permissionService = new PermissionServiceMock();
             _wordController = new WordController(_wordRepo, _wordService, _permissionService);
         }
diff --git a/Backend.Tests/Mocks/SemanticDomainCountRepositoryMock.cs b/Backend.Tests/Mocks/SemanticDomainCountRepositoryMock.cs
@@ -37,10 +37,9 @@ public Task<int> Increment(string projectId, string domainId, int amount = 1)
             return Task.FromResult(count.Count);
         }
 
-        public Task<bool> DeleteAllCounts(string projectId)
+        public Task<int> DeleteAllCounts(string projectId)
         {
-            var removed = _counts.RemoveAll(c => c.ProjectId == projectId);
-            return Task.FromResult(removed > 0);
+            return Task.FromResult(_counts.RemoveAll(c => c.ProjectId == projectId));
         }
     }
 }
diff --git a/Backend.Tests/Services/MergeServiceTests.cs b/Backend.Tests/Services/MergeServiceTests.cs
@@ -33,7 +33,7 @@ public void Setup()
             var semDomCountRepo = new SemanticDomainCountRepositoryMock();
             _wordRepo = new WordRepositoryMock();
             var semDomCountService = new SemanticDomainCountService(semDomCountRepo);
-            _wordService = new WordService(semDomCountRepo, _wordRepo, semDomCountService);
+            _wordService = new WordService(_wordRepo, semDomCountService);
             _mergeService = new MergeService(_cache, _mergeBlacklistRepo, _mergeGraylistRepo, _wordRepo, _wordService);
         }
 
diff --git a/Backend.Tests/Services/WordServiceTests.cs b/Backend.Tests/Services/WordServiceTests.cs
@@ -22,7 +22,7 @@ public void Setup()
             var semDomCountRepo = new SemanticDomainCountRepositoryMock();
             _wordRepo = new WordRepositoryMock();
             var semDomCountService = new SemanticDomainCountService(semDomCountRepo);
-            _wordService = new WordService(semDomCountRepo, _wordRepo, semDomCountService);
+            _wordService = new WordService(_wordRepo, semDomCountService);
         }
 
         [Test]
diff --git a/Backend/Interfaces/ISemanticDomainCountRepository.cs b/Backend/Interfaces/ISemanticDomainCountRepository.cs
@@ -9,6 +9,6 @@ public interface ISemanticDomainCountRepository
         Task<int> GetCount(string projectId, string domainId);
         Task<List<ProjectSemanticDomainCount>> GetAllCounts(string projectId);
         Task<int> Increment(string projectId, string domainId, int amount = 1);
-        Task<bool> DeleteAllCounts(string projectId);
+        Task<int> DeleteAllCounts(string projectId);
     }
 }
diff --git a/Backend/Interfaces/ISemanticDomainCountService.cs b/Backend/Interfaces/ISemanticDomainCountService.cs
@@ -6,6 +6,7 @@ namespace BackendFramework.Interfaces
 {
     public interface ISemanticDomainCountService
     {
+        Task ClearCountsForProject(string projectId);
         Task UpdateCountsForWord(Word word);
         Task UpdateCountsForWords(List<Word> words);
         Task UpdateCountsAfterWordUpdate(Word oldWord, Word newWord);
diff --git a/Backend/Repositories/SemanticDomainCountRepository.cs b/Backend/Repositories/SemanticDomainCountRepository.cs
@@ -68,12 +68,11 @@ public async Task<int> Increment(string projectId, string domainId, int amount =
         }
 
         /// <summary> Deletes all counts for a project </summary>
-        public async Task<bool> DeleteAllCounts(string projectId)
+        public async Task<int> DeleteAllCounts(string projectId)
         {
             using var activity = OtelService.StartActivityWithTag(otelTagName, "deleting all semantic domain counts");
 
-            var result = await _counts.DeleteManyAsync(ProjectFilter(projectId));
-            return result.DeletedCount > 0;
+            return (int)(await _counts.DeleteManyAsync(ProjectFilter(projectId))).DeletedCount;
         }
     }
 }
diff --git a/Backend/Services/SemanticDomainCountService.cs b/Backend/Services/SemanticDomainCountService.cs
@@ -28,6 +28,14 @@ private static Dictionary<string, int> GetDomainCounts(Word word, Dictionary<str
             return domainCounts;
         }
 
+        /// <summary> Clears all counts for a project </summary>
+        public async Task ClearCountsForProject(string projectId)
+        {
+            using var activity = OtelService.StartActivityWithTag(otelTagName, "clearing counts for project");
+
+            await _countRepo.DeleteAllCounts(projectId);
+        }
+
         /// <summary> Updates counts when a new word is added </summary>
         public async Task UpdateCountsForWord(Word word)
         {
@@ -75,6 +83,11 @@ public async Task UpdateCountsAfterWordUpdate(Word oldWord, Word newWord)
         {
             using var activity = OtelService.StartActivityWithTag(otelTagName, "updating counts after word update");
 
+            if (oldWord.ProjectId != newWord.ProjectId)
+            {
+                throw new System.ArgumentException("Old and new words must belong to the same project");
+            }
+
             var oldDomains = GetDomainCounts(oldWord);
             var newDomains = GetDomainCounts(newWord);
 
diff --git a/Backend/Services/WordService.cs b/Backend/Services/WordService.cs
@@ -8,10 +8,8 @@
 namespace BackendFramework.Services
 {
     /// <summary> More complex functions and application logic for <see cref="Word"/>s </summary>
-    public class WordService(ISemanticDomainCountRepository semDomCountRepo, IWordRepository wordRepo,
-        ISemanticDomainCountService semDomCountService) : IWordService
+    public class WordService(IWordRepository wordRepo, ISemanticDomainCountService semDomCountService) : IWordService
     {
-        private readonly ISemanticDomainCountRepository _semDomCountRepo = semDomCountRepo;
         private readonly IWordRepository _wordRepo = wordRepo;
         private readonly ISemanticDomainCountService _semDomCountService = semDomCountService;
 
@@ -187,7 +185,7 @@ public async Task<bool> ClearFrontier(string projectId)
             var success = await _wordRepo.DeleteAllFrontierWords(projectId);
             if (success)
             {
-                await _semDomCountRepo.DeleteAllCounts(projectId);
+                await _semDomCountService.ClearCountsForProject(projectId);
             }
             return success;
         }

Original file line number	Diff line number	Diff line change
`@@ -34,7 +34,7 @@ public void Setup()`
`34`	`34`	`var semDomCountRepo = new SemanticDomainCountRepositoryMock();`
`35`	`35`	`_wordRepo = new WordRepositoryMock();`
`36`	`36`	`var semDomCountService = new SemanticDomainCountService(semDomCountRepo);`
`37`		`- _wordService = new WordService(semDomCountRepo, _wordRepo, semDomCountService);`
	`37`	`+ _wordService = new WordService(_wordRepo, semDomCountService);`
`38`	`38`	`_permissionService = new PermissionServiceMock();`
`39`	`39`	`_wordController = new WordController(_wordRepo, _wordService, _permissionService);`
`40`	`40`	`}`
Original file line number	Diff line number	Diff line change
`@@ -37,10 +37,9 @@ public Task<int> Increment(string projectId, string domainId, int amount = 1)`
`37`	`37`	`return Task.FromResult(count.Count);`
`38`	`38`	`}`
`39`	`39`
`40`		`- public Task<bool> DeleteAllCounts(string projectId)`
	`40`	`+ public Task<int> DeleteAllCounts(string projectId)`
`41`	`41`	`{`
`42`		`- var removed = _counts.RemoveAll(c => c.ProjectId == projectId);`
`43`		`- return Task.FromResult(removed > 0);`
	`42`	`+ return Task.FromResult(_counts.RemoveAll(c => c.ProjectId == projectId));`
`44`	`43`	`}`
`45`	`44`	`}`
`46`	`45`	`}`
Original file line number	Diff line number	Diff line change
`@@ -33,7 +33,7 @@ public void Setup()`
`33`	`33`	`var semDomCountRepo = new SemanticDomainCountRepositoryMock();`
`34`	`34`	`_wordRepo = new WordRepositoryMock();`
`35`	`35`	`var semDomCountService = new SemanticDomainCountService(semDomCountRepo);`
`36`		`- _wordService = new WordService(semDomCountRepo, _wordRepo, semDomCountService);`
	`36`	`+ _wordService = new WordService(_wordRepo, semDomCountService);`
`37`	`37`	`_mergeService = new MergeService(_cache, _mergeBlacklistRepo, _mergeGraylistRepo, _wordRepo, _wordService);`
`38`	`38`	`}`
`39`	`39`
Original file line number	Diff line number	Diff line change
`@@ -22,7 +22,7 @@ public void Setup()`
`22`	`22`	`var semDomCountRepo = new SemanticDomainCountRepositoryMock();`
`23`	`23`	`_wordRepo = new WordRepositoryMock();`
`24`	`24`	`var semDomCountService = new SemanticDomainCountService(semDomCountRepo);`
`25`		`- _wordService = new WordService(semDomCountRepo, _wordRepo, semDomCountService);`
	`25`	`+ _wordService = new WordService(_wordRepo, semDomCountService);`
`26`	`26`	`}`
`27`	`27`
`28`	`28`	`[Test]`
Original file line number	Diff line number	Diff line change
`@@ -9,6 +9,6 @@ public interface ISemanticDomainCountRepository`
`9`	`9`	`Task<int> GetCount(string projectId, string domainId);`
`10`	`10`	`Task<List<ProjectSemanticDomainCount>> GetAllCounts(string projectId);`
`11`	`11`	`Task<int> Increment(string projectId, string domainId, int amount = 1);`
`12`		`- Task<bool> DeleteAllCounts(string projectId);`
	`12`	`+ Task<int> DeleteAllCounts(string projectId);`
`13`	`13`	`}`
`14`	`14`	`}`
Original file line number	Diff line number	Diff line change
`@@ -6,6 +6,7 @@ namespace BackendFramework.Interfaces`
`6`	`6`	`{`
`7`	`7`	`public interface ISemanticDomainCountService`
`8`	`8`	`{`
	`9`	`+ Task ClearCountsForProject(string projectId);`
`9`	`10`	`Task UpdateCountsForWord(Word word);`
`10`	`11`	`Task UpdateCountsForWords(List<Word> words);`
`11`	`12`	`Task UpdateCountsAfterWordUpdate(Word oldWord, Word newWord);`
Original file line number	Diff line number	Diff line change
`@@ -68,12 +68,11 @@ public async Task<int> Increment(string projectId, string domainId, int amount =`
`68`	`68`	`}`
`69`	`69`
`70`	`70`	`/// <summary> Deletes all counts for a project </summary>`
`71`		`- public async Task<bool> DeleteAllCounts(string projectId)`
	`71`	`+ public async Task<int> DeleteAllCounts(string projectId)`
`72`	`72`	`{`
`73`	`73`	`using var activity = OtelService.StartActivityWithTag(otelTagName, "deleting all semantic domain counts");`
`74`	`74`
`75`		`- var result = await _counts.DeleteManyAsync(ProjectFilter(projectId));`
`76`		`- return result.DeletedCount > 0;`
	`75`	`+ return (int)(await _counts.DeleteManyAsync(ProjectFilter(projectId))).DeletedCount;`
`77`	`76`	`}`
`78`	`77`	`}`
`79`	`78`	`}`