feat(server): harden app_user.settings updates with atomic database-level merge - #988
Open
dembrane-sam-bot wants to merge 1 commit into
Open
feat(server): harden app_user.settings updates with atomic database-level merge#988dembrane-sam-bot wants to merge 1 commit into
dembrane-sam-bot wants to merge 1 commit into
Conversation
…evel merge - Implemented database row-level locking (SELECT ... FOR UPDATE) to prevent read-merge-write race conditions. - Implemented deep_merge in Python to prevent nested dictionary sibling replacement/clobbering. - Separated Directus display_name updates from direct Postgres settings updates cleanly. - Added robust unit and integration tests covering deep merge recursively and transaction lock correctness under concurrency. Closes ECHO-933
dembrane-sam-bot
enabled auto-merge
August 10, 2026 18:20
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.
What this changes
app_user.settingsupdates by implementing database row-level locking (SELECT ... FOR UPDATE) inPATCH /v2/me, completely eliminating concurrent read-merge-write race conditions —me.py.deep_mergehelper in Python, ensuring that nested dictionaries withinsettingsare merged rather than wholesale replaced, protecting sibling keys from being clobbered —me.py.display_nameupdates from direct Postgres-basedsettingsupdates cleanly —me.py.deep_merge(flat keys, nested structures, type mismatch fallbacks) andupdate_user_settings_atomiccorrectness (valid transactions, 404 raised on missing user) —test_me_settings_atomic.py.Why this is needed
The prior implementation performed a shallow merge in Python (
{**existing_settings, **body.settings}) inside the API handler and wrote the full dict back. This suffered from:This change acquires an atomic transaction lock on the specific row in PostgreSQL, deep-merges recursively, and updates atomically.
Closes: ECHO-933