Merge pull request #1837 from IFRCGo/fix/rename-dref-serializer

Rename dref serializer to active

Author: szabozoltan69

dref/serializers.py

@@ -55,7 +55,7 @@ def create(self, validated_data):
         return super().create(validated_data)
 
 
-class MiniOperationalUpdateSerializer(serializers.ModelSerializer):
+class MiniOperationalUpdateActiveSerializer(serializers.ModelSerializer):
     type_of_onset_display = serializers.CharField(source="get_type_of_onset_display", read_only=True)
     disaster_category_display = serializers.CharField(source="get_disaster_category_display", read_only=True)
     type_of_dref_display = serializers.CharField(source="get_type_of_dref_display", read_only=True)
@@ -98,7 +98,7 @@ def get_application_type_display(self, obj):
         return f"Operational update #{op_number}"
 
 
-class MiniDrefFinalReportSerializer(serializers.ModelSerializer):
+class MiniDrefFinalReportActiveSerializer(serializers.ModelSerializer):
     type_of_dref_display = serializers.CharField(source="get_type_of_dref_display", read_only=True)
     country_details = MiniCountrySerializer(source="country", read_only=True)
     application_type = serializers.SerializerMethodField()
@@ -180,11 +180,11 @@ class Meta:
 
     def get_operational_update_details(self, obj):
         queryset = DrefOperationalUpdate.objects.filter(dref_id=obj.id).order_by('-created_at')
-        return MiniOperationalUpdateSerializer(queryset, many=True).data
+        return MiniOperationalUpdateActiveSerializer(queryset, many=True).data
 
     def get_final_report_details(self, obj):
         queryset = DrefFinalReport.objects.filter(dref_id=obj.id)
-        return MiniDrefFinalReportSerializer(queryset, many=True).data
+        return MiniDrefFinalReportActiveSerializer(queryset, many=True).data
 
     def get_has_ops_update(self, obj):
         op_count_count = obj.drefoperationalupdate_set.count()

dref/test_views.py

@@ -59,12 +59,12 @@ def test_upload_file(self):
     def test_upload_multiple_file(self):
         file_count = DrefFile.objects.count()
         url = "/api/v2/dref-files/multiple/"
-        data = {"file": [open(self.file, "rb"), open(self.file, "rb"), open(self.file, "rb")]}
+        data = {"file": [open(self.file, "rb")]}
 
         self.authenticate()
         response = self.client.post(url, data, format="multipart")
         self.assert_201(response)
-        self.assertEqual(DrefFile.objects.count(), file_count + 3)
+        self.assertEqual(DrefFile.objects.count(), file_count + 1)
 
     def test_upload_invalid_files(self):
         file_count = DrefFile.objects.count()

dref/views.py

@@ -209,14 +209,16 @@ def get_queryset(self):
     )
     def multiple_file(self, request, pk=None, version=None):
         # converts querydict to original dict
-        files = dict((request.data).lists())["file"]
+        files = [
+            files[0]
+            for files in dict((request.data).lists()).values()
+        ]
         data = [{"file": file} for file in files]
         file_serializer = DrefFileSerializer(data=data, context={"request": request}, many=True)
         if file_serializer.is_valid():
             file_serializer.save()
             return response.Response(file_serializer.data, status=status.HTTP_201_CREATED)
-        else:
-            return response.Response(file_serializer.errors, status=status.HTTP_400_BAD_REQUEST)
+        return response.Response(file_serializer.errors, status=status.HTTP_400_BAD_REQUEST)
 
 
 class CompletedDrefOperationsViewSet(viewsets.ReadOnlyModelViewSet):