huskies: merge 961

server/src/service/timer/mod.rs

@@ -437,7 +437,7 @@ mod tests {
         let content = "---\nname: Foo\n---\n";
         fs::write(backlog.join("421_story_foo.md"), content).unwrap();
         crate::db::ensure_content_store();
-        crate::db::write_content("421_story_foo", content);
+        crate::db::write_content(crate::db::ContentKey::Story("421_story_foo"), content);
 
         // Add a past timer so take_due returns it immediately.
         let store = TimerStore::load(root.join("timers.json"));
@@ -456,7 +456,7 @@ mod tests {
 
         // Story must still be accessible in the content store after the move.
         assert!(
-            crate::db::read_content("421_story_foo").is_some(),
+            crate::db::read_content(crate::db::ContentKey::Story("421_story_foo")).is_some(),
             "story should be in the content store after timer fires"
         );
         // Timer was consumed.