django-bulk-hooks 0.1.236__tar.gz → 0.1.237__tar.gz

{django_bulk_hooks-0.1.236 → django_bulk_hooks-0.1.237}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: django-bulk-hooks
-Version: 0.1.236
+Version: 0.1.237
 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.236 → django_bulk_hooks-0.1.237}/django_bulk_hooks/queryset.py

@@ -1,4 +1,5 @@
 import logging
+
 from django.db import models, transaction
 from django.db.models import AutoField, Case, Field, Value, When
 
@@ -16,8 +17,8 @@ from django_bulk_hooks.constants import (
     VALIDATE_DELETE,
     VALIDATE_UPDATE,
 )
-from django_bulk_hooks.context import HookContext
 from django_bulk_hooks.context import (
+    HookContext,
     get_bulk_update_value_map,
     set_bulk_update_value_map,
 )
@@ -87,8 +88,9 @@ class HookQuerySetMixin:
 
         # Check if we're in a bulk operation context to prevent double hook execution
         from django_bulk_hooks.context import get_bypass_hooks
+
         current_bypass_hooks = get_bypass_hooks()
-        
+
         # If we're in a bulk operation context, skip hooks to prevent double execution
         if current_bypass_hooks:
             logger.debug("update: skipping hooks (bulk context)")
@@ -101,6 +103,44 @@ class HookQuerySetMixin:
             # 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)
+            extra_fields = [f for f in modified_fields if f not in kwargs]
+            if extra_fields:
+                case_statements = {}
+                for field_name in extra_fields:
+                    try:
+                        field_obj = model_cls._meta.get_field(field_name)
+                    except Exception:
+                        # Skip unknown fields
+                        continue
+
+                    when_statements = []
+                    for obj in instances:
+                        obj_pk = getattr(obj, "pk", None)
+                        if obj_pk is None:
+                            continue
+                        value = getattr(obj, field_name)
+                        # Normalize relation values to instance or pk consistently
+                        if getattr(field_obj, "is_relation", False):
+                            # If a model instance is provided, use it; else use as-is
+                            # Value() with output_field handles conversion
+                            pass
+
+                        when_statements.append(
+                            When(pk=obj_pk, then=Value(value, output_field=field_obj))
+                        )
+
+                    if when_statements:
+                        case_statements[field_name] = Case(
+                            *when_statements, output_field=field_obj
+                        )
+
+                # Merge extra CASE updates into kwargs for DB update
+                if case_statements:
+                    kwargs = {**kwargs, **case_statements}
+
         # Use Django's built-in update logic directly
         # Call the base QuerySet implementation to avoid recursion
         update_count = super().update(**kwargs)
@@ -190,12 +230,12 @@ class HookQuerySetMixin:
 
         # Fire hooks before DB ops
         if not bypass_hooks:
-            ctx = HookContext(model_cls, bypass_hooks=False) # Pass bypass_hooks
+            ctx = HookContext(model_cls, bypass_hooks=False)  # Pass bypass_hooks
             if not bypass_validation:
                 engine.run(model_cls, VALIDATE_CREATE, objs, ctx=ctx)
             engine.run(model_cls, BEFORE_CREATE, objs, ctx=ctx)
         else:
-            ctx = HookContext(model_cls, bypass_hooks=True) # Pass bypass_hooks
+            ctx = HookContext(model_cls, bypass_hooks=True)  # Pass bypass_hooks
             logger.debug("bulk_create bypassed hooks")
 
         # For MTI models, we need to handle them specially
@@ -251,7 +291,9 @@ class HookQuerySetMixin:
                 f"bulk_update expected instances of {model_cls.__name__}, but got {set(type(obj).__name__ for obj in objs)}"
             )
 
-        logger.debug(f"bulk_update {model_cls.__name__} bypass_hooks={bypass_hooks} objs={len(objs)}")
+        logger.debug(
+            f"bulk_update {model_cls.__name__} bypass_hooks={bypass_hooks} objs={len(objs)}"
+        )
 
         # Check for MTI
         is_mti = False
@@ -267,7 +309,9 @@ class HookQuerySetMixin:
         else:
             logger.debug("bulk_update: hooks bypassed")
             ctx = HookContext(model_cls, bypass_hooks=True)
-            originals = [None] * len(objs)  # Ensure originals is defined for after_update call
+            originals = [None] * len(
+                objs
+            )  # Ensure originals is defined for after_update call
 
         # Handle auto_now fields like Django's update_or_create does
         fields_set = set(fields)
@@ -345,18 +389,16 @@ class HookQuerySetMixin:
                 if field.name == "id":
                     continue
 
-                new_value = getattr(new_instance, field.name)
-                original_value = getattr(original, field.name)
-
                 # Handle different field types appropriately
                 if field.is_relation:
-                    # For foreign keys, compare the pk values
-                    new_pk = new_value.pk if new_value else None
-                    original_pk = original_value.pk if original_value else None
+                    # Compare by raw id values to catch cases where only <fk>_id was set
+                    new_pk = getattr(new_instance, field.attname, None)
+                    original_pk = getattr(original, field.attname, None)
                     if new_pk != original_pk:
                         modified_fields.add(field.name)
                 else:
-                    # For regular fields, use direct comparison
+                    new_value = getattr(new_instance, field.name)
+                    original_value = getattr(original, field.name)
                     if new_value != original_value:
                         modified_fields.add(field.name)
 

{django_bulk_hooks-0.1.236 → django_bulk_hooks-0.1.237}/pyproject.toml

@@ -1,6 +1,6 @@
 [tool.poetry]
 name = "django-bulk-hooks"
-version = "0.1.236"
+version = "0.1.237"
 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"