From 294da7288ba78df9047579caf5a31b24340fecc8 Mon Sep 17 00:00:00 2001 From: Muhammad Faraz Maqsood Date: Mon, 16 Sep 2024 12:56:45 +0500 Subject: [PATCH] fix: resolve quality checks --- .../comment_client/user.py | 7 ++---- .../comment_client/utils.py | 22 ++++--------------- 2 files changed, 6 insertions(+), 23 deletions(-) diff --git a/openedx/core/djangoapps/django_comment_common/comment_client/user.py b/openedx/core/djangoapps/django_comment_common/comment_client/user.py index 5a6bb6f2cb6f..7f142debe56e 100644 --- a/openedx/core/djangoapps/django_comment_common/comment_client/user.py +++ b/openedx/core/djangoapps/django_comment_common/comment_client/user.py @@ -6,6 +6,7 @@ from forum import api as forum_api from forum.utils import ForumV2RequestError + class User(models.Model): accessible_fields = [ @@ -142,17 +143,13 @@ def subscribed_threads(self, query_params=None): ) def _retrieve(self, *args, **kwargs): - url = self.url(action='get', params=self.attributes) retrieve_params = self.default_retrieve_params.copy() retrieve_params.update(kwargs) if self.attributes.get('course_id'): retrieve_params['course_id'] = str(self.course_id) if self.attributes.get('group_id'): retrieve_params['group_id'] = self.group_id - try: - response = forum_api.retrieve_user(self.attributes["id"], retrieve_params) - except ForumV2RequestError as e: - raise str(e) + response = forum_api.retrieve_user(self.attributes["id"], retrieve_params) self._update_from_response(response) def retire(self, retired_username): diff --git a/openedx/core/djangoapps/django_comment_common/comment_client/utils.py b/openedx/core/djangoapps/django_comment_common/comment_client/utils.py index 6477267a982d..9d7c7714d0d2 100644 --- a/openedx/core/djangoapps/django_comment_common/comment_client/utils.py +++ b/openedx/core/djangoapps/django_comment_common/comment_client/utils.py @@ -76,13 +76,10 @@ def perform_request(method, url, data_or_params=None, raw=False, ) # For the better logging - response_to_log_and_compare = ( - response.json() if response.content else response.content - ) log.info( """ ======> FORUM <====== - + method: {method} url: {url} params: {params} @@ -90,13 +87,7 @@ def perform_request(method, url, data_or_params=None, raw=False, response: {response} ======> END <====== - """.format( - method=method, - url=url, - params=params, - data=data, - response=response_to_log_and_compare, - ) + """.format(method=method, url=url, params=params, data=data, response=response.json()) ) if method == "get": @@ -109,17 +100,12 @@ def perform_request(method, url, data_or_params=None, raw=False, headers=headers, timeout=config.connection_timeout, ) - forum_v1_response_to_log_and_compare = ( - forum_v1_response.json() - if forum_v1_response.content - else forum_v1_response.content - ) log.info(f"requested forum proxey url: {url}") log.info(f"requested forum v1 url: {forum_v1_url}") - if forum_v1_response_to_log_and_compare != response_to_log_and_compare: + if forum_v1_response.json() != response.json(): log.error( f"Forum v2 difference, for endpoint {forum_v1_url} with params={params}. \ - Expected: {forum_v1_response_to_log_and_compare}. Got: {response_to_log_and_compare}." + Expected: {forum_v1_response.json()}. Got: {response.json()}." ) metric_tags.append(f'status_code:{response.status_code}')