De-duplicate notes when editing a task

ad-si · May 13, 2024 · c668840 · c668840
1 parent a7f2055
commit c668840
Show file tree

Hide file tree

Showing 3 changed files with 76 additions and 23 deletions.
diff --git a/tasklite-core/source/ImportExport.hs b/tasklite-core/source/ImportExport.hs
@@ -459,19 +459,21 @@ insertImportTask connection importTaskRecord = do
         then taskParsed{Task.user = T.pack effectiveUserName}
         else taskParsed
   insertRecord "tasks" connection theTask
-  warnings <-
+  tagWarnings <-
     insertTags
       connection
       (ulidTextToDateTime taskParsed.ulid)
       theTask
       importTaskRecord.tags
-  insertNotes
-    connection
-    (ulidTextToDateTime taskParsed.ulid)
-    theTask
-    importTaskRecord.notes
+  noteWarnings <-
+    insertNotes
+      connection
+      (ulidTextToDateTime taskParsed.ulid)
+      theTask
+      importTaskRecord.notes
   pure $
-    warnings
+    tagWarnings
+      <$$> noteWarnings
       <$$> "📥 Imported task"
       <+> dquotes (pretty theTask.body)
       <+> "with ulid"
@@ -754,7 +756,7 @@ editTaskByTask preEdit conn taskToEdit = do
         Left error -> die $ show error <> " in task \n" <> show newContent
         Right importTaskRecord -> do
           effectiveUserName <- getEffectiveUserName
-          now <- getULIDTimeStamp
+          now <- getULIDTimeStamp <&> (show >>> T.toLower)
           let
             taskFixed =
               importTaskRecord.task
@@ -775,8 +777,7 @@ editTaskByTask preEdit conn taskToEdit = do
                         note
                           { Note.ulid =
                               if zeroUlidTxt `T.isPrefixOf` note.ulid
-                                then
-                                  note.ulid & T.replace zeroUlidTxt (show now)
+                                then note.ulid & T.replace zeroUlidTxt now
                                 else note.ulid
                           }
                     )
@@ -791,9 +792,10 @@ editTaskByTask preEdit conn taskToEdit = do
             updateTask conn taskFixed{Task.modified_utc = show @DateTime now_}
 
           tagWarnings <- insertTags conn Nothing taskFixed importTaskRecord.tags
-          insertNotes conn Nothing taskFixed notesCorrectUtc
+          noteWarnings <- insertNotes conn Nothing taskFixed notesCorrectUtc
           pure $
             tagWarnings
+              <$$> noteWarnings
               <$$> "✏️  Edited task"
               <+> dquotes (pretty taskFixed.body)
               <+> "with ulid"

diff --git a/tasklite-core/source/Lib.hs b/tasklite-core/source/Lib.hs
@@ -230,7 +230,7 @@ import Config (
   HooksConfig (add),
   defaultConfig,
  )
-import Control.Monad.Catch (catchIf)
+import Control.Monad.Catch (catchAll, catchIf)
 import FullTask (
   FullTask (
     awake_utc,
@@ -399,9 +399,11 @@ insertTags connection mbCreatedUtc task tags = do
   pure $ vsepCollapse insertWarnings
 
 
-insertNotes :: Connection -> Maybe DateTime -> Task -> [Note] -> IO ()
+insertNotes
+  :: Connection -> Maybe DateTime -> Task -> [Note] -> IO (Doc AnsiStyle)
 insertNotes connection mbCreatedUtc task notes = do
-  taskToNotes <- forM notes $ \theNote -> do
+  let uniqueNotes = nub notes
+  taskToNotes <- forM uniqueNotes $ \theNote -> do
     newUlid <- getULID
     pure $
       TaskToNote
@@ -418,8 +420,20 @@ insertNotes connection mbCreatedUtc task notes = do
         , note = theNote.body
         }
 
-  P.forM_ taskToNotes $ \taskToNote ->
-    insertRecord "task_to_note" connection taskToNote
+  insertWarnings <- P.forM taskToNotes $ \taskToNote ->
+    catchAll
+      (insertRecord "task_to_note" connection taskToNote P.>> pure "")
+      ( \exception ->
+          pure $
+            annotate (color Yellow) $
+              "⚠️ Note "
+                <> dquotes (pretty taskToNote.note)
+                <> " could not be inserted"
+                  <+> "ERROR:"
+                  <+> pretty (show exception :: Text)
+      )
+
+  pure $ vsepCollapse insertWarnings
 
 
 -- | Tuple is (Maybe createdUtc, noteBody)

diff --git a/tasklite-core/test/LibSpec.hs b/tasklite-core/test/LibSpec.hs
@@ -137,6 +137,14 @@ normTask task =
     }
 
 
+replaceBs :: P.ByteString -> P.ByteString -> P.ByteString -> P.ByteString
+replaceBs needle replacement haystack = do
+  haystack
+    & P.decodeUtf8
+    & T.replace (P.decodeUtf8 needle) (P.decodeUtf8 replacement)
+    & P.encodeUtf8
+
+
 spec :: Spec
 spec = do
   let
@@ -465,13 +473,6 @@ spec = do
       withMemoryDb defaultConfig $ \memConn -> do
         insertRecord "tasks" memConn task1
 
-        let
-          replaceBs needle replacement haystack = do
-            haystack
-              & P.decodeUtf8
-              & T.replace (P.decodeUtf8 needle) (P.decodeUtf8 replacement)
-              & P.encodeUtf8
-
         cliOutput <-
           editTaskByTask
             ( ApplyPreEdit $
@@ -514,6 +515,42 @@ spec = do
             taskToNote.note `shouldBe` "A short note"
           _ -> P.die "Found more than one task_to_tag row"
 
+    it "de-duplicates notes" $ do
+      withMemoryDb defaultConfig $ \memConn -> do
+        insertRecord "tasks" memConn task1
+        let note = "A short note"
+        insertRecord
+          "task_to_note"
+          memConn
+          TaskToNote
+            { TaskToNote.ulid = "01hxsjgzmdx48yzk39v852razr"
+            , TaskToNote.task_ulid = task1.ulid
+            , TaskToNote.note = note
+            }
+        taskInfo <- infoTask defaultConfig memConn task1.ulid
+        show taskInfo `shouldContain` T.unpack note
+        cliOutput <-
+          editTaskByTask
+            ( ApplyPreEdit $
+                replaceBs "notes: []" $
+                  "notes: " <> P.show [note, note]
+            )
+            memConn
+            task1
+        show cliOutput `shouldStartWith` "✏️  Edited task \"New task 1\""
+
+        taskToNotes :: [TaskToNote] <-
+          query_ memConn "SELECT * FROM task_to_note"
+        case taskToNotes of
+          [taskToNoteA, taskToNoteB] -> do
+            taskToNoteA.ulid
+              `shouldNotSatisfy` (\ulid -> zeroUlidTxt `T.isPrefixOf` ulid)
+            taskToNoteB.ulid
+              `shouldNotSatisfy` (\ulid -> zeroUlidTxt `T.isPrefixOf` ulid)
+            taskToNoteA.note `shouldBe` "A short note"
+            taskToNoteB.note `shouldBe` "A short note"
+          _ -> P.die "Found more than one task_to_tag row"
+
     it "lets you set metadata to null" $ do
       withMemoryDb defaultConfig $ \memConn -> do
         insertRecord "tasks" memConn task1{metadata = Just "{\"a\":\"b\"}"}