Fix: occurrences indexing (#93)

CHANGES.rst

@@ -4,7 +4,8 @@ Changelog
 5.4.4 (unreleased)
 ------------------
 
-- Nothing changed yet.
+- Fix: occurrences indexing
+  [mamico]
 
 
 5.4.3 (2024-01-30)

src/redturtle/volto/monkey.py

@@ -8,7 +8,8 @@
 from plone.event.interfaces import IEventAccessor
 from plone.event.interfaces import IRecurrenceSupport
 from plone.event.recurrence import recurrence_sequence_ical
-from plone.event.utils import pydt
+
+# from plone.event.utils import pydt
 from Products.CMFPlone.interfaces import IConstrainTypes
 from zope.globalrequest import getRequest
 
@@ -75,13 +76,20 @@ def occurrences(self, range_start=None, range_end=None):
     # but doing it for backwards compatibility as views/templates
     # still rely on acquisition-wrapped objects.
     def get_obj(start):
-        if pydt(event_start.replace(microsecond=0)) == start:
-            # If the occurrence date is the same as the event object, the
-            # occurrence is the event itself. return it as such.
-            # Dates from recurrence_sequence_ical are explicitly without
-            # microseconds, while event.start may contain it. So we have to
-            # remove it for a valid comparison.
-            return self.context
+        # THIS IS THE PATCH
+        #
+        # -- questa parte è stata commentata, altrtimenti se lo start date coincide con la data di inizio dell'evento
+        # -- la funzione ritorna l'evento stesso, invece che la sua occorrenza e l'indice end non contiene
+        # -- tutte le date di end, ma solo quella dell'evento stesso
+        #
+        # if pydt(event_start.replace(microsecond=0)) == start:
+        #     # If the occurrence date is the same as the event object, the
+        #     # occurrence is the event itself. return it as such.
+        #     # Dates from recurrence_sequence_ical are explicitly without
+        #     # microseconds, while event.start may contain it. So we have to
+        #     # remove it for a valid comparison.
+        #     return self.context
+        # END OF PATCH
         return Occurrence(
             id=str(start.date()), start=start, end=start + duration
         ).__of__(self.context)

src/redturtle/volto/profiles/default/metadata.xml

@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <metadata>
-  <version>4302</version>
+  <version>4303</version>
   <dependencies>
     <dependency>profile-plone.volto:default</dependency>
     <dependency>profile-plone.app.caching:with-caching-proxy</dependency>

src/redturtle/volto/upgrades.py

@@ -485,3 +485,12 @@ def to_4302(context):
     for brain in brains:
         event = brain.getObject()
         event.reindexObject(idxs=["start", "end"])
+
+
+def to_4303(context):
+    brains = api.content.find(portal_type="Event")
+    logger.info("Reindexing {} Events".format(len(brains)))
+
+    for brain in brains:
+        event = brain.getObject()
+        event.reindexObject(idxs=["start", "end"])

src/redturtle/volto/upgrades.zcml

@@ -199,12 +199,21 @@
       />
 
   <genericsetup:upgradeStep
-      title="Rendex start index"
+      title="Rendex start/end index"
       description=""
       profile="redturtle.volto:default"
       source="4301"
       destination="4302"
       handler=".upgrades.to_4302"
       />
 
+  <genericsetup:upgradeStep
+      title="Rendex start/end index"
+      description=""
+      profile="redturtle.volto:default"
+      source="4302"
+      destination="4303"
+      handler=".upgrades.to_4303"
+      />
+
 </configure>