django-bulk-hooks 0.1.244__tar.gz → 0.1.245__tar.gz

{django_bulk_hooks-0.1.244 → django_bulk_hooks-0.1.245}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: django-bulk-hooks
-Version: 0.1.244
+Version: 0.1.245
 Summary: Hook-style hooks for Django bulk operations like bulk_create and bulk_update.
 Home-page: https://github.com/AugendLimited/django-bulk-hooks
 License: MIT

{django_bulk_hooks-0.1.244 → django_bulk_hooks-0.1.245}/django_bulk_hooks/queryset.py

@@ -172,14 +172,21 @@ class HookQuerySetMixin:
             logger.debug("update: running hooks with Salesforce-style behavior")
             ctx = HookContext(model_cls, bypass_hooks=False)
 
-            # Run validation hooks first
-            engine.run(model_cls, VALIDATE_UPDATE, instances, originals, ctx=ctx)
-            # Then run BEFORE_UPDATE hooks
-            engine.run(model_cls, BEFORE_UPDATE, instances, originals, ctx=ctx)
+            # For Subquery updates, we need to run hooks AFTER the database update and refresh
+            # For non-Subquery updates, we can run hooks before the database update as usual
+            if not has_subquery:
+                # Run validation hooks first
+                engine.run(model_cls, VALIDATE_UPDATE, instances, originals, ctx=ctx)
+                # Then run BEFORE_UPDATE hooks
+                engine.run(model_cls, BEFORE_UPDATE, instances, originals, ctx=ctx)
 
             # Persist any additional field mutations made by BEFORE_UPDATE hooks.
             # Build CASE statements per modified field not already present in kwargs.
-            modified_fields = self._detect_modified_fields(instances, originals)
+            modified_fields = (
+                self._detect_modified_fields(instances, originals)
+                if not has_subquery
+                else set()
+            )
             extra_fields = [f for f in modified_fields if f not in kwargs]
             if extra_fields:
                 case_statements = {}
@@ -377,7 +384,11 @@ class HookQuerySetMixin:
             raise
 
         # If we used Subquery objects, refresh the instances to get computed values
-        if has_subquery and instances:
+        # and then run hooks so HasChanged conditions work correctly
+        if has_subquery and instances and not current_bypass_hooks:
+            logger.debug(
+                "Refreshing instances with Subquery computed values before running hooks"
+            )
             # Simple refresh of model fields without fetching related objects
             # Subquery updates only affect the model's own fields, not relationships
             refreshed_instances = {
@@ -397,6 +408,13 @@ class HookQuerySetMixin:
                                 getattr(refreshed_instance, field.name),
                             )
 
+            # Now run the hooks with the refreshed instances containing computed values
+            logger.debug("Running hooks after Subquery refresh")
+            # Run validation hooks first
+            engine.run(model_cls, VALIDATE_UPDATE, instances, originals, ctx=ctx)
+            # Then run BEFORE_UPDATE hooks
+            engine.run(model_cls, BEFORE_UPDATE, instances, originals, ctx=ctx)
+
         # Salesforce-style: Always run AFTER_UPDATE hooks unless explicitly bypassed
         if not current_bypass_hooks:
             logger.debug("update: running AFTER_UPDATE")

{django_bulk_hooks-0.1.244 → django_bulk_hooks-0.1.245}/pyproject.toml

@@ -1,6 +1,6 @@
 [tool.poetry]
 name = "django-bulk-hooks"
-version = "0.1.244"
+version = "0.1.245"
 description = "Hook-style hooks for Django bulk operations like bulk_create and bulk_update."
 authors = ["Konrad Beck <konrad.beck@merchantcapital.co.za>"]
 readme = "README.md"