Skip to content

Commit 8a8b9c4

Browse files
committed
style: fix quality
1 parent 7ff3056 commit 8a8b9c4

File tree

7 files changed

+60
-37
lines changed

7 files changed

+60
-37
lines changed

credentials/apps/verifiable_credentials/composition/tests/test_schemas.py

Lines changed: 6 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -58,9 +58,12 @@ def setUp(self):
5858
credential_content_type=self.program_credential_content_type,
5959
credential=self.program_cert,
6060
)
61-
self.program_issuance_line = IssuanceLineFactory(user_credential=self.program_user_credential, subject_id="did:key:test")
62-
self.course_issuance_line = IssuanceLineFactory(user_credential=self.course_user_credential, subject_id="did:key:test")
63-
61+
self.program_issuance_line = IssuanceLineFactory(
62+
user_credential=self.program_user_credential, subject_id="did:key:test"
63+
)
64+
self.course_issuance_line = IssuanceLineFactory(
65+
user_credential=self.course_user_credential, subject_id="did:key:test"
66+
)
6467

6568
def test_to_representation_program(self):
6669
data = EducationalOccupationalCredentialSchema(self.program_issuance_line).data

credentials/apps/verifiable_credentials/constants.py

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -2,5 +2,6 @@ class CredentialsType:
22
"""
33
Enum to define the type of credentials.
44
"""
5+
56
PROGRAM = "programcertificate"
67
COURSE = "coursecertificate"

credentials/apps/verifiable_credentials/issuance/models.py

Lines changed: 6 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -17,9 +17,9 @@
1717
from credentials.apps.verifiable_credentials.utils import capitalize_first
1818

1919
from ..composition.utils import get_data_model, get_data_models
20+
from ..constants import CredentialsType
2021
from ..settings import vc_settings
2122
from ..storages.utils import get_storage
22-
from ..constants import CredentialsType
2323

2424

2525
User = get_user_model()
@@ -154,13 +154,15 @@ def credential_description(self):
154154
effort_info=effort_portion,
155155
)
156156
elif self.credential_content_type == CredentialsType.COURSE:
157-
description = _("{credential_type} is granted on course {course_title} completion offered by {organization}, in collaboration with {platform_name}").format(
157+
description = _(
158+
"{credential_type} is granted on course {course_title} completion offered by {organization}, in collaboration with {platform_name}" # pylint: disable=line-too-long
159+
).format(
158160
credential_type=self.credential_verbose_type,
159161
course_title=getattr(self.course, "title", ""),
160162
platform_name=self.platform_name,
161163
organization=self.user_credential.credential.course_key.org,
162164
)
163-
return capitalize_first(description)
165+
return capitalize_first(description) # pylint: disable=possibly-used-before-assignment
164166

165167
@property
166168
def credential_narrative(self):
@@ -185,7 +187,7 @@ def credential_narrative(self):
185187
organization=self.user_credential.credential.course_key.org,
186188
platform_name=self.platform_name,
187189
)
188-
return capitalize_first(narrative)
190+
return capitalize_first(narrative) # pylint: disable=possibly-used-before-assignment
189191

190192
@property
191193
def credential_content_type(self):

credentials/apps/verifiable_credentials/rest_api/v1/tests/test_views.py

Lines changed: 16 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,10 @@
11
import json
22
from unittest import mock
33

4+
from ddt import data, ddt, unpack
45
from django.contrib.contenttypes.models import ContentType
56
from django.test import TestCase
67
from django.urls import reverse
7-
from ddt import ddt, data, unpack
88
from rest_framework import status
99

