suggestions

care/facility/api/serializers/file_upload.py

@@ -115,13 +115,10 @@ def check_permissions(file_type, associating_id, user, action="create"):  # noqa
                 msg = "No Permission"
                 raise Exception(msg)
             return sample.id
-        if (
-            file_type
-            in (
-                FileUpload.FileType.CLAIM.value,
-                FileUpload.FileType.COMMUNICATION.value,
-            )
-            or file_type == FileUpload.FileType.NOTES.value
+        if file_type in (
+            FileUpload.FileType.CLAIM.value,
+            FileUpload.FileType.COMMUNICATION.value,
+            FileUpload.FileType.NOTES.value,
         ):
             return associating_id
         msg = "Undefined File Type"

care/facility/api/serializers/patient.py

@@ -1,5 +1,3 @@
-import re
-
 from django.conf import settings
 from django.db import transaction
 from django.utils.timezone import now
@@ -504,12 +502,7 @@ class PatientNotesSerializer(serializers.ModelSerializer):
     files = serializers.SerializerMethodField()
     replies = ReplyToPatientNoteSerializer(many=True, read_only=True)
     parent_note_object = serializers.SerializerMethodField()
-    mentioned_users = serializers.SerializerMethodField()
-
-    def get_mentioned_users(self, obj):
-        mentioned_users = set(re.findall(r"@(\w+)", obj.note))
-        users = User.objects.filter(username__in=mentioned_users)
-        return UserBaseMinimumSerializer(users, many=True).data
+    mentioned_users = UserBaseMinimumSerializer(many=True, read_only=True)
 
     def get_parent_note_object(self, obj):
         parent_note = obj

care/facility/api/viewsets/patient.py

@@ -1,5 +1,4 @@
 import json
-import re
 from json import JSONDecodeError
 
 from django.conf import settings
@@ -1078,15 +1077,12 @@ def perform_create(self, serializer):
             generate_for_facility=True,
         ).generate()
 
-        mentioned_users = set(re.findall(r"@(\w+)", instance.note))
-        users = User.objects.filter(username__in=mentioned_users)
-
         NotificationGenerator(
             event=Notification.Event.PATIENT_NOTE_MENTIONED,
             caused_by=self.request.user,
             caused_object=instance.consultation,
             facility=patient.facility,
-            mentioned_users=users,
+            mentioned_users=instance.mentioned_users,
         ).generate()
 
         return instance

care/facility/models/patient.py

@@ -1,4 +1,5 @@
 import enum
+import re
 from datetime import date
 
 from dateutil.relativedelta import relativedelta
@@ -813,6 +814,11 @@ def get_related_consultation(self):
         # Remove once patient notes is made consultation specific.
         return self
 
+    @property
+    def mentioned_users(self):
+        usernames = set(re.findall(r"@(\w+)", self.note))
+        return User.objects.filter(username__in=usernames)
+
 
 class PatientNotesEdit(models.Model):
     patient_note = models.ForeignKey(