feat: plan Today by available time (#459)

src/main.py

@@ -223,17 +223,24 @@ class NotificationReadBatch(BaseModel):
 
 class TodayOperation(BaseModel):
     operation_id: str = Field(min_length=1, max_length=100)
-    action: Literal["add", "remove", "move"]
+    action: Literal["add", "remove", "move", "configure"]
     item_id: str = Field(min_length=1, max_length=500)
     direction: Literal["up", "down"] | None = None
     base_revision: int | None = Field(default=None, ge=0)
+    capacity_minutes: int | None = Field(default=None, ge=15, le=1440)
+    estimates: dict[str, int] = Field(default_factory=dict, max_length=5)
 
     @model_validator(mode="after")
-    def require_move_direction(self):
+    def validate_action_fields(self):
         if self.action == "move" and self.direction is None:
             raise ValueError("move requires a direction")
         if self.action != "move" and self.direction is not None:
             raise ValueError("direction is only valid for move")
+        if self.action != "configure" and (self.capacity_minutes is not None or self.estimates):
+            raise ValueError("capacity and estimates are only valid for configure")
+        if any(not item_id or len(item_id) > 500 or minutes < 5 or minutes > 1440
+               for item_id, minutes in self.estimates.items()):
+            raise ValueError("estimates must use bounded item IDs and minutes")
         return self
 
 
@@ -954,6 +961,12 @@ async def update_today_plan(payload: TodayOperation | TodayOperationBatch):
                 login,
                 [operation.model_dump() for operation in payload.operations],
             )
