Merge pull request #1871 from OpenTechFund/enhancement/add_group_to_user_name_display

Add staff, reviewer and applicant group name to user name display on …

hypha/apply/activity/templatetags/activity_tags.py

@@ -15,7 +15,7 @@ register = template.Library()
 def display_author(activity, user):
     if isinstance(activity.related_object, Review) and activity.source.user == user:
         return 'Reviewer'
-    return activity.user
+    return activity.user.get_full_name_with_group()
 
 
 @register.filter

hypha/apply/funds/tests/test_models.py

@@ -247,7 +247,7 @@ class TestFormSubmission(TestCase):
         # Lead + applicant
         self.assertEqual(self.User.objects.count(), 2)
         new_user = self.User.objects.get(email=self.email)
-        self.assertEqual(new_user.get_full_name(), self.name)
+        self.assertEqual(new_user.full_name, self.name)
 
         self.assertEqual(ApplicationSubmission.objects.count(), 1)
         self.assertEqual(ApplicationSubmission.objects.first().user, new_user)

hypha/apply/users/models.py

@@ -115,6 +115,12 @@ class User(AbstractUser):
     def get_short_name(self):
         return self.email
 
+    def get_full_name_with_group(self):
+        is_apply_staff = f' ({STAFF_GROUP_NAME})' if self.is_apply_staff else ''
+        is_reviewer = f' ({REVIEWER_GROUP_NAME})' if self.is_reviewer else ''
+        is_applicant = f' ({APPLICANT_GROUP_NAME})' if self.is_applicant else ''
+        return f'{self.full_name.strip()}{is_apply_staff}{is_reviewer}{is_applicant}'
+
     @cached_property
     def roles(self):
         return list(self.groups.values_list('name', flat=True))