Fix bulk_create without tenant context

easy_tenants/models.py

@@ -37,8 +37,9 @@ def get_queryset(self):
     def bulk_create(self, objs, *args, **kwargs):
         tenant = get_current_tenant()
 
-        for obj in objs:
-            setattr(obj, field_name, tenant)
+        if tenant:
+            for obj in objs:
+                setattr(obj, field_name, tenant)
 
         return super().bulk_create(objs, *args, **kwargs)
 

tests/settings.py

@@ -50,3 +50,5 @@
 
 EASY_TENANTS_TENANT_FIELD = "store"
 EASY_TENANTS_TENANT_MODEL = "tests.StoreTenant"
+
+USE_TZ = True

tests/test_model.py

@@ -52,6 +52,23 @@ def test_bulk_create(tenant_ctx):
     assert objs[1].get_tenant_instance() == tenant
 
 
+@pytest.mark.django_db
+def test_bulk_create_without_context():
+    store1 = StoreTenant.objects.create()
+    store2 = StoreTenant.objects.create()
+
+    objs = [
+        Product(name="prod1", store=store1),
+        Product(name="prod2", store=store2),
+    ]
+    with tenant_context_disabled():
+        objs = Product.objects.bulk_create(objs)
+
+        assert Product.objects.count() == 2
+        assert objs[0].get_tenant_instance() == store1
+        assert objs[1].get_tenant_instance() == store2
+
+
 def test_all_objects(db):
     store1 = StoreTenant.objects.create()
     store2 = StoreTenant.objects.create()