Add EncryptedObjectIdField + test

Author: aclark4life

django_mongodb_backend/fields/__init__.py

@@ -20,6 +20,7 @@
     EncryptedFloatField,
     EncryptedGenericIPAddressField,
     EncryptedIntegerField,
+    EncryptedObjectIdField,
     EncryptedPositiveBigIntegerField,
     EncryptedPositiveIntegerField,
     EncryptedPositiveSmallIntegerField,
@@ -54,6 +55,7 @@
     "EncryptedFloatField",
     "EncryptedGenericIPAddressField",
     "EncryptedIntegerField",
+    "EncryptedObjectIdField",
     "EncryptedPositiveBigIntegerField",
     "EncryptedPositiveIntegerField",
     "EncryptedPositiveSmallIntegerField",

django_mongodb_backend/fields/encryption.py

@@ -1,6 +1,7 @@
 from django.db import models
 
 from django_mongodb_backend.fields import ArrayField, EmbeddedModelArrayField, EmbeddedModelField
+from django_mongodb_backend.fields.objectid import ObjectIdField
 
 
 class EncryptedArrayField(ArrayField):
@@ -87,6 +88,10 @@ class EncryptedIntegerField(EncryptedFieldMixin, models.IntegerField):
     pass
 
 
+class EncryptedObjectIdField(EncryptedFieldMixin, ObjectIdField):
+    pass
+
+
 class EncryptedPositiveBigIntegerField(EncryptedFieldMixin, models.PositiveBigIntegerField):
     pass
 

tests/encryption_/models.py

@@ -17,6 +17,7 @@
     EncryptedFloatField,
     EncryptedGenericIPAddressField,
     EncryptedIntegerField,
+    EncryptedObjectIdField,
     EncryptedPositiveBigIntegerField,
     EncryptedPositiveIntegerField,
     EncryptedPositiveSmallIntegerField,
@@ -101,6 +102,10 @@ class GenericIPAddressModel(EncryptedTestModel):
     value = EncryptedGenericIPAddressField(queries={"queryType": "equality"})
 
 
+class ObjectIdModel(EncryptedTestModel):
+    value = EncryptedObjectIdField(queries={"queryType": "equality"})
+
+
 class TextModel(EncryptedTestModel):
     value = EncryptedTextField(queries={"queryType": "equality"})
 

tests/encryption_/test_fields.py

@@ -2,6 +2,8 @@
 import uuid
 from decimal import Decimal
 
+from bson import ObjectId
+
 from django_mongodb_backend.fields import EncryptedCharField
 
 from .models import (
@@ -21,6 +23,7 @@
     GenericIPAddressModel,
     IntegerModel,
     Movie,
+    ObjectIdModel,
     Patient,
     PatientRecord,
     PositiveBigIntegerModel,
@@ -74,15 +77,6 @@ def test_array(self):
         self.assertEqual(len(movie.cast), 2)
         self.assertEqual(movie.cast[0].name, "Actor One")
         self.assertEqual(movie.cast[1].name, "Actor Two")
-
-        # ======================================================================
-        # ERROR: test_array (encryption_.test_fields.EmbeddedModelArrayTests.test_array)
-        # ----------------------------------------------------------------------
-        # Traceback (most recent call last):
-        # …
-        #     self.assertIsInstance(data[field], Binary)
-        #                           ~~~~^^^^^^^
-        # TypeError: 'NoneType' object is not subscriptable
         # self.assertEncrypted(self.movie, "cast")
 
 
@@ -117,6 +111,9 @@ def test_email(self):
     def test_ip(self):
         self.assertEquality(GenericIPAddressModel, "192.168.0.1")
 
+    def test_objectid(self):
+        self.assertEquality(ObjectIdModel, ObjectId())
+
     def test_text(self):
         self.assertEquality(TextModel, "some text")