Fix merging of date operations (backport for 2.x)

news/188.bugfix

@@ -0,0 +1 @@
+Fix merging multiple date operations. @davisagli

src/plone/app/querystring/profiles.zcml

@@ -90,4 +90,12 @@
       directory="profiles/upgrades/to_14"
       />
 
+  <genericsetup:registerProfile
+      name="upgrade_to_15"
+      title="Querystring Upgrade profile to v15"
+      description=""
+      provides="Products.GenericSetup.interfaces.EXTENSION"
+      directory="profiles/upgrades/to_15"
+      />
+
 </configure>

src/plone/app/querystring/profiles/default/metadata.xml

@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <metadata>
-  <version>14</version>
+  <version>15</version>
   <dependencies>
     <dependency>profile-plone.app.registry:default</dependency>
   </dependencies>

src/plone/app/querystring/profiles/default/registry.xml

@@ -67,7 +67,7 @@
            i18n:translate=""
     >Before date</value>
     <value key="description">Please use YYYY/MM/DD.</value>
-    <value key="operation">plone.app.querystring.queryparser._lessThan</value>
+    <value key="operation">plone.app.querystring.queryparser._dateLessThan</value>
     <value key="widget">DateWidget</value>
   </records>
 
@@ -80,7 +80,7 @@
     <value key="description"
            i18n:translate=""
     >Please use YYYY/MM/DD.</value>
-    <value key="operation">plone.app.querystring.queryparser._largerThan</value>
+    <value key="operation">plone.app.querystring.queryparser._dateLargerThan</value>
     <value key="widget">DateWidget</value>
   </records>
 
@@ -93,7 +93,7 @@
     <value key="description"
            i18n:translate=""
     >Please use YYYY/MM/DD.</value>
-    <value key="operation">plone.app.querystring.queryparser._between</value>
+    <value key="operation">plone.app.querystring.queryparser._dateBetween</value>
     <value key="widget">DateRangeWidget</value>
   </records>
 

src/plone/app/querystring/profiles/upgrades/to_15/registry.xml

@@ -0,0 +1,24 @@
+<?xml version="1.0" encoding="utf-8"?>
+<registry xmlns:i18n="http://xml.zope.org/namespaces/i18n"
+          i18n:domain="plone"
+>
+
+  <records interface="plone.app.querystring.interfaces.IQueryOperation"
+           prefix="plone.app.querystring.operation.date.lessThan"
+  >
+    <value key="operation">plone.app.querystring.queryparser._dateLessThan</value>
+  </records>
+
+  <records interface="plone.app.querystring.interfaces.IQueryOperation"
+           prefix="plone.app.querystring.operation.date.largerThan"
+  >
+    <value key="operation">plone.app.querystring.queryparser._dateLargerThan</value>
+  </records>
+
+  <records interface="plone.app.querystring.interfaces.IQueryOperation"
+           prefix="plone.app.querystring.operation.date.between"
+  >
+    <value key="operation">plone.app.querystring.queryparser._dateBetween</value>
+  </records>
+
+</registry>

src/plone/app/querystring/queryparser.py

@@ -163,6 +163,19 @@ def _between(context, row):
     return tmp
 
 
+def _dateBetween(context, row):
+    try:
+        start_date = DateTime(row.values[0])
+    except DateTimeError:
+        start_date = DateTime(0)
+    try:
+        end_date = DateTime(row.values[1])
+    except DateTimeError:
+        end_date = DateTime()
+    row = Row(index=row.index, operator=row.operator, values=(start_date, end_date))
+    return _between(context, row)
+
+
 def _largerThan(context, row):
     tmp = {
         row.index: {
@@ -186,6 +199,19 @@ def _intLargerThan(context, row):
     }
 
 
+def _dateLargerThan(context, row):
+    try:
+        value = DateTime(row.values)
+    except (DateTimeError, TypeError, AttributeError):
+        return {}
+    return {
+        row.index: {
+            "query": value,
+            "range": "min",
+        },
+    }
+
+
 def _lessThan(context, row):
     tmp = {
         row.index: {
@@ -209,6 +235,19 @@ def _intLessThan(context, row):
     }
 
 
+def _dateLessThan(context, row):
+    try:
+        value = DateTime(row.values)
+    except (DateTimeError, TypeError, AttributeError):
+        return {}
+    return {
+        row.index: {
+            "query": value,
+            "range": "max",
+        },
+    }
+
+
 def _currentUser(context, row):
     """Current user lookup"""
     mt = getToolByName(context, "portal_membership")

src/plone/app/querystring/tests/testQueryParser.py

@@ -289,6 +289,30 @@ def test_merge_ranges(self):
         parsed = queryparser.parseFormquery(MockSite(), data)
         self.assertEqual(parsed, {"modified": {"query": [10, 20], "range": "minmax"}})
 
+    def test_merge_date_operations(self):
+        data = [
+            {
+                "i": "start",
+                "o": "plone.app.querystring.operation.date.afterRelativeDate",
+                "v": "0",
+            },
+            {
+                "i": "start",
+                "o": "plone.app.querystring.operation.date.largerThan",
+                "v": "2026/05/04",
+            },
+        ]
+        parsed = queryparser.parseFormquery(MockSite(), data)
+        self.assertEqual(
+            parsed,
+            {
+                "start": {
+                    "query": [DateTime("2026/05/04"), DateTime().earliestTime()],
+                    "range": "min",
+                }
+            },
+        )
+
 
 class TestQueryGenerators(TestQueryParserBase):
     def test__between(self):

src/plone/app/querystring/tests/testRegistryIntegration.py

@@ -33,7 +33,7 @@ def test_date_lessthan(self):
         self.assertEqual(registry[prefix + ".description"], "Please use YYYY/MM/DD.")
         self.assertEqual(
             registry[prefix + ".operation"],
-            "plone.app.querystring.queryparser._lessThan",
+            "plone.app.querystring.queryparser._dateLessThan",
         )
 
 

src/plone/app/querystring/upgrades.zcml

@@ -159,4 +159,15 @@
         />
   </genericsetup:upgradeSteps>
 
+  <genericsetup:upgradeSteps
+      profile="plone.app.querystring:default"
+      source="14"
+      destination="15"
+      >
+    <genericsetup:upgradeDepends
+        title="Use date-specific lessThan, largerThan, and between operators."
+        import_profile="plone.app.querystring:upgrade_to_15"
+        />
+  </genericsetup:upgradeSteps>
+
 </configure>