Move encrypted_fields_map to schema (1/2)

Author: aclark4life

django_mongodb_backend/fields/encryption.py

@@ -2,6 +2,4 @@
 
 
 class EncryptedCharField(models.CharField):
-    def __init__(self, *args, **kwargs):
-        super().__init__(*args, **kwargs)
-        self.encrypted = True
+    encrypted = True

django_mongodb_backend/models.py

@@ -16,24 +16,8 @@ def save(self, *args, **kwargs):
         raise NotSupportedError("EmbeddedModels cannot be saved.")
 
 
-class EncryptedModelBase(models.base.ModelBase):
-    def __new__(cls, name, bases, attrs, **kwargs):
-        new_class = super().__new__(cls, name, bases, attrs, **kwargs)
+class EncryptedModel(models.Model):
+    encrypted = True
 
-        # Build a map of encrypted fields
-        encrypted_fields = {
-            "fields": {
-                field.name: field.__class__.__name__
-                for field in new_class._meta.fields
-                if getattr(field, "encrypted", False)
-            }
-        }
-
-        # Store it as a class-level attribute
-        new_class.encrypted_fields_map = encrypted_fields
-        return new_class
-
-
-class EncryptedModel(models.Model, metaclass=EncryptedModelBase):
     class Meta:
         abstract = True

django_mongodb_backend/schema.py

@@ -424,7 +424,7 @@ def _create_collection(self, model):
         Create a collection or encrypted collection for the model.
         """
 
-        if hasattr(model, "encrypted_fields_map"):
+        if hasattr(model, "encrypted"):
             auto_encryption_opts = self.connection.settings_dict.get("OPTIONS", {}).get(
                 "auto_encryption_opts"
             )
@@ -433,7 +433,7 @@ def _create_collection(self, model):
             client_encryption.create_encrypted_collection(
                 client.database,
                 model._meta.db_table,
-                model.encrypted_fields_map,
+                {"fields": []},
                 "local",  # TODO: KMS provider should be configurable
             )
         else: