[ENG-10341] Recast to OsfStorageFileNode after restore does not clear delete_* fields - #11871
Open
ihorsokhanexoft wants to merge 3 commits into
Open
Conversation
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.
Ticket
https://openscience.atlassian.net/browse/ENG-10341
Purpose
Restored files are considered as deleted and not shown on UI
Changes
In fact, when user restores
TrashedFileNode, we recast this object toOsfStorageFileNodebut this object still containsdeleted,deleted_on,deleted_byfield values that make this file unreachablerestore()method forTrashedFileNodeobjects clears values for thedeletedfield before recasting toOsfStorageFileNodeOsfStorageFileNodeobjects that were restored viarestore()and have values indeletedfielddeleted_onfield is not cleared because when we restore a folder, it restores ONLY children within the samedeleted_ondatetime. Therefore, we preservedeleted_byto know who triggered deletionCode reference:
osf.io/osf/models/files.py
Lines 751 to 766 in e2f47e9