Fix getting chul name. Just return firstname if lastname is null.

MasterFacilityList · Feb 24, 2016 · 477ffec · 477ffec
1 parent c655db3
commit 477ffec
Show file tree

Hide file tree

Showing 2 changed files with 13 additions and 1 deletion.
diff --git a/chul/models.py b/chul/models.py
@@ -280,7 +280,10 @@ def __str__(self):
 
     @property
     def name(self):
-        return "{} {}".format(self.first_name, self.last_name).strip()
+        if self.first_name and self.last_name:
+            return "{} {}".format(self.first_name, self.last_name).strip()
+        else:
+            return self.first_name
 
 
 @reversion.register

diff --git a/chul/tests/test_models.py b/chul/tests/test_models.py
@@ -191,6 +191,15 @@ def test_save(self):
         mommy.make(CommunityHealthWorker)
         self.assertEquals(1, CommunityHealthWorker.objects.count())
 
+    def test_name(self):
+        worker = mommy.make(CommunityHealthWorker,
+            first_name='Test', last_name='Test')
+        self.assertEquals('Test Test', worker.name)
+
+        worker = mommy.make(CommunityHealthWorker,
+            first_name='Test', last_name=None)
+        self.assertEquals('Test', worker.name)
+
 
 class TestCommunityHealthWorkerContact(TestCase):