imio.smartweb.common 1.2.37__tar.gz → 1.2.38__tar.gz

{imio_smartweb_common-1.2.37 → imio_smartweb_common-1.2.38}/CHANGES.rst

@@ -2,6 +2,16 @@ Changelog
 =========
 
 
+1.2.38 (2025-09-10)
+-------------------
+
+- @find : Process None value in a field or ["None", "other value"] for agatha stats
+  [boulch
+
+- Add plone.app.caching include for futur proofing override
+  [jchandelle]
+
+
 1.2.37 (2025-09-03)
 -------------------
 

{imio_smartweb_common-1.2.37 → imio_smartweb_common-1.2.38}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: imio.smartweb.common
-Version: 1.2.37
+Version: 1.2.38
 Summary: Common utilities, vocabularies, taxonomies for imio.smartweb & co products
 Home-page: https://github.com/imio/imio.smartweb.common
 Author: iMio
@@ -178,6 +178,16 @@ Changelog
 =========
 
 
+1.2.38 (2025-09-10)
+-------------------
+
+- @find : Process None value in a field or ["None", "other value"] for agatha stats
+  [boulch
+
+- Add plone.app.caching include for futur proofing override
+  [jchandelle]
+
+
 1.2.37 (2025-09-03)
 -------------------
 

{imio_smartweb_common-1.2.37 → imio_smartweb_common-1.2.38}/setup.py

@@ -16,7 +16,7 @@ long_description = "\n\n".join(
 
 setup(
     name="imio.smartweb.common",
-    version="1.2.37",
+    version="1.2.38",
     description="Common utilities, vocabularies, taxonomies for imio.smartweb & co products",
     long_description=long_description,
     # Get more from https://pypi.org/classifiers/

{imio_smartweb_common-1.2.37 → imio_smartweb_common-1.2.38}/src/imio/smartweb/common/caching_overrides.zcml

@@ -3,6 +3,7 @@
     xmlns:cache="http://namespaces.zope.org/cache"
     xmlns:zcml="http://namespaces.zope.org/zcml">
 
+    <include package="plone.app.caching" />
     <include package="z3c.unconfigure" file="meta.zcml" />
 
     <unconfigure>

{imio_smartweb_common-1.2.37 → imio_smartweb_common-1.2.38}/src/imio/smartweb/common/rest/endpoint.py

@@ -130,24 +130,41 @@ class FindEndpointHandler(SearchHandler):
         if total == 0:
             return {}
 
-        # Récupération des valeurs réelles dans les objets
+        # Récupération et normalisation des valeurs
         values = []
         for brain in brains:
             obj = brain.getObject()
             value = getattr(obj, field_name, None)
-            if isinstance(value, (list, tuple)):  # cas champ multi-valué
-                values.extend(value)
+            if isinstance(value, (list, tuple)):
+                if not value:
+                    # liste/tuple vide => on compte 1 None
+                    values.append(None)
+                else:
+                    mapped = [
+                        None if (v in ("", "None") or v is None) else v for v in value
+                    ]
+                    # si TOUT est None, on compte 1 None (au lieu d'en ajouter 0)
+                    if all(v is None for v in mapped):
+                        values.append(None)
+                    else:
+                        values.extend(mapped)
             else:
-                values.append(value)
+                v = None if (value in ("", "None") or value is None) else value
+                values.append(v)
         counter = Counter(values)
 
-        # Calcul stats seulement pour expected_values
-        result = {}
+        # Normalisation des valeurs attendues
         expected_values = normalize_query_param(expected_values)
-        for val in expected_values:
-            count = counter.get(val, 0)
+        # On garde les labels originaux pour l'affichage, mais on mappe "None" vers None réel pour le compteur
+        expected_mapping = {v: (None if v == "None" else v) for v in expected_values}
+
+        # Calcul stats
+        result = {}
+        for label, key in expected_mapping.items():
+            count = counter.get(key, 0)
             percent = (count / total) * 100 if total > 0 else 0
-            result[val] = {"count": count, "percent": round(percent, 2)}
+            result[label] = {"count": count, "percent": round(percent, 2)}
+
         return result
 
 

{imio_smartweb_common-1.2.37 → imio_smartweb_common-1.2.38}/src/imio.smartweb.common.egg-info/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: imio.smartweb.common
-Version: 1.2.37
+Version: 1.2.38
 Summary: Common utilities, vocabularies, taxonomies for imio.smartweb & co products
 Home-page: https://github.com/imio/imio.smartweb.common
 Author: iMio
@@ -178,6 +178,16 @@ Changelog
 =========
 
 
+1.2.38 (2025-09-10)
+-------------------
+
+- @find : Process None value in a field or ["None", "other value"] for agatha stats
+  [boulch
+
+- Add plone.app.caching include for futur proofing override
+  [jchandelle]
+
+
 1.2.37 (2025-09-03)
 -------------------