Merge pull request #2094 from IFRCGo/fix/per-document-upload

Add filter by per in per-document-upload
IFRCGo · Apr 26, 2024 · 510625e · 510625e
2 parents 0078da9 + fb577ac
commit 510625e
Show file tree

Hide file tree

Showing 2 changed files with 14 additions and 11 deletions.
diff --git a/per/migrations/0100_auto_20240130_0851.py b/per/migrations/0100_auto_20240130_0851.py
@@ -43,7 +43,7 @@ def migrate_component_to_question_group(apps, schema_editor):
             )
             if form_question_group.exists():
                 form_question_group_first = form_question_group.first()
-                question.question_group = form_question_group
+                question.question_group = form_question_group_first
                 question.save(update_fields=['question_group'])
                 question_count += 1
 

diff --git a/per/serializers.py b/per/serializers.py
@@ -1025,16 +1025,19 @@ class Meta:
 
     def validate(self, data):
         country = data['country']
-        user_document_count = PerDocumentUpload.objects.filter(
-            country=country,
-            created_by=self.context["request"].user
-        ).count()
-        if user_document_count > self.MAX_NUMBER_OF_DOCUMENTS:
-            raise serializers.ValidationError(
-                {
-                    "file": gettext("Can add utmost %s documents" % self.MAX_NUMBER_OF_DOCUMENTS)
-                }
-            )
+        per = data.get('per')
+        if per:
+            user_document_count = PerDocumentUpload.objects.filter(
+                country=country,
+                created_by=self.context["request"].user,
+                per=per
+            ).count()
+            if user_document_count > self.MAX_NUMBER_OF_DOCUMENTS:
+                raise serializers.ValidationError(
+                    {
+                        "file": gettext("Can add utmost %s documents" % self.MAX_NUMBER_OF_DOCUMENTS)
+                    }
+                )
         return data
 
     def validate_per(self, per):