remove duplicate files and merge migrations

ohcnetwork · Oct 1, 2024 · db40d12 · db40d12
1 parent abf0351
commit db40d12
Show file tree

Hide file tree

Showing 12 changed files with 26 additions and 150 deletions.
diff --git a/care/facility/api/serializers/patient.py b/care/facility/api/serializers/patient.py
@@ -508,7 +508,7 @@ class PatientNotesSerializer(serializers.ModelSerializer):
     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(user).data for user in users]
+        return UserBaseMinimumSerializer(users, many=True).data
 
     def get_parent_note_object(self, obj):
         parent_note = obj

diff --git a/care/facility/api/viewsets/patient.py b/care/facility/api/viewsets/patient.py
@@ -1133,9 +1133,9 @@ class PatientNotesForConsultationViewSet(
     def get_queryset(self):
         consultation_external_id = self.kwargs["consultation_external_id"]
 
-        patient_notes_external_ids = list(PatientNotes.objects.filter(
+        patient_notes_external_ids = PatientNotes.objects.filter(
             consultation__external_id=consultation_external_id
-        ).values_list('external_id', flat=True))
+        ).values_list('external_id', flat=True)
 
         return self.queryset.filter(
             associating_id__in=patient_notes_external_ids,

diff --git a/care/facility/migrations/0444_patientnotes_reply_to.py b/care/facility/migrations/0444_patientnotes_reply_to.py
diff --git a/care/facility/migrations/0445_alter_fileupload_file_type.py b/care/facility/migrations/0445_alter_fileupload_file_type.py
diff --git a/care/facility/migrations/0446_merge_20240709_1859.py b/care/facility/migrations/0446_merge_20240709_1859.py
diff --git a/care/facility/migrations/0448_merge_20240821_0345.py b/care/facility/migrations/0448_merge_20240821_0345.py
diff --git a/care/facility/migrations/0449_alter_notification_event.py b/care/facility/migrations/0449_alter_notification_event.py
diff --git a/care/facility/migrations/0466_alter_fileupload_file_type_alter_notification_event.py b/care/facility/migrations/0466_alter_fileupload_file_type_alter_notification_event.py
@@ -0,0 +1,23 @@
+# Generated by Django 5.1.1 on 2024-10-01 21:58
+
+from django.db import migrations, models
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ('facility', '0465_merge_20240923_1045'),
+    ]
+
+    operations = [
+        migrations.AlterField(
+            model_name='fileupload',
+            name='file_type',
+            field=models.IntegerField(choices=[(0, 'OTHER'), (1, 'PATIENT'), (2, 'CONSULTATION'), (3, 'SAMPLE_MANAGEMENT'), (4, 'CLAIM'), (5, 'DISCHARGE_SUMMARY'), (6, 'COMMUNICATION'), (7, 'CONSENT_RECORD'), (8, 'ABDM_HEALTH_INFORMATION'), (9, 'NOTES')], default=1),
+        ),
+        migrations.AlterField(
+            model_name='notification',
+            name='event',
+            field=models.IntegerField(choices=[(0, 'MESSAGE'), (20, 'PATIENT_CREATED'), (30, 'PATIENT_UPDATED'), (40, 'PATIENT_DELETED'), (50, 'PATIENT_CONSULTATION_CREATED'), (60, 'PATIENT_CONSULTATION_UPDATED'), (70, 'PATIENT_CONSULTATION_DELETED'), (80, 'INVESTIGATION_SESSION_CREATED'), (90, 'INVESTIGATION_UPDATED'), (100, 'PATIENT_FILE_UPLOAD_CREATED'), (110, 'CONSULTATION_FILE_UPLOAD_CREATED'), (120, 'PATIENT_CONSULTATION_UPDATE_CREATED'), (130, 'PATIENT_CONSULTATION_UPDATE_UPDATED'), (140, 'PATIENT_CONSULTATION_ASSIGNMENT'), (200, 'SHIFTING_UPDATED'), (210, 'PATIENT_NOTE_ADDED'), (220, 'PUSH_MESSAGE'), (230, 'PATIENT_PRESCRIPTION_CREATED'), (240, 'PATIENT_PRESCRIPTION_UPDATED'), (250, 'PATIENT_NOTE_MENTIONED')], default=0),
+        ),
+    ]
diff --git a/care/users/api/serializers/user.py b/care/users/api/serializers/user.py
@@ -1,4 +1,3 @@
-import boto3
 from django.contrib.auth.hashers import make_password
 from django.db import transaction
 from django.utils.timezone import now
@@ -13,7 +12,6 @@
 )
 from care.users.api.serializers.skill import UserSkillSerializer
 from care.users.models import GENDER_CHOICES, User
-from care.utils.csp.config import BucketType, get_client_config
 from care.utils.file_uploads.cover_image import upload_cover_image
 from care.utils.models.validators import (
     cover_image_validator,

diff --git a/care/users/api/viewsets/users.py b/care/users/api/viewsets/users.py
@@ -374,7 +374,6 @@ def check_availability(self, request, username):
             return Response(status=status.HTTP_409_CONFLICT)
         return Response(status=status.HTTP_200_OK)
 
-
     def has_profile_image_write_permission(self, request, user):
         return request.user.is_superuser or (user.id == request.user.id)
 

diff --git a/care/users/migrations/0017_user_profile_picture_url.py b/care/users/migrations/0017_user_profile_picture_url.py
diff --git a/care/users/tests/test_api.py b/care/users/tests/test_api.py
@@ -49,7 +49,6 @@ def get_detail_representation(self, obj=None) -> dict:
             "qualification": obj.qualification,
             "weekly_working_hours": obj.weekly_working_hours,
             "video_connect_link": obj.video_connect_link,
-            "profile_picture_url": obj.profile_picture_url,
             "read_profile_picture_url": obj.profile_picture_url,
             "user_flags": [],
             **self.get_local_body_district_state_representation(obj),