Fix up WordService public method order

Author: imnasnainaec

Backend.Tests/Services/WordServiceTests.cs

@@ -126,6 +126,40 @@ public void TestDeleteFrontierWordCopiesToWordsAndRemovesFrontier()
             Assert.That(_wordRepo.GetAllFrontier(ProjId).Result, Is.Empty);
         }
 
+        [Test]
+        public void TestRestoreFrontierWordAlreadyInFrontierThrows()
+        {
+            var wordInFrontier = _wordRepo.Create(new Word { ProjectId = ProjId }).Result;
+            Assert.That(_wordRepo.GetAllFrontier(ProjId).Result, Has.Count.EqualTo(1));
+
+            Assert.That(
+                () => _wordService.RestoreFrontierWord(ProjId, wordInFrontier.Id).Wait(),
+                Throws.TypeOf<AggregateException>());
+        }
+
+        [Test]
+        public void TestRestoreFrontierWordMissingWordReturnsFalse()
+        {
+            var word = _wordRepo.Add(new Word { ProjectId = ProjId }).Result;
+
+            var result = _wordService.RestoreFrontierWord(ProjId, "NotAnId").Result;
+
+            Assert.That(result, Is.False);
+            Assert.That(_wordRepo.GetAllFrontier(ProjId).Result, Is.Empty);
+        }
+
+        [Test]
+        public void TestRestoreFrontierWordReturnsTrueRestoresWords()
+        {
+            var word = _wordRepo.Add(new Word { ProjectId = ProjId }).Result;
+            Assert.That(_wordRepo.GetAllFrontier(ProjId).Result, Is.Empty);
+
+            var result = _wordService.RestoreFrontierWord(ProjId, word.Id).Result;
+
+            Assert.That(result, Is.True);
+            Assert.That(_wordRepo.GetAllFrontier(ProjId).Result, Has.Count.EqualTo(1));
+        }
+
         [Test]
         public void TestUpdateNotInFrontierReturnsNull()
         {
@@ -172,40 +206,6 @@ public void TestUpdateUsingCitationForm()
             Assert.That(vernUpdate.UsingCitationForm, Is.False);
         }
 
-        [Test]
-        public void TestRestoreFrontierWordAlreadyInFrontierThrows()
-        {
-            var wordInFrontier = _wordRepo.Create(new Word { ProjectId = ProjId }).Result;
-            Assert.That(_wordRepo.GetAllFrontier(ProjId).Result, Has.Count.EqualTo(1));
-
-            Assert.That(
-                () => _wordService.RestoreFrontierWord(ProjId, wordInFrontier.Id).Wait(),
-                Throws.TypeOf<AggregateException>());
-        }
-
-        [Test]
-        public void TestRestoreFrontierWordMissingWordReturnsFalse()
-        {
-            var word = _wordRepo.Add(new Word { ProjectId = ProjId }).Result;
-
-            var result = _wordService.RestoreFrontierWord(ProjId, "NotAnId").Result;
-
-            Assert.That(result, Is.False);
-            Assert.That(_wordRepo.GetAllFrontier(ProjId).Result, Is.Empty);
-        }
-
-        [Test]
-        public void TestRestoreFrontierWordReturnsTrueRestoresWords()
-        {
-            var word = _wordRepo.Add(new Word { ProjectId = ProjId }).Result;
-            Assert.That(_wordRepo.GetAllFrontier(ProjId).Result, Is.Empty);
-
-            var result = _wordService.RestoreFrontierWord(ProjId, word.Id).Result;
-
-            Assert.That(result, Is.True);
-            Assert.That(_wordRepo.GetAllFrontier(ProjId).Result, Has.Count.EqualTo(1));
-        }
-
         [Test]
         public void TestFindContainingWordNoFrontier()
         {

Backend/Controllers/LiftController.cs

@@ -264,8 +264,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,
-                _wordService);
+            var liftMerger = _liftService.GetLiftImporterExporter(
+                projectId, proj.VernacularWritingSystem.Bcp47, _wordService);
             var importedAnalysisWritingSystems = new List<WritingSystem>();
             var doesImportHaveDefinitions = false;
             var doesImportHaveGrammaticalInfo = false;

