From 6614c37baa3a32b95ec4cfaa39b4ab42235930b5 Mon Sep 17 00:00:00 2001 From: Maximilian Moser Date: Tue, 6 Aug 2024 22:30:38 +0200 Subject: [PATCH 1/2] resolvers: use the role ID rather than name to resolve the entity * the GroupResolver already uses the role ID rather than their name for creating reference dictionaries --- invenio_users_resources/entity_resolvers.py | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/invenio_users_resources/entity_resolvers.py b/invenio_users_resources/entity_resolvers.py index fbe72f5..bf22444 100644 --- a/invenio_users_resources/entity_resolvers.py +++ b/invenio_users_resources/entity_resolvers.py @@ -123,9 +123,7 @@ def _resolve(self): # Resolves to role name, not id role_id = self._parse_ref_dict_id() try: - return Role.query.filter( - Role.name == role_id # TODO to be changed to role id - ).one() + return Role.query.filter(Role.id == role_id).one() except NoResultFound: return {} From ae87544f35c287c5808b32bc04430af291a32bc0 Mon Sep 17 00:00:00 2001 From: Maximilian Moser Date: Tue, 6 Aug 2024 22:37:25 +0200 Subject: [PATCH 2/2] tests: replace docker-compose with docker compose --- .github/workflows/tests.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/tests.yml b/.github/workflows/tests.yml index 4fb6e59..34f3921 100644 --- a/.github/workflows/tests.yml +++ b/.github/workflows/tests.yml @@ -73,7 +73,7 @@ jobs: pip install ".[$EXTRAS]" pip freeze docker --version - docker-compose --version + docker compose version - name: Run tests run: |