elody 0.0.213__py3-none-any.whl → 0.0.215__py3-none-any.whl

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/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/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.dist-info → elody-0.0.215.dist-info}/METADATA

@@ -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.dist-info → elody-0.0.215.dist-info}/RECORD

@@ -13,12 +13,12 @@ elody/migration/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 elody/migration/base_object_migrator.py,sha256=n8uvgGfjEUy60G47RD7Y-oxp1vHLOauwPMDl87LcxtU,436
 elody/object_configurations/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 elody/object_configurations/base_object_configuration.py,sha256=8wyUq_zqRkGb4Mp198pyxOaGdz2WMZzVOO65s1SDCRw,7393
-elody/object_configurations/elody_configuration.py,sha256=WjF4WJQpaAwVnVHt7Io21js6YDg5l57j9Xm0OA1XQgM,8502
+elody/object_configurations/elody_configuration.py,sha256=pktiS14jeZja-G6677Hse5zzeUpH5rHRzy7YK-H2wNU,10519
 elody/object_configurations/job_configuration.py,sha256=HMDxaRUyfqhIy0q3yQDDMH9uW5iCd7VCmqknQofXNt0,2039
 elody/object_configurations/saved_search_configuration.py,sha256=ddOry4EqYOeEKRF7q2M_fHoqZv8DXpQjFq8VaZ7jhVI,732
 elody/policies/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
-elody/policies/helpers.py,sha256=LTV_Hmg8AN64e6t4glpKhZMsRNYCLN8FC-KQ0-7EmR8,2035
-elody/policies/permission_handler.py,sha256=ovQ1id67GtiEZYl3_2f_QPDn7XkCMGae6xgnpMWNHs8,10233
+elody/policies/helpers.py,sha256=0mlTd-hu2TKwVNH3ov4yCEV-P_f2k7XFJ7XYUtGTjXk,2239
+elody/policies/permission_handler.py,sha256=Bb4PHlM2A3Y-gknIdh4tNIk4gfv6iRjNeVULnUCITFc,10330
 elody/policies/authentication/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 elody/policies/authentication/base_user_tenant_validation_policy.py,sha256=zQo9tyGDwHHh6Wt3akbaT5CIEG5rqz1DT-BsAtbJNhw,5419
 elody/policies/authentication/multi_tenant_policy.py,sha256=g4ZYUQMmCjgLg09wj0-0lGKsJsRt7h4ppI25o1VdZHw,4039
@@ -35,13 +35,13 @@ elody/policies/authorization/mediafile_derivatives_policy.py,sha256=OwNpbS8i7-Lz
 elody/policies/authorization/mediafile_download_policy.py,sha256=XMsKavBucmTh4W1kWOzpFWxJ_ZXgHVK1RS7JB4HjtQo,1979
 elody/policies/authorization/multi_tenant_policy.py,sha256=SA9H7SBjzuh8mY3gYN7pDG8TV7hdI3GEUtNeiZeNL3M,3164
 elody/policies/authorization/tenant_request_policy.py,sha256=dEgblwRAqwWVcE-O7Jn8hVL3OnwDlQhDEOcPlcElBrk,1185
-elody-0.0.213.dist-info/licenses/LICENSE,sha256=gXf5dRMhNSbfLPYYTY_5hsZ1r7UU1OaKQEAQUhuIBkM,18092
+elody-0.0.215.dist-info/licenses/LICENSE,sha256=gXf5dRMhNSbfLPYYTY_5hsZ1r7UU1OaKQEAQUhuIBkM,18092
 tests/__init_.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 tests/data.py,sha256=Q3oxduf-E3m-Z5G_p3fcs8jVy6g10I7zXKL1m94UVMI,2906
 tests/unit/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 tests/unit/test_csv.py,sha256=NQaOhehfQ4GuXku0Y1SA8DYjJeqqidbF50zEHAi8RZA,15923
 tests/unit/test_utils.py,sha256=g63szcEZyHhCOtrW4BnNbcgVca3oYPIOLjBdIzNwwN0,8784
-elody-0.0.213.dist-info/METADATA,sha256=WCE5Kp6dBa4UDdX9g_A6hJ739VQLVw07XltvMbZmTSk,23358
-elody-0.0.213.dist-info/WHEEL,sha256=_zCd3N1l69ArxyTb8rzEoP9TpbYXkqRFSNOD5OuxnTs,91
-elody-0.0.213.dist-info/top_level.txt,sha256=E0mImupLj0KmtUUCXRYEoLDRaSkuiGaOIIseAa0oQ-M,21
-elody-0.0.213.dist-info/RECORD,,
+elody-0.0.215.dist-info/METADATA,sha256=PsmLEfEJhwLxo523Qr8QnvgR2asF-3nf9AeNvUcJUqg,23358
+elody-0.0.215.dist-info/WHEEL,sha256=_zCd3N1l69ArxyTb8rzEoP9TpbYXkqRFSNOD5OuxnTs,91
+elody-0.0.215.dist-info/top_level.txt,sha256=E0mImupLj0KmtUUCXRYEoLDRaSkuiGaOIIseAa0oQ-M,21
+elody-0.0.215.dist-info/RECORD,,