Code review updates

Author: aclark4life

django_mongodb_backend/fields/encryption.py

@@ -99,11 +99,11 @@ class EncryptedSmallIntegerField(EncryptedFieldMixin, models.SmallIntegerField):
     pass
 
 
-class EncryptedTimeField(EncryptedFieldMixin, models.TimeField):
+class EncryptedTextField(EncryptedFieldMixin, models.TextField):
     pass
 
 
-class EncryptedTextField(EncryptedFieldMixin, models.TextField):
+class EncryptedTimeField(EncryptedFieldMixin, models.TimeField):
     pass
 
 

django_mongodb_backend/schema.py

@@ -471,19 +471,8 @@ def _create_collection(self, model):
                     f"Encrypted fields found but DATABASES['{self.connection.alias}']['OPTIONS'] "
                     "is missing auto_encryption_opts."
                 )
-
-            encrypted_fields_map = getattr(auto_encryption_opts, "_encrypted_fields_map", None)
-
-            if not encrypted_fields_map:
-                encrypted_fields = self._get_encrypted_fields(model)
-            else:
-                encrypted_fields = encrypted_fields_map.get(db_table)
-
-            if encrypted_fields:
-                db.create_collection(db_table, encryptedFields=encrypted_fields)
-            else:
-                db.create_collection(db_table)
-
+            encrypted_fields = self._get_encrypted_fields(model)
+            db.create_collection(db_table, encryptedFields=encrypted_fields)
         else:
             # Unencrypted path
             db.create_collection(db_table)

tests/encryption_/test_fields.py

@@ -57,9 +57,10 @@ def setUp(self):
         )
 
     def test_array(self):
-        self.assertEqual(len(self.movie.cast), 2)
-        self.assertEqual(self.movie.cast[0].name, "Actor One")
-        self.assertEqual(self.movie.cast[1].name, "Actor Two")
+        movie = Movie.objects.get(id=self.movie.id)
+        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)