ObjectIdField does not support int or invalid strings.

Author: WaVEV

django_mongodb/fields/auto.py

@@ -1,3 +1,5 @@
+from bson import ObjectId, errors
+from django.core import exceptions
 from django.db.models.fields import AutoField
 from django.utils.functional import cached_property
 
@@ -20,6 +22,21 @@ def deconstruct(self):
     def get_internal_type(self):
         return "ObjectIdAutoField"
 
+    def to_python(self, value):
+        if value is None or isinstance(value, int):
+            return value
+        try:
+            return ObjectId(value)
+        except (errors.InvalidId, TypeError):
+            try:
+                return int(value)
+            except (ValueError, TypeError):
+                raise exceptions.ValidationError(
+                    self.error_messages["invalid"],
+                    code="invalid",
+                    params={"value": value},
+                ) from None
+
     @cached_property
     def validators(self):
         # Avoid IntegerField validators inherited from AutoField.

django_mongodb/fields/objectid.py

@@ -32,21 +32,6 @@ def get_prep_value(self, value):
     def rel_db_type(self, connection):
         return "objectId"
 
-    def to_python(self, value):
-        if value is None or isinstance(value, int):
-            return value
-        try:
-            return ObjectId(value)
-        except (errors.InvalidId, TypeError):
-            try:
-                return int(value)
-            except (ValueError, TypeError):
-                raise exceptions.ValidationError(
-                    self.error_messages["invalid"],
-                    code="invalid",
-                    params={"value": value},
-                ) from None
-
 
 class ObjectIdField(ObjectIdMixin, Field):
     def get_internal_type(self):
@@ -57,3 +42,15 @@ def deconstruct(self):
         if path.startswith("django_mongodb.fields.objectid"):
             path = path.replace("django_mongodb.fields.objectid", "django_mongodb.fields")
         return name, path, args, kwargs
+
+    def to_python(self, value):
+        if value is None:
+            return value
+        try:
+            return ObjectId(value)
+        except (errors.InvalidId, TypeError):
+            raise exceptions.ValidationError(
+                self.error_messages["invalid"],
+                code="invalid",
+                params={"value": value},
+            ) from None