[_120,_801] misc changes

Author: d-w-moore

irods/models.py

@@ -242,10 +242,8 @@ class Ticket(Model):
         write_file_limit = Column(Integer, "TICKET_WRITE_FILE_LIMIT", 2212)
         write_byte_count = Column(Integer, "TICKET_WRITE_BYTE_COUNT", 2213)
         write_byte_limit = Column(Integer, "TICKET_WRITE_BYTE_LIMIT", 2214)
-
-    ## For now, use of these columns raises CAT_SQL_ERR in both PRC and iquest: (irods/irods#5929)
-        create_time = Column(DateTime, 'TICKET_CREATE_TIME', 2209)
-        modify_time = Column(DateTime, 'TICKET_MODIFY_TIME', 2210)
+        create_time = Column(DateTime, 'TICKET_CREATE_TIME', 2209, min_version=(4, 3, 0))
+        modify_time = Column(DateTime, 'TICKET_MODIFY_TIME', 2210, min_version=(4, 3, 0))
 
     class DataObject(Model):
         """For queries of R_DATA_MAIN when joining to R_TICKET_MAIN.

irods/test/ticket_test.py

@@ -1,20 +1,25 @@
 #! /usr/bin/env python
 
+import calendar
+import datetime
+import logging
 import os
 import sys
-import unittest
 import time
-import calendar
+import unittest
 
 import irods.test.helpers as helpers
 import tempfile
 from irods.session import iRODSSession
 import irods.exception as ex
 import irods.keywords as kw
-from irods.ticket import Ticket
+from irods.ticket import list_tickets, Ticket
 from irods.models import TicketQuery, DataObject, Collection
 
 
+logger = logging.getLogger(__name__)
+
+
 # As with most of the modules in this test suite, session objects created via
 # make_session() are implicitly agents of a rodsadmin unless otherwise indicated.
 # Counterexamples within this module shall be obvious as they are instantiated by
@@ -29,6 +34,17 @@ def gmtime_to_timestamp(gmt_struct):
     )
 
 
+def delete_tickets(session, dry_run = False):
+    for res in session.query(TicketQuery.Ticket):
+        t = Ticket(session, result=res)
+        if dry_run in (False, None):
+            t.delete(**{kw.ADMIN_KW: ""})
+        elif isinstance(dry_run, list):
+            dry_run.append(t)
+        else:
+            logger.info('Found ticket: %s',t.string)
+
+
 def delete_my_tickets(session):
     my_userid = session.users.get(session.username).id
     my_tickets = session.query(TicketQuery.Ticket).filter(
@@ -358,6 +374,27 @@ def test_coll_read_ticket_between_rodsusers(self):
                 os.unlink(file_.name)
             alice.cleanup()
 
+    def test_new_attributes_in_tickets__issue_801(self):
+
+        if (admin:=helpers.make_session()).server_version < (4, 3, 0):
+            self.skipTest('"create_time" and "modify_time" not supported for Ticket')
+
+        try:
+            with self.login(self.bob) as bob:
+                bobs_ticket = Ticket(bob)
+                bobs_ticket.issue('write', helpers.home_collection(bob))
+                time.sleep(2)
+                bobs_ticket.modify('add', 'user', admin.username)
+                bobs_ticket = Ticket(bob, result=[], ticket=bobs_ticket.string)
+                self.assertGreaterEqual(
+                    bobs_ticket.modify_time, 
+                    bobs_ticket.create_time + datetime.timedelta(seconds=1)
+                )
+
+            admin_ticket_for_bob = Ticket(admin, result=[], ticket=bobs_ticket.string)
+            self.assertEqual(admin_ticket_for_bob.id, bobs_ticket.id)
+        finally:
+            admin_ticket_for_bob.delete(**{kw.ADMIN_KW:''})
 
 class TestTicketOps(unittest.TestCase):
 
@@ -456,6 +493,21 @@ def test_coll_ticket_write(self):
         self._ticket_write_helper(obj_type="coll")
 
 
+    def test_list_tickets__issue_120(self):
+
+        ses = self.sess
+
+        # t first assigned as a "utility" Ticket object
+        t = Ticket(ses).issue('read', helpers.home_collection(ses))
+        self.assertGreater(len(t.string) , 5)
+
+        # This time, t receives attributes from the GenQuery row result
+        t = Ticket(ses, result=[], ticket=t.string)
+
+        # Check an id attribute is present and listed in the results from list_tickets
+        self.assertIn(t.id, (_.id for _ in list_tickets(ses)))
+
+
 if __name__ == "__main__":
     # let the tests find the parent irods lib
     sys.path.insert(0, os.path.abspath("../.."))

irods/ticket.py

@@ -1,6 +1,8 @@
 from irods.api_number import api_number
 from irods.message import iRODSMessage, TicketAdminRequest
 from irods.models import TicketQuery
+from irods.column import Like
+from collections.abc import Mapping, Sequence
 
 import random
 import string
@@ -28,12 +30,13 @@ def get_epoch_seconds(utc_timestamp):
         raise  # final try at conversion, so a failure is an error
 
 
-def list_tickets(session, all=True):
+def list_tickets(session, *, raw=False, all=True):
     """
     Enumerates (via GenQuery1) all tickets visible by, or owned by, the current user.
 
     Args:
         session: An iRODSSession object for use in the query.
+        raw: True if only the queried rows are to be returned; False to construct Ticket objects for each row.
         all: True if a comprehensive list is desired; otherwise only those
             tickets owned by the calling user.
 
@@ -45,32 +48,49 @@ def list_tickets(session, all=True):
         query = query.filter(
             TicketQuery.Ticket.user_id == session.users.get(session.username).id
         )
-    yield from query
+    if raw:
+        yield from query
+    else:
+        yield from (Ticket(session, result=_) for _ in query)
 
 
 class Ticket:
     def __init__(self, session, ticket="", result=None, allow_punctuation=False):
         self._session = session
         try:
-            if hasattr(result,'__getitem__') and result.get(TicketQuery.Ticket.string,''):
-                pass
-            elif ticket and hasattr(result,'__iter__'):
-                result = [_ for _ in result if _[TicketQuery.Ticket.string] == ticket][0]
+            if isinstance(result, Mapping):
+                if (single_string:=result.get(TicketQuery.Ticket.string, '')):
+                    if ticket and (ticket != single_string):
+                        raise RuntimeError(
+                            f"The specified result contained a ticket string mismatched to the provided identifier ({ticket = })"
+                        )
+
+            # Allow limited query for the purpose of populating id and other attributes
+            if result == [] and ticket:
+                result[:] = list(session.query(TicketQuery.Ticket).filter(TicketQuery.Ticket.string == ticket))
+
+            if isinstance(result, Sequence):
+                if ticket:
+                    result = [_ for _ in result if _[TicketQuery.Ticket.string] == ticket][:1]
+
+                if not result:
+                    result = None
+                else:
+                    result = result[0]
+
             if result:
                 ticket = result[TicketQuery.Ticket.string]
                 for attr, value in TicketQuery.Ticket.__dict__.items():
                     if value is TicketQuery.Ticket.string: continue
-                    #print ('copying',attr)
                     if not attr.startswith("_"):
                         try:
                             setattr(self, attr, result[value])
                         except KeyError:
                             # backward compatibility with older schema versions
                             pass
         except TypeError:
-                        
             raise RuntimeError(
-                "If specified, 'result' parameter must be a TicketQuery.Ticket search result"
+                "If specified, 'result' parameter must be a TicketQuery.Ticket search result or iterable of same"
             )
         except IndexError:
             raise RuntimeError(