Skip to content

Commit 549bd3f

Browse files
committed
Fix assertions
1 parent 9eeb8eb commit 549bd3f

File tree

2 files changed

+9
-1
lines changed

2 files changed

+9
-1
lines changed

subscribers/models.py

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -54,7 +54,11 @@ class Subscriber(models.Model):
5454
)
5555

5656
def __str__(self):
57-
return f"{self.email} {f'#{self.phone_number}' if self.phone_number is not None else ''}"
57+
s = []
58+
if self.email: s.append(str(self.email))
59+
if self.phone_number: s.append(str(self.phone_number))
60+
61+
return " ".join(s)
5862

5963
@staticmethod
6064
def _filter_centers(centers, age_limit):

subscribers/tests/test_models.py

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -20,6 +20,9 @@ def setUp(self):
2020
self.subscriber2 = Subscriber.objects.create(
2121
phone_number="9999999999", district_id=1
2222
)
23+
self.subscriber3 = Subscriber.objects.create(
24+
email="[email protected]", phone_number="9999999999", pincode=222222, district_id=2
25+
)
2326

2427
self.test_centers = [
2528
{
@@ -149,6 +152,7 @@ def setUp(self):
149152
def test_str_method(self):
150153
self.assertEqual(str(self.subscriber1), "[email protected]")
151154
self.assertEqual(str(self.subscriber2), "+919999999999")
155+
self.assertEqual(str(self.subscriber3), "[email protected] +919999999999")
152156

153157
def test_filter_centers(self):
154158
filter_18 = Subscriber._filter_centers(self.parsed_test_centers, 18)

0 commit comments

Comments
 (0)