From ed24c7dc3a809767c8448d65dfe7ca51d233a275 Mon Sep 17 00:00:00 2001 From: delcroip Date: Thu, 25 Jan 2024 09:48:01 +0100 Subject: [PATCH] fix ORM typo --- api_fhir_r4/subscriptions/subscriptionCriteriaFilter.py | 4 ++-- api_fhir_r4/tests/test_api_authorization.py | 3 ++- 2 files changed, 4 insertions(+), 3 deletions(-) diff --git a/api_fhir_r4/subscriptions/subscriptionCriteriaFilter.py b/api_fhir_r4/subscriptions/subscriptionCriteriaFilter.py index 99a5dcbf..8b8e8a65 100644 --- a/api_fhir_r4/subscriptions/subscriptionCriteriaFilter.py +++ b/api_fhir_r4/subscriptions/subscriptionCriteriaFilter.py @@ -27,9 +27,9 @@ def _get_all_active_subscriptions(self): R4SubscriptionConfig.get_fhir_sub_criteria_key_resource(): self.fhir_resource_name}) if self.fhir_resource_type_name: queryset = queryset.filter( - ~Q(criteria__jsoncontainskey=R4SubscriptionConfig.get_fhir_sub_criteria_key_resource_type() | Q( + ~Q(criteria__jsoncontainskey=R4SubscriptionConfig.get_fhir_sub_criteria_key_resource_type() )| Q( criteria__jsoncontains={ - R4SubscriptionConfig.get_fhir_sub_criteria_key_resource_type(): self.fhir_resource_type_name}))) + R4SubscriptionConfig.get_fhir_sub_criteria_key_resource_type(): self.fhir_resource_type_name})) return queryset.all() def _get_matching_subscriptions(self, subscriptions): diff --git a/api_fhir_r4/tests/test_api_authorization.py b/api_fhir_r4/tests/test_api_authorization.py index 2b2111b9..c2d9935c 100644 --- a/api_fhir_r4/tests/test_api_authorization.py +++ b/api_fhir_r4/tests/test_api_authorization.py @@ -6,6 +6,7 @@ from api_fhir_r4.configurations import GeneralConfiguration from api_fhir_r4.tests import GenericFhirAPITestMixin +from gettext import gettext as _ from api_fhir_r4.tests.utils import get_connection_payload,get_or_create_user_api @@ -52,7 +53,7 @@ def test_post_should_raise_error_decode_token(self): response = self.client.get(self.url_to_test_authorization, format='json', **headers) response_json = response.json() self.assertEqual(response.status_code, status.HTTP_401_UNAUTHORIZED) - self.assertEqual(self.get_response_details(response_json), "Error decoding signature") + self.assertEqual(self.get_response_details(response_json), _('INCORRECT_CREDENTIALS')) def test_post_should_raise_lack_of_bearer_prefix(self): response = self.client.post(self.base_url + 'login/', data=get_connection_payload(), format='json')