Answer stability round 1: 0 🔴, 1 🟡 (0 misread); an unedited save over a version a teammate moved refuses, and a test asserts the PUT rather than the token
This commit is contained in:
@@ -88,8 +88,13 @@ class ConfluencePage:
|
||||
seen = self.seen_of(over)
|
||||
if isinstance(seen, Failure):
|
||||
return seen
|
||||
# The markdown a read shows drops the localIds and spacing paragraphs Confluence holds, so writing the text a read found back would lose them: leave the page alone.
|
||||
# The markdown a read shows drops the localIds and spacing paragraphs Confluence holds, so writing the text a read found back would lose them: leave the page alone. No write means no 409, so the version is read instead: a save over a teammate's edit refuses whether or not the text changed.
|
||||
if over is not None and seen.digest == digest_of(text):
|
||||
current = self.fetched("")
|
||||
if isinstance(current, Failure):
|
||||
return current
|
||||
if current[0].version != seen.version:
|
||||
return self.saved_since(seen.version, f"Confluence holds version {current[0].version}")
|
||||
return Held(text, over)
|
||||
document = self.to_adf(text)
|
||||
if isinstance(document, Failure):
|
||||
@@ -100,11 +105,15 @@ class ConfluencePage:
|
||||
body = {"id": self.page.page_id, "status": "current", "title": seen.title, "body": {"representation": "atlas_doc_format", "value": json.dumps(document)}, "version": {"number": seen.version + 1}}
|
||||
answer = self.http("PUT", self.url, authorization, body)
|
||||
if isinstance(answer, ErrorAnswer) and answer.status == CONFLICT:
|
||||
return Failure(f"someone saved {self.label} since the loop read version {seen.version} of it, so the loop didn't write it: never overwrite their edit, but ask the human what to do ({answer.reason})")
|
||||
return self.saved_since(seen.version, answer.reason)
|
||||
if isinstance(answer, Failure):
|
||||
return Failure(f"cannot write {self.label}: {answer.reason}")
|
||||
return Held(text, Seen(seen.version + 1, seen.title, digest_of(text)).token)
|
||||
|
||||
def saved_since(self, version: int, evidence: str) -> Failure:
|
||||
"""The refusal of a write over version, which a teammate's save replaced, as evidence shows."""
|
||||
return Failure(f"someone saved {self.label} since the loop read version {version} of it, so the loop didn't write it: never overwrite their edit, but ask the human what to do ({evidence})")
|
||||
|
||||
def fetched(self, query: str) -> tuple[Seen, object] | Failure:
|
||||
"""The page's version and title, and the value of its body in atlas_doc_format where query asks for it; None where it doesn't."""
|
||||
authorization = basic_auth(self.env_file)
|
||||
|
||||
@@ -7,7 +7,7 @@ import unittest
|
||||
|
||||
sys.path.insert(0, str(pathlib.Path(__file__).resolve().parents[1]))
|
||||
|
||||
from record_store.confluence_page import ConfluencePage, digest_of, Seen
|
||||
from record_store.confluence_page import ConfluencePage
|
||||
from rest_client.json_request import ErrorAnswer
|
||||
from failure import Failure
|
||||
from record_store.held import Held
|
||||
@@ -80,7 +80,9 @@ class ConfluencePageTest(ConfluenceCase):
|
||||
store = self.new_store()
|
||||
held = store.held()
|
||||
assert isinstance(held, Held), held
|
||||
self.assertEqual(store.write("- a decision\n", held.version), Held("- a decision\n", Seen(8, "Decisions", digest_of("- a decision\n")).token))
|
||||
written = store.write("- a decision\n", held.version)
|
||||
assert isinstance(written, Held), written
|
||||
self.assertEqual(written.text, "- a decision\n")
|
||||
self.assertEqual(self.confluence.calls[-1], ("PUT", URL, AUTHORIZATION, {"id": PAGE.page_id, "status": "current", "title": "Decisions", "body": {"representation": "atlas_doc_format", "value": json.dumps(to_adf("- a decision\n"))}, "version": {"number": 8}}))
|
||||
|
||||
def test_saving_the_text_a_read_found_leaves_the_page_as_confluence_holds_it(self) -> None:
|
||||
@@ -89,9 +91,27 @@ class ConfluencePageTest(ConfluenceCase):
|
||||
held = self.new_store().held()
|
||||
assert isinstance(held, Held), held
|
||||
self.assertEqual(self.new_store().write(held.text, held.version), held)
|
||||
self.assertEqual([call[0] for call in self.confluence.calls], ["GET"])
|
||||
self.assertNotIn("PUT", [call[0] for call in self.confluence.calls])
|
||||
self.assertEqual((self.confluence.version, self.confluence.value), (2, value))
|
||||
|
||||
def test_refuses_to_save_the_text_a_read_found_where_a_teammate_saved_since(self) -> None:
|
||||
self.confluence.teammate_saves("- a decision\n")
|
||||
held = self.new_store().held()
|
||||
assert isinstance(held, Held), held
|
||||
self.confluence.teammate_saves("- their decision\n")
|
||||
written = self.new_store().write(held.text, held.version)
|
||||
assert isinstance(written, Failure), written
|
||||
self.assertIn("someone saved", written.reason)
|
||||
self.assertIn("ask the human", written.reason)
|
||||
self.assertNotIn("PUT", [call[0] for call in self.confluence.calls])
|
||||
self.assertEqual(self.new_store().read(), "- their decision\n")
|
||||
|
||||
def test_an_unedited_save_fails_where_the_pages_version_cannot_be_read(self) -> None:
|
||||
held = self.new_store().held()
|
||||
assert isinstance(held, Held), held
|
||||
store = ConfluencePage(PAGE, self.env, lambda *_: ErrorAnswer("GET /wiki/api/v2/pages/2293761 answered 404: Not Found", 404), to_markdown, to_adf)
|
||||
self.assertEqual(store.write(held.text, held.version), Failure(f"cannot read {PAGE.spelling}: GET /wiki/api/v2/pages/2293761 answered 404: Not Found"))
|
||||
|
||||
def test_saving_an_edited_text_writes_the_page(self) -> None:
|
||||
self.confluence.teammate_saves("- a decision\n")
|
||||
held = self.new_store().held()
|
||||
|
||||
Reference in New Issue
Block a user