feat: Shareable resource #1104
Merged
feat: Shareable resource #1104
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
josebui
force-pushed
the
feat/shareable-resource
branch
2 times, most recently
from
fc0ee33 to
25b9937
Compare
paulschreiber
requested changes
Feb 15, 2024
Comment on lines
32
to
38
| SHARE_ACCESS_ALL = "all" | ||
| SHARE_ACCESS_TARGET_MEMBERS = "target_members" | ||
| DEFAULT_SHARE_ACCESS = SHARE_ACCESS_TARGET_MEMBERS | ||
|
|
||
| SHARE_ACCESS_TYPES = ( | ||
| (SHARE_ACCESS_ALL, _("Anyone with the link")), | ||
| (SHARE_ACCESS_TARGET_MEMBERS, _("Only target members")), |
There was a problem hiding this comment.
Suggested change
| SHARE_ACCESS_ALL = "all" | |
| SHARE_ACCESS_TARGET_MEMBERS = "target_members" | |
| DEFAULT_SHARE_ACCESS = SHARE_ACCESS_TARGET_MEMBERS | |
| SHARE_ACCESS_TYPES = ( | |
| (SHARE_ACCESS_ALL, _("Anyone with the link")), | |
| (SHARE_ACCESS_TARGET_MEMBERS, _("Only target members")), | |
| SHARE_ACCESS_ALL = "all" | |
| SHARE_ACCESS_MEMBERS = "target_members" | |
| DEFAULT_SHARE_ACCESS = SHARE_ACCESS_MEMBERS | |
| SHARE_ACCESS_TYPES = ( | |
| (SHARE_ACCESS_ALL, _("Anyone with the link")), | |
| (SHARE_ACCESS_MEMBERS, _("Only members")), |
| @classmethod | ||
| def get_share_access_from_text(cls, share_access): | ||
| if not share_access: | ||
| return cls.SHARE_ACCESS_TARGET_MEMBERS |
There was a problem hiding this comment.
Suggested change
| return cls.SHARE_ACCESS_TARGET_MEMBERS | |
| return cls.SHARE_ACCESS_MEMBERS |
| lowered = share_access.lower() | ||
| if lowered == cls.SHARE_ACCESS_ALL: | ||
| return cls.SHARE_ACCESS_ALL | ||
| return cls.SHARE_ACCESS_TARGET_MEMBERS |
There was a problem hiding this comment.
Suggested change
| return cls.SHARE_ACCESS_TARGET_MEMBERS | |
| return cls.SHARE_ACCESS_MEMBERS |
|
|
||
| share_access_all = Q(share_access=SharedResource.SHARE_ACCESS_ALL) | ||
| share_access_members = Q( | ||
| Q(share_access=SharedResource.SHARE_ACCESS_TARGET_MEMBERS) |
There was a problem hiding this comment.
Suggested change
| Q(share_access=SharedResource.SHARE_ACCESS_TARGET_MEMBERS) | |
| Q(share_access=SharedResource.SHARE_ACCESS_MEMBERS) |
| if shared_resource.share_access == SharedResource.SHARE_ACCESS_ALL: | ||
| return True | ||
|
|
||
| if shared_resource.share_access == SharedResource.SHARE_ACCESS_TARGET_MEMBERS: |
There was a problem hiding this comment.
Suggested change
| if shared_resource.share_access == SharedResource.SHARE_ACCESS_TARGET_MEMBERS: | |
| if shared_resource.share_access == SharedResource.SHARE_ACCESS_MEMBERS: |
|
|
||
| @mock.patch("apps.shared_data.models.data_entries.data_entry_file_storage.url") | ||
| def test_download_data_entry_file_shared_target_members_fail( | ||
| get_url_mock, logged_client, shared_resource_data_entry_shared_target_members_user_1 |
There was a problem hiding this comment.
Suggested change
| get_url_mock, logged_client, shared_resource_data_entry_shared_target_members_user_1 | |
| get_url_mock, logged_client, shared_resource_data_entry_shared_members_user_1 |
| ): | ||
| redirect_url = "https://example.org/s3_file.json" | ||
| get_url_mock.return_value = redirect_url | ||
| share_uuid = shared_resource_data_entry_shared_target_members_user_1.share_uuid |
There was a problem hiding this comment.
Suggested change
| share_uuid = shared_resource_data_entry_shared_target_members_user_1.share_uuid | |
| share_uuid = shared_resource_data_entry_shared_members_user_1.share_uuid |
| @@ -51,3 +62,90 @@ def resolve_source(self, info, **kwargs): | |||
|
|
|||
| def resolve_target(self, info, **kwargs): | |||
| return self.target | |||
|
|
|||
| def resolve_download_url(self, info, **kwargs): | |||
| return f"{settings.API_ENDPOINT}/shared-data/download/{self.share_uuid}" | |||
There was a problem hiding this comment.
Suggested change
| return f"{settings.API_ENDPOINT}/shared-data/download/{self.share_uuid}" | |
| return f"{settings.API_ENDPOINT}/download/{self.share_uuid}" |
There was a problem hiding this comment.
@paulschreiber This is the API endpoint, the urls are organized by app, so we can't avoid the shared-data without losing that structure
|
|
||
| for data_entry in data_entries: | ||
| assert data_entry.name in entries_result | ||
| uuid = data_entry.shared_resources.all()[0].share_uuid | ||
| download_url = f"{settings.API_ENDPOINT}/shared-data/download/{uuid}" |
There was a problem hiding this comment.
issue: a helper like resolve_download_url every time you generate URLs of this form.
|
|
||
| for data_entry in data_entries: | ||
| assert data_entry.name in entries_result | ||
| uuid = data_entry.shared_resources.all()[0].share_uuid | ||
| download_url = f"{settings.API_ENDPOINT}/shared-data/download/{uuid}" |
There was a problem hiding this comment.
Suggested change
| download_url = f"{settings.API_ENDPOINT}/shared-data/download/{uuid}" | |
| download_url = f"{settings.API_ENDPOINT}/download/{uuid}" |
josebui
force-pushed
the
feat/shareable-resource
branch
from
8401669 to
109fb23
Compare
paulschreiber
approved these changes
Feb 16, 2024
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.
Description
Checklist
Related Issues