Merge pull request #79 from OpenSPP/78-fix-error-in-_cancel_entitlements_async-in-spp_entitlement_in_kind

Fix error in in-kind entitlement cancellation and deleting multiple entitlements

Author: jeremi

Diff for: spp_entitlement_basket/models/entitlement_manager.py

@@ -172,12 +172,17 @@ def set_pending_validation_entitlements(self, cycle):
         :param cycle: A recordset of cycle
         :return:
         """
-        # Get the number of entitlements in cycle
+        # Get the number of entitlements
+        entitlements_count = cycle.get_entitlements(
+            ["draft"], entitlement_model="g2p.entitlement.inkind", count=True
+        )
+
+        # Get the entitlements
         entitlements = cycle.get_entitlements(
             ["draft"],
             entitlement_model="g2p.entitlement.inkind",
         )
-        entitlements_count = len(entitlements)
+
         if entitlements_count < self.MIN_ROW_JOB_QUEUE:
             self._set_pending_validation_entitlements(entitlements)
 
@@ -193,7 +198,7 @@ def _set_pending_validation_entitlements(self, entitlements):
         :return:
         """
         entitlements.update({"state": "pending_validation"})
-        _logger.debug("Entitlement Validation: total: %s" % (len(entitlements)))
+        # _logger.debug("Entitlement Validation: total: %s" % (len(entitlements)))
 
     def validate_entitlements(self, cycle):
         """Validate Basket Entitlements.
@@ -203,12 +208,19 @@ def validate_entitlements(self, cycle):
         :param cycle: A recordset of cycle
         :return:
         """
-        # Get the number of entitlements in cycle
+        # Get the number of entitlements
+        entitlements_count = cycle.get_entitlements(
+            ["draft", "pending_validation"],
+            entitlement_model="g2p.entitlement.inkind",
+            count=True,
+        )
+
+        # Get the entitlements
         entitlements = cycle.get_entitlements(
             ["draft", "pending_validation"],
             entitlement_model="g2p.entitlement.inkind",
         )
-        entitlements_count = len(entitlements)
+
         if entitlements_count < self.MIN_ROW_JOB_QUEUE:
             err, message = self._validate_entitlements(entitlements)
             if err > 0:
@@ -264,12 +276,19 @@ def cancel_entitlements(self, cycle):
         :param cycle: A recordset of cycle
         :return:
         """
-        # Get the entitlements in cycle
+        # Get the number of entitlements
+        entitlements_count = cycle.get_entitlements(
+            ["draft", "pending_validation", "approved"],
+            entitlement_model="g2p.entitlement.inkind",
+            count=True,
+        )
+
+        # Get the entitlements
         entitlements = cycle.get_entitlements(
             ["draft", "pending_validation", "approved"],
             entitlement_model="g2p.entitlement.inkind",
         )
-        entitlements_count = len(entitlements)
+
         if entitlements_count < self.MIN_ROW_JOB_QUEUE:
             self._cancel_entitlements(entitlements)
         else:

Diff for: spp_entitlement_in_kind/models/entitlement_manager.py

@@ -266,33 +266,32 @@ def cancel_entitlements(self, cycle):
         :param cycle: A recordset of cycle
         :return:
         """
-        # Get the entitlements in cycle
+        # Get the total number of entitlements
         entitlements_count = cycle.get_entitlements(
             ["draft", "pending_validation", "approved"],
             entitlement_model="g2p.entitlement.inkind",
             count=True,
         )
+
+        # Get the entitlements
+        entitlements = cycle.get_entitlements(
+            ["draft", "pending_validation", "approved"],
+            entitlement_model="g2p.entitlement.inkind",
+        )
+
         if entitlements_count < self.MIN_ROW_JOB_QUEUE:
-            self._cancel_entitlements(cycle)
+            self._cancel_entitlements(entitlements)
         else:
-            self._cancel_entitlements_async(cycle, entitlements_count)
+            self._cancel_entitlements_async(cycle, entitlements, entitlements_count)
 
-    def _cancel_entitlements(self, cycle, offset=0, limit=None):
+    def _cancel_entitlements(self, entitlements):
         """Cancel In-Kind Entitlements.
-        Basket Entitlement Manager :meth:`_cancel_entitlements`.
+        In-Kind Entitlement Manager :meth:`_cancel_entitlements`.
         Cancel entitlements in a cycle.
 
-        :param cycle: A recordset of cycle
-        :param offset: An integer value to be used in :meth:`cycle.get_entitlements` for setting the query offset
-        :param limit: An integer value to be used in :meth:`cycle.get_entitlements` for setting the query limit
+        :param entitlements: A recordset of entitlements to cancel
         :return:
         """
-        entitlements = cycle.get_entitlements(
-            ["draft", "pending_validation", "approved"],
-            entitlement_model="g2p.entitlement.inkind",
-            offset=offset,
-            limit=limit,
-        )
         entitlements.update({"state": "cancelled"})
 
     def approve_entitlements(self, entitlements):

Diff for: spp_programs/models/entitlement.py

@@ -159,12 +159,13 @@ def _gc_mark_expired_entitlement(self):
         ).write({"state": "expired"})
 
     def unlink(self):
-        if self.state == "draft":
-            return super(InKindEntitlement, self).unlink()
-        else:
-            raise ValidationError(
-                _("Only draft entitlements are allowed to be deleted")
-            )
+        for rec in self:
+            if rec.state == "draft":
+                return super(InKindEntitlement, self).unlink()
+            else:
+                raise ValidationError(
+                    _("Only draft entitlements are allowed to be deleted")
+                )
 
     def approve_entitlement(self):
         state_err, message = self.program_id.get_manager(