elody 0.0.213__tar.gz → 0.0.215__tar.gz

{elody-0.0.213 → elody-0.0.215}/PKG-INFO

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

{elody-0.0.213 → elody-0.0.215}/pyproject.toml

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

{elody-0.0.213 → elody-0.0.215}/src/elody/object_configurations/elody_configuration.py

@@ -1,3 +1,4 @@
+from copy import deepcopy
 from datetime import datetime, timezone
 from elody.object_configurations.base_object_configuration import (
     BaseObjectConfiguration,
@@ -158,6 +159,9 @@ class ElodyConfiguration(BaseObjectConfiguration):
                 lines = value.splitlines()
                 value = "\n".join(line.strip() for line in lines).strip()
                 element[object_list_value_field_name] = value.strip()
+            for key, value in deepcopy(element).items():
+                if not value:
+                    del element[key]
         return sanitized_document
 
     def __patch_document_audit_info(self, crud, document, timestamp):
@@ -179,7 +183,45 @@ class ElodyConfiguration(BaseObjectConfiguration):
     def _sorting(self, key_order_map, **_):
         addFields, sort = {}, {}
         for key, order in key_order_map.items():
-            if key not in ["date_created", "date_updated", "last_editor"]:
+            if key == "order":
+                addFields.update(
+                    {
+                        key: {
+                            "$arrayElemAt": [
+                                {
+                                    "$map": {
+                                        "input": {
+                                            "$filter": {
+                                                "input": "$relations",
+                                                "as": "relation",
+                                                "cond": {
+                                                    "$eq": [
+                                                        {
+                                                            "$arrayElemAt": [
+                                                                "$$relation.metadata.key",
+                                                                0,
+                                                            ]
+                                                        },
+                                                        key,
+                                                    ]
+                                                },
+                                            }
+                                        },
+                                        "as": "relation",
+                                        "in": {
+                                            "$arrayElemAt": [
+                                                "$$relation.metadata.value",
+                                                0,
+                                            ]
+                                        },
+                                    }
+                                },
+                                0,
+                            ]
+                        }
+                    }
+                )
+            elif key not in ["date_created", "date_updated", "last_editor"]:
                 addFields.update(
                     {
                         key: {
@@ -196,7 +238,7 @@ class ElodyConfiguration(BaseObjectConfiguration):
                                             }
                                         },
                                         "as": "metadata",
-                                        "in": { "$toLower": "$$metadata.value" },
+                                        "in": {"$toLower": "$$metadata.value"},
                                     }
                                 },
                                 0,

{elody-0.0.213 → elody-0.0.215}/src/elody/policies/helpers.py

@@ -44,7 +44,15 @@ def get_item(storage_manager, user_context_bag, view_args) -> dict:
     view_args = view_args or {}
     if id := view_args.get("id"):
         resolve_collections = user_context_bag.get("collection_resolver")
-        collections = resolve_collections(collection=view_args.get("collection"), id=id)
+        collection = (
+            get_object_configuration_mapper()
+            .get(view_args.get("type"))
+            .crud()
+            .get("collection")
+        )
+        collections = resolve_collections(
+            collection=view_args.get("collection", collection), id=id
+        )
         for collection in collections:
             if item := storage_manager.get_db_engine().get_item_from_collection_by_id(
                 collection, id

{elody-0.0.213 → elody-0.0.215}/src/elody/policies/permission_handler.py

@@ -260,7 +260,11 @@ 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, {"id": item_value})
+            item = get_item(
+                StorageManager(),
+                user_context.bag,
+                {"type": keys[1].split("-", 1)[0], "id": item_value},
+            )
             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.213 → elody-0.0.215}/src/elody.egg-info/PKG-INFO

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