1010
from credentials.apps.catalog.tests.factories import (
@@ -89,14 +89,21 @@ def test_get_without_query_params(self):
8989
self.client.login(username=self.user.username, password=USER_PASSWORD)
9090
response = self.client.get("/verifiable_credentials/api/v1/credentials/")
9191
self.assertEqual(response.status_code, 200)
92-
self.assertEqual(response.data["program_credentials"], get_user_credentials_data(self.user.username, "programcertificate"))
93-
self.assertEqual(response.data["course_credentials"], get_user_credentials_data(self.user.username, "coursecertificate"))
92+
self.assertEqual(
93+
response.data["program_credentials"], get_user_credentials_data(self.user.username, "programcertificate")
94+
)
95+
self.assertEqual(
96+
response.data["course_credentials"], get_user_credentials_data(self.user.username, "coursecertificate")
97+
)
9498

9599
@data(
96100
("programcertificate", {"program_credentials": "programcertificate"}, ["course_credentials"]),
97101
("coursecertificate", {"course_credentials": "coursecertificate"}, ["program_credentials"]),
98-
("programcertificate,coursecertificate",
99-
{"program_credentials": "programcertificate", "course_credentials": "coursecertificate"}, [])
102+
(
103+
"programcertificate,coursecertificate",
104+
{"program_credentials": "programcertificate", "course_credentials": "coursecertificate"},
105+
[],
106+
),
100107
)
101108
@unpack
102109
def test_get_with_query_params(self, types, expected_data, not_in_keys):
@@ -105,14 +112,12 @@ def test_get_with_query_params(self, types, expected_data, not_in_keys):
105112
self.assertEqual(response.status_code, 200)
106113

107114
for key, expected_value in expected_data.items():
108-
self.assertEqual(
109-
response.data[key],
110-
get_user_credentials_data(self.user.username, expected_value)
111-
)
115+
self.assertEqual(response.data[key], get_user_credentials_data(self.user.username, expected_value))
112116

113117
for key in not_in_keys:
114118
self.assertNotIn(key, response.data)
115119

120+
116121
class InitIssuanceViewTestCase(SiteMixin, TestCase):
117122
url_path = reverse("verifiable_credentials:api:v1:credentials-init")
118123

@@ -240,7 +245,7 @@ def test_post_valid_request(self, mock_issue):
240245
mock_issue.return_value = {"verifiable_credential": "test"}
241246

242247
url_path = reverse("verifiable_credentials:api:v1:credentials-issue", args=[str(self.issuance_line.uuid)])
243-
data = {"holder": "test-holder-id"}
248+
data = {"holder": "test-holder-id"} # pylint: disable=redefined-outer-name
244249
response = self.client.post(url_path, json.dumps(data), JSON_CONTENT_TYPE)
245250
self.assertEqual(response.status_code, status.HTTP_201_CREATED)
246251
self.assertEqual(response.data, {"verifiable_credential": "test"})
@@ -249,7 +254,7 @@ def test_post_valid_request(self, mock_issue):
249254
def test_post_invalid_request_raises_validation_error(self, mock_issue):
250255
self.authenticate_user(self.user)
251256
mock_issue.side_effect = IssuanceException(detail="Invalid request.")
252-
data = {"holder": "test-holder-id"}
257+
data = {"holder": "test-holder-id"} # pylint: disable=redefined-outer-name
253258
url_path = reverse("verifiable_credentials:api:v1:credentials-issue", args=[str(self.issuance_line.uuid)])
254259
response = self.client.post(url_path, json.dumps(data), JSON_CONTENT_TYPE)
255260
self.assertEqual(response.status_code, status.HTTP_400_BAD_REQUEST)

credentials/apps/verifiable_credentials/rest_api/v1/views.py

Lines changed: 8 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -57,17 +57,20 @@ def list(self, request, *args, **kwargs):
5757
Returns:
5858
response(dict): Information about the user's program credentials
5959
"""
60-
types = self.request.query_params.get('types')
60+
types = self.request.query_params.get("types")
6161
response = {}
6262

6363
if types:
64-
types = types.split(',')
64+
types = types.split(",")
6565
else:
6666
types = self.CREDENTIAL_TYPES_MAP.keys()
6767

68-
for type in types:
69-
if type in self.CREDENTIAL_TYPES_MAP:
70-
response[self.CREDENTIAL_TYPES_MAP[type]] = get_user_credentials_data(request.user.username, type)
68+
for credential_type in types:
69+
if credential_type in self.CREDENTIAL_TYPES_MAP:
70+
response[self.CREDENTIAL_TYPES_MAP[credential_type]] = get_user_credentials_data(
71+
request.user.username,
72+
credential_type
73+
)
7174

7275
return Response(response)
7376

credentials/apps/verifiable_credentials/tests/test_utils.py

Lines changed: 10 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -90,7 +90,9 @@ def test_get_user_program_credentials_data_one_program(self):
9090
assert result[0]["username"] == self.program_user_credential.username
9191
assert result[0]["download_url"] == self.program_user_credential.download_url
9292
assert result[0]["credential_id"] == self.program_user_credential.credential_id
93-
assert result[0]["credential_uuid"] == str(self.program_user_credential.credential.program_uuid).replace("-", "")
93+
assert result[0]["credential_uuid"] == str(self.program_user_credential.credential.program_uuid).replace(
94+
"-", ""
95+
)
9496
assert result[0]["credential_title"] == self.program_user_credential.credential.program.title
9597

9698
def test_get_user_program_credentials_data_multiple_programs(self):
@@ -114,15 +116,19 @@ def test_get_user_program_credentials_data_multiple_programs(self):
114116
assert result[0]["username"] == self.program_user_credential.username
115117
assert result[0]["download_url"] == self.program_user_credential.download_url
116118
assert result[0]["credential_id"] == self.program_user_credential.credential_id
117-
assert result[0]["credential_uuid"] == str(self.program_user_credential.credential.program_uuid).replace("-", "")
119+
assert result[0]["credential_uuid"] == str(self.program_user_credential.credential.program_uuid).replace(
120+
"-", ""
121+
)
118122
assert result[0]["credential_title"] == self.program_user_credential.credential.program.title
119123

120124
assert result[1]["uuid"] == str(self.program_user_credential2.uuid).replace("-", "")
121125
assert result[1]["status"] == self.program_user_credential2.status
122126
assert result[1]["username"] == self.program_user_credential2.username
123127
assert result[1]["download_url"] == self.program_user_credential2.download_url
124128
assert result[1]["credential_id"] == self.program_user_credential2.credential_id
125-
assert result[1]["credential_uuid"] == str(self.program_user_credential2.credential.program_uuid).replace("-", "")
129+
assert result[1]["credential_uuid"] == str(self.program_user_credential2.credential.program_uuid).replace(
130+
"-", ""
131+
)
126132
assert result[1]["credential_title"] == self.program_user_credential2.credential.program.title
127133

128134
def test_get_user_course_credentials_data_zero_courses(self):
@@ -164,6 +170,7 @@ def test_non_existing_content_type(self):
164170
result = get_user_credentials_data(self.user.username, "non_existing_content_type")
165171
assert result == []
166172

173+
167174
class TestGenerateBase64QRCode(TestCase):
168175
def test_correct_output_format(self):
169176
result = generate_base64_qr_code("Test Text")

credentials/apps/verifiable_credentials/utils.py

Lines changed: 13 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -43,17 +43,19 @@ def get_user_credentials_data(username, model):
4343
credential_title = credential.credential.title
4444
credential_org = credential.credential.course_key.org
4545

46-
data.append({
47-
"uuid": credential.uuid.hex,
48-
"status": credential.status,
49-
"username": credential.username,
50-
"download_url": credential.download_url,
51-
"credential_id": credential.credential_id,
52-
"credential_uuid": credential_uuid ,
53-
"credential_title": credential_title,
54-
"credential_org": credential_org,
55-
"modified_date": credential.modified.date().isoformat(),
56-
})
46+
data.append(
47+
{
48+
"uuid": credential.uuid.hex,
49+
"status": credential.status,
50+
"username": credential.username,
51+
"download_url": credential.download_url,
52+
"credential_id": credential.credential_id,
53+
"credential_uuid": credential_uuid, # pylint: disable=possibly-used-before-assignment
54+
"credential_title": credential_title, # pylint: disable=possibly-used-before-assignment
55+
"credential_org": credential_org, # pylint: disable=possibly-used-before-assignment
56+
"modified_date": credential.modified.date().isoformat(),
57+
}
58+
)
5759

5860
return data
5961

0 commit comments

Comments
 (0)