Update src/store.py

src/store.py

@@ -14,15 +14,15 @@ def _rand(n=4) -> str:
     alphabet = string.ascii_uppercase + string.digits
     return ''.join(secrets.choice(alphabet) for _ in range(n))
 
-def new_case_id() -> str:
-    return f"EC-{time.strftime('%Y%m%d-%H%M%S')}-{_rand()}"
-
 def case_path(case_id: str) -> Path:
     return cases_dir() / f"{case_id}.json"
 
+def new_case_id() -> str:
+    return f"EC-{_now_iso().replace('-','').replace(':','').replace('T','')}-{_rand(4)}"
+
 def _deep_merge(a: Dict[str, Any], b: Dict[str, Any]) -> Dict[str, Any]:
     out = dict(a)
-    for k, v in b.items():
+    for k, v in (b or {}).items():
         if isinstance(v, dict) and isinstance(out.get(k), dict):
             out[k] = _deep_merge(out[k], v)
         else:
@@ -30,22 +30,9 @@ def _deep_merge(a: Dict[str, Any], b: Dict[str, Any]) -> Dict[str, Any]:
     return out
 
 def _migrate_soup_to_soap(obj: Dict[str, Any]) -> Dict[str, Any]:
-    """If an older case has 'soup_draft', migrate it to 'soap_draft' (Uncertainties→Assessment)."""
-    if "soap_draft" in obj:
-        return obj
-    if "soup_draft" in obj:
-        sd = obj.get("soup_draft") or {}
-        obj["soap_draft"] = {
-            "subjective": sd.get("subjective",""),
-            "objective": sd.get("objective",""),
-            "assessment": sd.get("uncertainties",""),  # map old key
-            "plan": sd.get("plan",""),
-            "citations": sd.get("citations", []),
-        }
-        # keep the old for safety, or uncomment next line to remove:
-        # obj.pop("soup_draft", None)
-    else:
-        obj["soap_draft"] = {"subjective":"", "objective":"", "assessment":"", "plan":"", "citations":[]}
+    # If older payloads used "soup_draft", migrate to "soap_draft"
+    if isinstance(obj, dict) and "soup_draft" in obj and "soap_draft" not in obj:
+        obj["soap_draft"] = obj.pop("soup_draft")
     return obj
 
 def list_cases(status: Optional[str] = None) -> List[Dict[str, Any]]:
@@ -75,6 +62,9 @@ def read_case(case_id: str) -> Optional[Dict[str, Any]]:
     try:
         obj = json.loads(p.read_text())
         obj = _migrate_soup_to_soap(obj)
+        # drop deprecated triage field if present
+        if isinstance(obj, dict) and 'triage' in obj:
+            obj.pop('triage', None)
         return obj
     except Exception:
         return None
@@ -106,7 +96,6 @@ def create_case(initial: Dict[str, Any]) -> Dict[str, Any]:
             "pcp_attests": False,
             "specialist_attests": False
         },
-        "triage": {},
         "soap_draft": {  # <-- SOAP by default
             "subjective": "",
             "objective": "",
@@ -118,6 +107,7 @@ def create_case(initial: Dict[str, Any]) -> Dict[str, Any]:
     }
     obj = _deep_merge(obj, initial or {})
     obj = _migrate_soup_to_soap(obj)
+    # no `triage` in new schema
     save_case(obj)
     return obj
 
@@ -129,3 +119,4 @@ def update_case(case_id: str, patch: Dict[str, Any]) -> Optional[Dict[str, Any]]
     save_case(updated)
     return updated
 
+