GeneralManager 0.20.0__tar.gz → 0.20.1__tar.gz

{generalmanager-0.20.0/src/GeneralManager.egg-info → generalmanager-0.20.1}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: GeneralManager
-Version: 0.20.0
+Version: 0.20.1
 Summary: Modular Django-based data management framework with ORM, GraphQL, fine-grained permissions, rule validation, calculations and caching.
 Author-email: Tim Kleindick <tkleindick@yahoo.de>
 License: MIT License

{generalmanager-0.20.0 → generalmanager-0.20.1}/pyproject.toml

@@ -4,7 +4,7 @@ build-backend = "setuptools.build_meta"
 
 [project]
 name = "GeneralManager"
-version = "0.20.0"
+version = "0.20.1"
 description = "Modular Django-based data management framework with ORM, GraphQL, fine-grained permissions, rule validation, calculations and caching."
 readme = "README.md"
 authors = [{ name = "Tim Kleindick", email = "tkleindick@yahoo.de" }]

{generalmanager-0.20.0 → generalmanager-0.20.1/src/GeneralManager.egg-info}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: GeneralManager
-Version: 0.20.0
+Version: 0.20.1
 Summary: Modular Django-based data management framework with ORM, GraphQL, fine-grained permissions, rule validation, calculations and caching.
 Author-email: Tim Kleindick <tkleindick@yahoo.de>
 License: MIT License

{generalmanager-0.20.0 → generalmanager-0.20.1}/src/general_manager/interface/read_only_interface.py

@@ -6,7 +6,7 @@ import json
 from typing import TYPE_CHECKING, Any, Callable, ClassVar, Type, cast
 
 from django.core.checks import Warning
-from django.db import connection, models, transaction
+from django.db import connection, models, transaction, IntegrityError
 
 from general_manager.interface.database_based_interface import (
     DBBasedInterface,
@@ -159,6 +159,7 @@ class ReadOnlyInterface(DBBasedInterface[GeneralManagerBasisModel]):
         data_list = cast(list[dict[str, Any]], parsed_data)
 
         unique_fields = cls.get_unique_fields(model)
+        unique_field_order = tuple(sorted(unique_fields))
         if not unique_fields:
             raise MissingUniqueFieldError(parent_class.__name__)
 
@@ -168,29 +169,43 @@ class ReadOnlyInterface(DBBasedInterface[GeneralManagerBasisModel]):
             "deactivated": [],
         }
 
+        editable_fields = {
+            f.name
+            for f in model._meta.local_fields
+            if getattr(f, "editable", True) and not getattr(f, "primary_key", False)
+        } - {"is_active"}
+
         with transaction.atomic():
-            json_unique_values: set[Any] = set()
+            json_unique_values: set[tuple[Any, ...]] = set()
 
             # data synchronization
             for idx, data in enumerate(data_list):
                 try:
-                    lookup = {field: data[field] for field in unique_fields}
+                    lookup = {field: data[field] for field in unique_field_order}
                 except KeyError as e:
                     missing = e.args[0]
                     raise InvalidReadOnlyDataFormatError() from KeyError(
                         f"Item {idx} missing unique field '{missing}'."
                     )
-                unique_identifier = tuple(lookup[field] for field in unique_fields)
+                unique_identifier = tuple(lookup[field] for field in unique_field_order)
                 json_unique_values.add(unique_identifier)
-
-                instance, is_created = model.objects.get_or_create(**lookup)
+                instance = model.objects.filter(**lookup).first()
+                is_created = False
+                if instance is None:
+                    # sanitize input and create with race-safety
+                    allowed_fields = {f.name for f in model._meta.local_fields}
+                    create_kwargs = {
+                        k: v for k, v in data.items() if k in allowed_fields
+                    }
+                    try:
+                        instance = model.objects.create(**create_kwargs)
+                        is_created = True
+                    except IntegrityError:
+                        # created concurrently — fetch it
+                        instance = model.objects.filter(**lookup).first()
+                        if instance is None:
+                            raise
                 updated = False
-                editable_fields = {
-                    f.name
-                    for f in model._meta.local_fields
-                    if getattr(f, "editable", True)
-                    and not getattr(f, "primary_key", False)
-                } - {"is_active"}
                 for field_name in editable_fields.intersection(data.keys()):
                     value = data[field_name]
                     if getattr(instance, field_name, None) != value:
@@ -204,8 +219,10 @@ class ReadOnlyInterface(DBBasedInterface[GeneralManagerBasisModel]):
             # deactivate instances not in JSON data
             existing_instances = model.objects.filter(is_active=True)
             for instance in existing_instances:
-                lookup = {field: getattr(instance, field) for field in unique_fields}
-                unique_identifier = tuple(lookup[field] for field in unique_fields)
+                lookup = {
+                    field: getattr(instance, field) for field in unique_field_order
+                }
+                unique_identifier = tuple(lookup[field] for field in unique_field_order)
                 if unique_identifier not in json_unique_values:
                     instance.is_active = False
                     instance.save()