Backend/Interfaces/IWordService.cs

@@ -8,14 +8,14 @@ public interface IWordService
     {
         Task<List<Word>> ImportWords(List<Word> words);
         Task<Word> Create(string userId, Word word);
-        Task<List<Word>?> MergeReplaceFrontier(
-            string projectId, string userId, List<Word> parents, List<string> idsToDelete);
-        Task<bool> RevertMergeReplaceFrontier(
-            string projectId, string userId, List<string> idsToRestore, List<string> idsToDelete);
-        Task<Word?> Update(string userId, Word word);
         Task<Word?> DeleteAudio(string projectId, string userId, string wordId, string fileName);
         Task<string?> DeleteFrontierWord(string projectId, string userId, string wordId);
         Task<bool> RestoreFrontierWord(string projectId, string wordId);
+        Task<Word?> Update(string userId, Word word);
         Task<string?> FindContainingWord(Word word);
+        Task<List<Word>?> MergeReplaceFrontier(
+            string projectId, string userId, List<Word> parents, List<string> idsToDelete);
+        Task<bool> RevertMergeReplaceFrontier(
+            string projectId, string userId, List<string> idsToRestore, List<string> idsToDelete);
     }
 }

Backend/Services/WordService.cs

@@ -119,29 +119,6 @@ public async Task<Word> Create(string userId, Word word)
             return await _wordRepo.Create(PrepEditedData(userId, word));
         }
 
-        /// <summary>
-        /// Replaces merge children in the Frontier with prepared parent words where possible,
-        /// creates remaining parents, and deletes remaining children from the Frontier.
-        /// </summary>
-        public async Task<List<Word>?> MergeReplaceFrontier(
-            string projectId, string userId, List<Word> parents, List<string> idsToDelete)
-        {
-            using var activity = OtelService.StartActivityWithTag(otelTagName, "replacing frontier words for merge");
-
-            return await _wordRepo.ReplaceFrontier(projectId, parents, idsToDelete,
-                CreateModifyUpdatedWordAction(userId), CreateModifyDeletedWordAction(userId));
-        }
-
-        public async Task<bool> RevertMergeReplaceFrontier(
-            string projectId, string userId, List<string> idsToRestore, List<string> idsToDelete)
-        {
-            using var activity =
-                OtelService.StartActivityWithTag(otelTagName, "reverting replaced frontier words for merge");
-
-            return await _wordRepo.RevertReplaceFrontier(
-                projectId, idsToRestore, idsToDelete, CreateModifyDeletedWordAction(userId));
-        }
-
         /// <summary> Removes audio with specified fileName from a Frontier word </summary>
         /// <returns> Updated word, or null if not found </returns>
         public async Task<Word?> DeleteAudio(string projectId, string userId, string wordId, string fileName)
@@ -187,5 +164,28 @@ public async Task<bool> RestoreFrontierWord(string projectId, string wordId)
             var duplicatedWord = wordsWithVern.Find(w => w.Contains(word));
             return duplicatedWord?.Id;
         }
+
+        /// <summary>
+        /// Replaces merge children in the Frontier with prepared parent words where possible,
+        /// creates remaining parents, and deletes remaining children from the Frontier.
+        /// </summary>
+        public async Task<List<Word>?> MergeReplaceFrontier(
+            string projectId, string userId, List<Word> parents, List<string> idsToDelete)
+        {
+            using var activity = OtelService.StartActivityWithTag(otelTagName, "replacing frontier words for merge");
+
+            return await _wordRepo.ReplaceFrontier(projectId, parents, idsToDelete,
+                CreateModifyUpdatedWordAction(userId), CreateModifyDeletedWordAction(userId));
+        }
+
+        public async Task<bool> RevertMergeReplaceFrontier(
+            string projectId, string userId, List<string> idsToRestore, List<string> idsToDelete)
+        {
+            using var activity =
+                OtelService.StartActivityWithTag(otelTagName, "reverting replaced frontier words for merge");
+
+            return await _wordRepo.RevertReplaceFrontier(
+                projectId, idsToRestore, idsToDelete, CreateModifyDeletedWordAction(userId));
+        }
     }
 }