elody 0.0.225__tar.gz → 0.0.226__tar.gz

{elody-0.0.225 → elody-0.0.226}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: elody
-Version: 0.0.225
+Version: 0.0.226
 Summary: elody SDK for Python
 Author-email: Inuits <developers@inuits.eu>
 License:                     GNU GENERAL PUBLIC LICENSE

{elody-0.0.225 → elody-0.0.226}/pyproject.toml

@@ -6,7 +6,7 @@ build-backend = "setuptools.build_meta"
 
 [project]
 name = "elody"
-version = "0.0.225"
+version = "0.0.226"
 description = "elody SDK for Python"
 readme = "README.md"
 authors = [{ name = "Inuits", email = "developers@inuits.eu" }]

{elody-0.0.225 → elody-0.0.226}/src/elody/error_codes.py

@@ -76,7 +76,7 @@ class ErrorCode(Enum):
     INVALID_VALUE = ("5016", ["value", "options", "line_number"])
     ITEM_WITH_VALUE_FOR_KEY_NOT_FOUND = ("5017", ["key", "value", "line_number"])
     ITEM_WITH_VALUE_FOR_KEY_NOT_UNIQUE = ("5018", ["key", "value", "line_number"])
-    DUPLICATE_ENTRY_LINKED_ENTITIES = ("W5018", ["entity_type", "duplicate_entry"])
+    DUPLICATE_ENTRY_LINKED_ENTITIES = ("5018", ["entity_type", "duplicate_entry"])
 
     # Filter error codes
     NO_MATCHER_FOR_FILTER_REQUEST = ("6001", [])

{elody-0.0.225 → elody-0.0.226}/src/elody/policies/helpers.py

@@ -9,18 +9,18 @@ def generate_filter_key_and_lookup_from_restricted_key(key):
     if (keys := key.split("@", 1)) and len(keys) == 1:
         return key, {}
 
-    local_field = keys[0]
     document_type, key = keys[1].split("-", 1)
     collection = (
         get_object_configuration_mapper().get(document_type).crud()["collection"]
     )
+    local_field, lookup_prefix = parse_optional_filter_key(keys[0])
     lookup = {
         "from": collection,
         "local_field": local_field,
         "foreign_field": "identifiers",
         "as": f"__lookup.virtual_relations.{document_type}",
     }
-    return f"{lookup['as']}.{key}", lookup
+    return f"{lookup_prefix}{lookup['as']}.{key}", lookup
 
 
 def get_content(item, request, content):
@@ -62,3 +62,14 @@ def get_item(storage_manager, user_context_bag, view_args) -> dict:
     raise NotFound(
         f"{get_error_code(ErrorCode.ITEM_NOT_FOUND, get_read())} | id:{id} - Item with id {id} does not exist."
     )
+
+
+def parse_optional_filter_key(key):
+    prefix = ""
+    if key[0] == "!":
+        key = key[1:]
+        prefix += "!"
+    if key[0] == "?":
+        key = key[1:]
+        prefix += "?"
+    return key, prefix

{elody-0.0.225 → elody-0.0.226}/src/elody/policies/permission_handler.py

@@ -4,9 +4,11 @@ from copy import deepcopy
 from elody.error_codes import ErrorCode, get_error_code, get_read
 from elody.policies.helpers import get_flat_item_and_object_lists, get_item
 from elody.util import flatten_dict, interpret_flat_key
+from flask import g
 from inuits_policy_based_auth.contexts.user_context import UserContext
 from logging_elody.log import log  # pyright: ignore
 from storage.storagemanager import StorageManager  # pyright: ignore
+from werkzeug.exceptions import NotFound
 
 
 _permissions = {}
@@ -260,11 +262,16 @@ def __item_value_in_values(
         if key_of_relation:
             if isinstance(item_value, list):
                 item_value = item_value[0]
-            item = get_item(
-                StorageManager(),
-                user_context.bag,
-                {"type": keys[1].split("-", 1)[0], "id": item_value},
-            )
+            try:
+                item = get_item(
+                    StorageManager(),
+                    user_context.bag,
+                    {"type": keys[1].split("-", 1)[0], "id": item_value},
+                )
+            except NotFound as exception:
+                if g.get("dry_run") or is_optional:
+                    return True
+                raise exception
             flat_item, _ = get_flat_item_and_object_lists(item)
             return __item_value_in_values(
                 flat_item, key_of_relation, values, flat_request_body, user_context

{elody-0.0.225 → elody-0.0.226}/src/elody.egg-info/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: elody
-Version: 0.0.225
+Version: 0.0.226
 Summary: elody SDK for Python
 Author-email: Inuits <developers@inuits.eu>
 License:                     GNU GENERAL PUBLIC LICENSE