reset

src/collective/formsupport/counter/__init__.py

@@ -2,5 +2,8 @@
 """Init and utils."""
 from zope.i18nmessageid import MessageFactory
 
+import logging
+
 
 _ = MessageFactory("collective.formsupport.counter")
+logger = logging.getLogger(__name__)

src/collective/formsupport/counter/adapters/data.py

@@ -3,6 +3,7 @@
 from collective.formsupport.counter.config import COUNTER_ENABLED_FORM_FLAG_NAME
 from collective.formsupport.counter.interfaces import ICollectiveFormsupportCounterLayer
 from collective.volto.formsupport.interfaces import IDataAdapter
+from fromcollective.formsupport.counter import logger
 from zope.annotation.interfaces import IAnnotations
 from zope.component import adapter
 from zope.interface import implementer
@@ -17,6 +18,11 @@ def __init__(self, context, request):
         self.request = request
 
     def get_block(self, block_id):
+        if not block_id:
+            logger.warning(
+                "missing block_id for %s get the first formsupport block",
+                self.context.absolute_url(),
+            )
         blocks = getattr(self.context, "blocks", {})
         if not blocks:
             return

src/collective/formsupport/counter/restapi/services/reset_counter.py

@@ -1,14 +1,30 @@
+from collective.formsupport import logger
 from collective.formsupport.counter.config import COUNTER_ANNOTATIONS_NAME
 from plone.restapi.services import Service
+from zException import NotFound
 from zope.annotation.interfaces import IAnnotations
 
 
 class CounterReset(Service):
+    def get_block_id(self, block_id):
+        if not block_id:
+            logger.warning(
+                "missing block_id for %s get the first formsupport block",
+                self.context.absolute_url(),
+            )
+        blocks = getattr(self.context, "blocks", {})
+        if not blocks:
+            return
+        for id, block in blocks.items():
+            if block.get("@type", "") == "form":
+                if not block_id or block_id == id:
+                    return id
+
     def reply(self):
-        form_id = self.request.get("form_id")
+        block_id = self.get_block_id(self.request.get("block_id"))
+        if not block_id:
+            raise NotFound(self.context, "", self.request)
         annotations = IAnnotations(self.context)
         counter_object = annotations.setdefault(COUNTER_ANNOTATIONS_NAME, {})
-
-        counter_object[form_id] = 0
-
+        counter_object[block_id] = 0
         self.request.response.setStatus(204)