+ RedoSample uses validation

NicklausBrain · Dec 7, 2024 · 9f1af3c · 9f1af3c
1 parent 2db9159
commit 9f1af3c
Show file tree

Hide file tree

Showing 3 changed files with 11 additions and 7 deletions.
diff --git a/My1kWordsEe/Components/Pages/WordPage.razor b/My1kWordsEe/Components/Pages/WordPage.razor
@@ -23,6 +23,7 @@
 @inject RemoveFromFavoritesCommand RemoveFromFavoritesCommand
 @inject DeleteSampleSentenceCommand DeleteSampleSentenceCommand
 @inject RedoSampleWordCommand RedoSampleWordCommand
+@inject ValidateSampleWordCommand ValidateSampleWordCommand
 
 
 @code {
@@ -145,7 +146,10 @@
         if (confirmation)
         {
             PreloadService.Show(SpinnerColor.Light, "Saving data...");
-            var redoResult = await this.RedoSampleWordCommand.Invoke(Value.EeWord);
+
+            var redoResult = await this.ValidateSampleWordCommand.Invoke(Value).Bind(r =>
+                this.RedoSampleWordCommand.Invoke(Value.EeWord, r.EeExplanationMessage));
+
             if (redoResult.IsSuccess)
             {
                 WordMetadata = redoResult;

diff --git a/My1kWordsEe/Services/Cqs/RedoSampleWordCommand.cs b/My1kWordsEe/Services/Cqs/RedoSampleWordCommand.cs
@@ -31,7 +31,7 @@ public async Task<Result<SampleWord>> Invoke(string eeWord, string? comment = nu
             (await azureBlobService.GetWordData(eeWord)).Deconstruct(
                 out bool _,
                 out bool isBlobAccessFailure,
-                out Maybe<SampleWord> savedWord,
+                out Maybe<SampleWord> existingWordData,
                 out string blobAccessError);
 
             if (isBlobAccessFailure)
@@ -41,9 +41,9 @@ public async Task<Result<SampleWord>> Invoke(string eeWord, string? comment = nu
 
             var redoTask = this.addSampleWordCommand.Invoke(eeWord, comment);
 
-            if (savedWord.HasValue)
+            if (existingWordData.HasValue)
             {
-                await Parallel.ForEachAsync(savedWord.Value.Samples, async (sample, ct) =>
+                await Parallel.ForEachAsync(existingWordData.Value.Samples, async (sample, ct) =>
                 {
                     if (ct.IsCancellationRequested) { return; }
                     await deleteSampleSentenceCommand.Invoke(sample);

diff --git a/My1kWordsEe/ee1k.json b/My1kWordsEe/ee1k.json
@@ -2227,9 +2227,9 @@
   },
   {
     "EeWord": "eks",
-    "EnWord": "ex",
-    "EnWords": [ "formerly", "was", "in the past" ],
-    "EnExplanation": "A word used to indicate something that was or someone who was in a previous state or role, often referring to a former partner or spouse."
+    "EnWord": "isn't it",
+    "EnWords": [ "right", "isn't that so", "indeed" ],
+    "EnExplanation": "The word 'eks' is often used in Estonian as a tag question, similar to 'isn't it?' or 'right?', or as an interjection meaning 'indeed' or 'really'."
   },
   {
     "EeWord": "ringi",