+        if payload.action == "configure":
+            return await asyncio.to_thread(
+                _today_store().apply_batch,
+                login,
+                [payload.model_dump()],
+            )
         return await asyncio.to_thread(
             _today_store().apply,
             login,

src/today_store.py

@@ -37,10 +37,17 @@ class TodayStore:
             CREATE TABLE IF NOT EXISTS today_plans (
                 login TEXT PRIMARY KEY,
                 revision INTEGER NOT NULL,
-                ids TEXT NOT NULL
+                ids TEXT NOT NULL,
+                capacity_minutes INTEGER,
+                estimates TEXT NOT NULL DEFAULT '{}'
             )
             """
         )
+        plan_columns = {row[1] for row in connection.execute("PRAGMA table_info(today_plans)")}
+        if "capacity_minutes" not in plan_columns:
+            connection.execute("ALTER TABLE today_plans ADD COLUMN capacity_minutes INTEGER")
+        if "estimates" not in plan_columns:
+            connection.execute("ALTER TABLE today_plans ADD COLUMN estimates TEXT NOT NULL DEFAULT '{}'")
         connection.execute(
             """
             CREATE TABLE IF NOT EXISTS today_operations (
@@ -88,13 +95,20 @@ class TodayStore:
     @staticmethod
     def _snapshot(row) -> dict:
         if row is None:
-            return {"revision": 0, "ids": []}
-        return {"revision": int(row[0]), "ids": json.loads(row[1])}
+            return {"revision": 0, "ids": [], "capacity_minutes": None, "estimates": {}}
+        ids = json.loads(row[1])
+        estimates = json.loads(row[3] or "{}")
+        return {
+            "revision": int(row[0]),
+            "ids": ids,
+            "capacity_minutes": row[2],
+            "estimates": {item_id: minutes for item_id, minutes in estimates.items() if item_id in ids},
+        }
 
     def get(self, login: str) -> dict:
         with self._connect() as connection:
             row = connection.execute(
-                "SELECT revision, ids FROM today_plans WHERE login = ?",
+                "SELECT revision, ids, capacity_minutes, estimates FROM today_plans WHERE login = ?",
                 (self._normalize_login(login),),
             ).fetchone()
         return self._snapshot(row)
@@ -119,7 +133,7 @@ class TodayStore:
         with self._connect() as connection:
             connection.execute("BEGIN IMMEDIATE")
             row = connection.execute(
-                "SELECT revision, ids FROM today_plans WHERE login = ?", (login,)
+                "SELECT revision, ids, capacity_minutes, estimates FROM today_plans WHERE login = ?", (login,)
             ).fetchone()
             snapshot = self._snapshot(row)
             duplicate = connection.execute(
@@ -130,6 +144,7 @@ class TodayStore:
                 return snapshot
 
             ids = list(snapshot["ids"])
+            estimates = dict(snapshot["estimates"])
             changed = False
             if action == "add":
                 if item_id not in ids:
@@ -140,6 +155,7 @@ class TodayStore:
             elif action == "remove":
                 if item_id in ids:
                     ids.remove(item_id)
+                    estimates.pop(item_id, None)
                     changed = True
             else:
                 try:
@@ -152,18 +168,25 @@ class TodayStore:
                     changed = True
 
             revision = snapshot["revision"] + (1 if changed else 0)
+            serialized_ids = json.dumps(ids, separators=(",", ":"))
+            serialized_estimates = json.dumps(estimates, separators=(",", ":"))
             if row is None:
                 connection.execute(
-                    "INSERT INTO today_plans(login, revision, ids) VALUES (?, ?, ?)",
-                    (login, revision, json.dumps(ids, separators=(",", ":"))),
+                    "INSERT INTO today_plans(login, revision, ids, capacity_minutes, estimates) VALUES (?, ?, ?, ?, ?)",
+                    (login, revision, serialized_ids, snapshot["capacity_minutes"], serialized_estimates),
                 )
             elif changed:
                 connection.execute(
-                    "UPDATE today_plans SET revision = ?, ids = ? WHERE login = ?",
-                    (revision, json.dumps(ids, separators=(",", ":")), login),
+                    "UPDATE today_plans SET revision = ?, ids = ?, estimates = ? WHERE login = ?",
+                    (revision, serialized_ids, serialized_estimates, login),
                 )
             self._record_operation(connection, login, operation_id)
-            return {"revision": revision, "ids": ids}
+            return {
+                "revision": revision,
+                "ids": ids,
+                "capacity_minutes": snapshot["capacity_minutes"],
+                "estimates": estimates,
+            }
 
     def apply_batch(self, login: str, operations: list[dict]) -> dict:
         """Apply an ordered batch with one lock and receipt per operation."""
@@ -171,10 +194,12 @@ class TodayStore:
         with self._connect() as connection:
             connection.execute("BEGIN IMMEDIATE")
             row = connection.execute(
-                "SELECT revision, ids FROM today_plans WHERE login = ?", (login,)
+                "SELECT revision, ids, capacity_minutes, estimates FROM today_plans WHERE login = ?", (login,)
             ).fetchone()
             snapshot = self._snapshot(row)
             ids = list(snapshot["ids"])
+            capacity_minutes = snapshot["capacity_minutes"]
+            estimates = dict(snapshot["estimates"])
             revision = snapshot["revision"]
             accepted: list[str] = []
             duplicates: list[str] = []
@@ -187,7 +212,7 @@ class TodayStore:
                 direction = operation.get("direction")
                 if not operation_id or not item_id:
                     raise ValueError("operation_id and item_id are required")
-                if action not in {"add", "remove", "move"}:
+                if action not in {"add", "remove", "move", "configure"}:
                     raise ValueError("unsupported Today action")
                 if action == "move" and direction not in {"up", "down"}:
                     raise ValueError("move direction must be up or down")
@@ -220,8 +245,9 @@ class TodayStore:
                 elif action == "remove":
                     if item_id in ids:
                         ids.remove(item_id)
+                        estimates.pop(item_id, None)
                         changed = True
-                else:
+                elif action == "move":
                     try:
                         index = ids.index(item_id)
                     except ValueError:
@@ -230,24 +256,48 @@ class TodayStore:
                     if index >= 0 and 0 <= target < len(ids):
                         ids[index], ids[target] = ids[target], ids[index]
                         changed = True
+                else:
+                    proposed_capacity = operation.get("capacity_minutes")
+                    if proposed_capacity is not None and (
+                        not isinstance(proposed_capacity, int) or isinstance(proposed_capacity, bool)
+                        or proposed_capacity < 15 or proposed_capacity > 1440
+                    ):
+                        raise ValueError("capacity_minutes must be between 15 and 1440")
+                    proposed_estimates = operation.get("estimates", {})
+                    if not isinstance(proposed_estimates, dict):
+                        raise ValueError("estimates must be an object")
+                    normalized_estimates = {}
+                    for estimate_id, minutes in proposed_estimates.items():
+                        if estimate_id not in ids:
+                            continue
+                        if not isinstance(minutes, int) or isinstance(minutes, bool) or minutes < 5 or minutes > 1440:
+                            raise ValueError("estimate minutes must be between 5 and 1440")
+                        normalized_estimates[estimate_id] = minutes
+                    changed = capacity_minutes != proposed_capacity or estimates != normalized_estimates
+                    capacity_minutes = proposed_capacity
+                    estimates = normalized_estimates
+
                 revision += 1 if changed else 0
                 self._record_operation(connection, login, operation_id)
                 accepted.append(operation_id)
 
             serialized = json.dumps(ids, separators=(",", ":"))
+            serialized_estimates = json.dumps(estimates, separators=(",", ":"))
             if row is None:
                 connection.execute(
-                    "INSERT INTO today_plans(login, revision, ids) VALUES (?, ?, ?)",
-                    (login, revision, serialized),
+                    "INSERT INTO today_plans(login, revision, ids, capacity_minutes, estimates) VALUES (?, ?, ?, ?, ?)",
+                    (login, revision, serialized, capacity_minutes, serialized_estimates),
                 )
             elif accepted:
                 connection.execute(
-                    "UPDATE today_plans SET revision = ?, ids = ? WHERE login = ?",
-                    (revision, serialized, login),
+                    "UPDATE today_plans SET revision = ?, ids = ?, capacity_minutes = ?, estimates = ? WHERE login = ?",
+                    (revision, serialized, capacity_minutes, serialized_estimates, login),
                 )
             return {
                 "revision": revision,
                 "ids": ids,
+                "capacity_minutes": capacity_minutes,
+                "estimates": estimates,
                 "accepted_operation_ids": accepted,
                 "duplicate_operation_ids": duplicates,
                 "rejected_operations": rejected,