implemented and added tests for recyclable tickets

Author: Paul Philion

redmine/tickets.py

@@ -328,18 +328,16 @@ def recycle(self, ticket:Ticket, team_id: int):
 
 
     def dusty(self) -> set[Ticket]:
-        # tickets that are older than
+        # tickets that are older than 7
         tickets = set()
         tickets.update(self.older_than(TICKET_DUSTY_AGE))
-        tickets.update(self.due()) ### FIXME REMOVE
         return tickets
 
 
-    def expired_tickets(self) -> set[Ticket]:
+    def recyclable(self) -> set[Ticket]:
         # tickets that have expired: older that TICKET_MAX_AGE
         tickets = set()
         tickets.update(self.older_than(TICKET_MAX_AGE))
-        tickets.update(self.due()) ### FIXME REMOVE
         return tickets
 
 

tests/test_tickets.py

@@ -8,7 +8,8 @@
 
 from dotenv import load_dotenv
 
-from redmine.model import ParentTicket
+from redmine.model import ParentTicket, synctime
+from redmine.tickets import TICKET_DUSTY_AGE, TICKET_MAX_AGE
 
 from tests import test_utils
 
@@ -18,22 +19,14 @@
 class TestTicketManager(test_utils.MockRedmineTestCase):
     """Mocked testing of ticket manager"""
 
-    @unittest.skip # FIXME currently rewriting
-    @patch('redmine.session.RedmineSession.get')
-    def test_expired_tickets(self, mock_get:MagicMock):
-        # setup the mock tickets
-        ticket = test_utils.mock_ticket()
-        result = test_utils.mock_result([
-            ticket,
-            test_utils.mock_ticket(),
-        ])
-        mock_get.return_value = result.asdict()
-
-        expired = self.tickets_mgr.expired_tickets()
-        self.assertGreater(len(expired), 0)
-        expired_ids = [ticket.id for ticket in expired]
-        self.assertIn(ticket.id, expired_ids)
-        #FIXME mock_get.assert_called_once()
+    def test_dusty_tickets(self):
+        for ticket in self.tickets_mgr.dusty():
+            age = synctime.age(ticket.updated_on)
+            self.assertGreaterEqual(age.days, TICKET_DUSTY_AGE)
+
+        for ticket in self.tickets_mgr.recyclable():
+            age = synctime.age(ticket.updated_on)
+            self.assertGreaterEqual(age.days, TICKET_MAX_AGE)
 
 
     @unittest.skip # FIXME currently breaking mock testing