fix(trashBin): ensure the project is fully restored from the admin interface TASK-1645 #5563
Conversation
This file contains 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
noliveleger
changed the title
noliveleger
commented
Feb 28, 2025
Comment on lines
129
to
144
| asset = Asset.all_objects.only( | ||
| 'pk', 'name', 'uid', 'owner_id' | ||
| ).get(uid=self.kpi_asset_uid) | ||
| except Asset.DoesNotExist: | ||
| try: | ||
| asset = Asset.objects.only('pk').get( | ||
| _deployment_data__formid=self.pk | ||
| ) | ||
| asset = Asset.all_objects.only( | ||
| 'pk', 'name', 'uid', 'owner_id' | ||
| ).get(_deployment_data__formid=self.pk) | ||
| except Asset.DoesNotExist: | ||
| # An `Asset` object needs to be returned to avoid 500 while | ||
| # Enketo is fetching for project XML (e.g: /formList, /manifest) | ||
| asset = Asset(uid=self.id_string) | ||
| asset = Asset( | ||
| uid=self.id_string, | ||
| name=self.title, | ||
| owner_id=self.user.id, | ||
| ) |
There was a problem hiding this comment.
Part of #5514 , add new fields to avoids conflicts with release/2.025.02
noliveleger
changed the title
rgraber
reviewed
Feb 28, 2025
| @@ -126,16 +126,22 @@ def asset(self): | |||
| # uses an Asset object only to narrow down a query with a filter, | |||
There was a problem hiding this comment.
This comment is no longer accurate
| ) | ||
| asset = Asset.all_objects.only( | ||
| 'pk', 'name', 'uid', 'owner_id' | ||
| ).get(_deployment_data__formid=self.pk) |
There was a problem hiding this comment.
I don't think using only helps us any here if we have to call get on a different field anyway
There was a problem hiding this comment.
It does ;-)
In [1]: Asset.objects.only('pk', 'uid', 'name').get(_deployment_data__backend_response__formid=428)
SELECT "kpi_asset"."id",
"kpi_asset"."name",
"kpi_asset"."uid"
FROM "kpi_asset"
WHERE (NOT ("kpi_asset"."pending_delete") AND ("kpi_asset"."_deployment_data" #> '{backend_response,formid}') = '428'::jsonb)
LIMIT 21
Execution time: 0.013126s [Database: default]
Out[1]: <Asset: Project with audio (as2gssYmeivHnk5f7zXPbY)>Having that said, you made see there was a problem with the condition ;-)
There was a problem hiding this comment.
Huh. Django is smarter than I gave it credit
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.
📣 Summary
Fixed an issue where projects were not being completely restored from the trash.
📖 Description
A bug prevented projects from being fully restored after being moved to the trash, leading to missing or incomplete data upon recovery.
💭 Notes
Some unittests were apparently missing for this part, this PR adds two new tests. Moreover, part of kpi#5514 has been backported to this release.
👀 Preview steps
Bug template:
This snippet should raise an exception
This snippet shouldn't raise an exception