Initial work on ticket-1608: Nailing down trackers and teams

Author: Paul Philion

netbot/netbot.py

@@ -10,7 +10,7 @@
 from dotenv import load_dotenv
 from discord.ext import commands, tasks
 
-from redmine.model import TicketNote, Ticket, NamedId
+from redmine.model import TicketNote, Ticket, NamedId, Team
 from redmine import synctime
 from redmine.redmine import Client
 
@@ -20,17 +20,8 @@
 log = logging.getLogger(__name__)
 
 
-# _TRACKER_MAPPING = {
-#     "External-Comms-Intake": "admin-team",
-#     "Admin": "admin-team",
-#     "Comms": "outreach",
-#     "Infra-Config": "routing-and-infrastructure",
-#     "Infra-Field": "installs",
-#     "Software-Dev": "network-software",
-#     "Research": "uw-research-nsf",
-# }
 CHANNEL_MAPPING = {
-    "support": "External-Comms-Intake",
+    "intake": "External-Comms-Intake",
     "admin-team": "Admin",
     "outreach": "Comms",
     "routing-and-infrastructure": "Infra-Config",
@@ -40,13 +31,13 @@
 }
 
 TEAM_MAPPING = {
-    #"support": "External-Comms-Intake", ## FIXME - intake is a tracker, not a team? worry later
+    "intake": "intake-team",
     "admin-team": "admin-team",
     "outreach": "comms-team",
     "routing-and-infrastructure": "infra-config-team",
     "installs": "infra-field-team",
     "network-software": "software-dev-team",
-    "uw-research-nsf": "research-team",
+    "uw-research-nsf": "uw-research-nsf-team",
 }
 
 # utility method to get a list of (one) ticket from the title of the channel, or empty list
@@ -375,12 +366,35 @@ async def notify_expiring_tickets(self):
             await self.expiration_notification(ticket)
 
 
-    def expire_expired_tickets(self):
-        expired = self.redmine.ticket_mgr.expired_tickets()
-        for ticket in expired:
+    def group_for_tracker(self, tracker: NamedId) -> Team:
+        """For a tracker, look up a team"""
+        for channel_name, tracker_name in CHANNEL_MAPPING.items():
+            if tracker.name == tracker_name:
+                # lookup team from channel
+                team_name = TEAM_MAPPING.get(channel_name, None)
+                if team_name:
+                    team = self.redmine.user_mgr.get_team_by_name(team_name)
+                    if team:
+                        return team
+                    else:
+                        log.error(f"Unable to find team for {tracker} and {team_name}")
+                        return None
+                else:
+                    log.error(f"Unable to find channel mapping for {tracker} and {channel_name}")
+                    return None
+
+        # fallthru: not found
+        log.error(f"Unable to find channel for {tracker}")
+        return None
+
+
+    def recycle_tickets(self):
+        recycle_list = self.redmine.ticket_mgr.tickets_to_recycle() # older than max age
+        for ticket in recycle_list:
             # notification to discord, or just note provided by expire?
             # - for now, add note to ticket with expire info, and allow sync.
-            self.redmine.ticket_mgr.expire(ticket)
+            new_owner = self.group_for_tracker(ticket.tracker)
+            self.redmine.ticket_mgr.recycle(ticket, new_owner)
 
 
     @commands.slash_command(name="notify", description="Force ticket notifications")

redmine/tickets.py

@@ -24,8 +24,8 @@
 EPIC_PRIORITY_NAME = "EPIC"
 
 
-TICKET_MAX_AGE = 4 * 7 # 4 weeks; 28 days
-TICKET_EXPIRE_NOTIFY = TICKET_MAX_AGE - 1 # 27 days, one day shorter than MAX_AGE
+TICKET_MAX_AGE = 7 * 3 # 3 weeks; 21 days
+#TICKET_EXPIRE_NOTIFY = TICKET_MAX_AGE - 1 # 20 days, one day shorter than MAX_AGE
 
 
 class TicketManager():
@@ -299,9 +299,9 @@ def get_epics(self) -> list[Ticket]:
         return epics
 
 
-    def expire(self, ticket:Ticket):
-        """Expire a ticket:
-        - reassign to intake
+    def recycle(self, ticket:Ticket, team_id: int):
+        """Recycle a dusty ticket:
+        - reassign to tracker-based team
         - set status to new
         - add note to owner and collaborators
         """
@@ -310,9 +310,9 @@ def expire(self, ticket:Ticket):
         # ID can be resolved to discord-id, but not without call in user manager.
         # Ideally, this would @ the owner and collaborators.
         fields = {
-            "assigned_to_id": INTAKE_TEAM_ID,
+            "assigned_to_id": team_id,
             "status_id": "1", # New, TODO lookup using status lookup table.
-            "notes": f"Ticket automatically expired after {TICKET_MAX_AGE} days due to inactivity.",
+            "notes": f"Ticket automatically recycled after {TICKET_MAX_AGE} days due to inactivity.",
         }
         self.update(ticket.id, fields)
         log.info(f"Expired ticket {ticket.id}, {ticket.age_str}")
@@ -321,7 +321,7 @@ def expire(self, ticket:Ticket):
     def expiring_tickets(self) -> list[Ticket]:
         # tickets that are about to expire
         tickets = set()
-        tickets.update(self.older_than(TICKET_EXPIRE_NOTIFY))
+        #tickets.update(self.older_than(TICKET_EXPIRE_NOTIFY))
         tickets.update(self.due()) ### FIXME REMOVE
         return tickets
 

tests/test_netbot.py

@@ -34,6 +34,16 @@ def setUp(self):
 #- add trivial test for on_application_command_error
 
 
+    SKIP_TRACKERS = ["Test-Reject"]
+
+    def test_group_for_tracker(self):
+        trackers = self.bot.redmine.ticket_mgr.get_trackers()
+        for tracker in trackers.values():
+            if tracker.name not in TestNetbot.SKIP_TRACKERS:
+                team = self.bot.group_for_tracker(tracker)
+                self.assertIsNotNone(team)
+
+
     async def test_synchronize_ticket(self):
         # create a new ticket, identified by the tag, with a note
         body = f"Body for test {self.tag} {unittest.TestCase.id(self)}"