[PP-2109] Remove loan expiration events.

ThePalaceProject · Feb 26, 2025 · 78e70ed · 78e70ed
1 parent 44d9910
commit 78e70ed
Show file tree

Hide file tree

Showing 3 changed files with 11 additions and 16 deletions.
diff --git a/src/palace/manager/api/monitor.py b/src/palace/manager/api/monitor.py
@@ -49,18 +49,6 @@ def where_clause(self):
         )
         return ~self.MODEL_CLASS.id.in_(source_of_truth_subquery)
 
-    def delete(self, row) -> None:
-        ce = CirculationEvent
-        event_type = ce.CM_LOAN_EXPIRED if isinstance(row, Loan) else ce.CM_HOLD_EXPIRED
-        event = dict(
-            library=row.library,
-            license_pool=row.license_pool,
-            event_type=event_type,
-            patron=row.patron,
-        )
-        super().delete(row)
-        self._events_to_be_logged.append(event)
-
     def after_commit(self) -> None:
         super().after_commit()
         copy_of_list = list(self._events_to_be_logged)
@@ -130,6 +118,16 @@ def where_clause(self):
         )
         return and_(superclause, probably_abandoned)
 
+    def delete(self, row) -> None:
+        event = dict(
+            library=row.library,
+            license_pool=row.license_pool,
+            event_type=CirculationEvent.CM_HOLD_EXPIRED,
+            patron=row.patron,
+        )
+        super().delete(row)
+        self._events_to_be_logged.append(event)
+
 
 ReaperMonitor.REGISTRY.append(HoldReaper)
 

diff --git a/src/palace/manager/sqlalchemy/model/circulationevent.py b/src/palace/manager/sqlalchemy/model/circulationevent.py
@@ -101,7 +101,6 @@ class CirculationEvent(Base):
     CM_HOLD_RELEASE = "circulation_manager_hold_release"
     CM_HOLD_EXPIRED = "circulation_manager_hold_expired"
     CM_HOLD_READY_FOR_CHECKOUT = "circulation_manager_hold_ready"
-    CM_LOAN_EXPIRED = "circulation_manager_loan_expired"
     CM_HOLD_CONVERTED_TO_LOAN = "circulation_manager_hold_converted_to_loan"
     CM_LOAN_CONVERTED_TO_HOLD = "circulation_manager_loan_converted_to_hold"
     CM_FULFILL = "circulation_manager_fulfill"

diff --git a/tests/manager/api/test_monitor.py b/tests/manager/api/test_monitor.py
@@ -193,11 +193,9 @@ def test_reaping(
         call_args_list = (
             services_fixture.analytics_fixture.analytics_mock.collect_event.call_args_list
         )
-        assert len(call_args_list) == 4
+        assert len(call_args_list) == 2
         event_types = [call_args.kwargs["event_type"] for call_args in call_args_list]
         assert event_types == [
-            CirculationEvent.CM_LOAN_EXPIRED,
-            CirculationEvent.CM_LOAN_EXPIRED,
             CirculationEvent.CM_HOLD_EXPIRED,
             CirculationEvent.CM_HOLD_EXPIRED,
         ]