Skip to content

Enhance '_access.update' to include existing values #1985

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
zzacharo merged 1 commit into from
Nov 28, 2024
Merged

Enhance '_access.update' to include existing values #1985

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
8 changes: 5 additions & 3 deletions cds/modules/deposit/api.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -500,11 +500,13 @@ def create(cls, data, id_=None, **kwargs):
kwargs.setdefault("bucket_location", "videos")
data["$schema"] = current_jsonschemas.path_to_url(cls._schema)
data.setdefault("videos", [])
data.setdefault("_access", {})
data.setdefault("_cds", {})
# Add the current user to the ``_access.update`` list
data.setdefault("_access", {})
access_update = data["_access"].setdefault("update", [])
try:
data["_access"]["update"] = [current_user.email]
if current_user.email not in access_update:
# Add the current user to the ``_access.update`` list
access_update.append(current_user.email)
except AttributeError:
current_app.logger.warning(
"No current user found, _access.update will stay empty."
Expand Down
5 changes: 5 additions & 0 deletions tests/unit/test_project_rest.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -85,6 +85,9 @@ def assert_bucket_for_video(bucket_id, video):
video_schema = (
"https://cds.cern.ch/schemas/" "deposits/records/videos/video/video-v1.0.0.json"
)

project_deposit_metadata.setdefault("_access", {}).setdefault("update", [])
project_deposit_metadata["_access"]["update"].append("[email protected]")

with api_app.test_client() as client:
login_user(User.query.get(users[0]))
Expand All @@ -100,6 +103,8 @@ def assert_bucket_for_video(bucket_id, video):
assert res.status_code == 201
project_dict = json.loads(res.data.decode("utf-8"))
assert project_dict["metadata"]["videos"] == []
assert User.query.get(users[0]).email in project_dict["metadata"]["_access"]["update"]
assert "[email protected]" in project_dict["metadata"]["_access"]["update"]
assert project_dict["metadata"]["title"]["title"] == "my project"
assert project_dict["links"]["bucket"].startswith("http://localhost/files/")
assert all(
Expand Down