From f8fb2249686937bf2e073e659d3c168261ed4e7e Mon Sep 17 00:00:00 2001
From: shamoon <4887959+shamoon@users.noreply.github.com>
Date: Sat, 1 Mar 2025 22:15:58 -0800
Subject: [PATCH] Clean this up

---
 src/documents/consumer.py | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

diff --git a/src/documents/consumer.py b/src/documents/consumer.py
index c3df970f9..b92f6f135 100644
--- a/src/documents/consumer.py
+++ b/src/documents/consumer.py
@@ -809,15 +809,16 @@ class ConsumerPlugin(
             set_permissions_for_object(permissions=permissions, object=document)
 
         if self.metadata.custom_fields:
-            for field_id in self.metadata.custom_fields:
-                field = CustomField.objects.get(pk=field_id)
+            for field in CustomField.objects.filter(
+                id__in=self.metadata.custom_fields.keys(),
+            ).distinct():
                 value_field_name = CustomFieldInstance.get_value_field_name(
                     data_type=field.data_type,
                 )
                 args = {
                     "field": field,
                     "document": document,
-                    value_field_name: self.metadata.custom_fields[field_id],
+                    value_field_name: self.metadata.custom_fields.get(field.id, None),
                 }
                 CustomFieldInstance.objects.create(**args)  # adds to document