Fix: Fixed invalid method definitions and failing unit tests.

The TTL argument was missing from definition of some methods related to relapse feature. (Redmine issue: #3378)

lib/mentat/reports/event.py

@@ -718,7 +718,7 @@ class EventReporter(BaseReporter):
         imf.close()
 
         zipfilepath = "{}.zip".format(filepath)
-        with zipfile.ZipFile(zipfilepath, mode = 'x') as zipf:
+        with zipfile.ZipFile(zipfilepath, mode = 'w') as zipf:
             zipf.write(filepath, compress_type = zipfile.ZIP_DEFLATED)
 
         return filepath

lib/mentat/reports/test_utils.py

@@ -242,7 +242,7 @@ class TestMentatReportsUtils(unittest.TestCase):
         )
 
         self.stcache.threshold_event(self.ideas_obj[0], 'test@domain.org', 'low', thrtime - datetime.timedelta(seconds = 50))
-        relapses = self.stcache.relapses('test@domain.org', 'low')
+        relapses = self.stcache.relapses('test@domain.org', 'low', thrtime + datetime.timedelta(seconds = 50))
         self.assertEqual(len(relapses), 1)
         self.assertEqual(relapses[0]['ID'], 'msg01')
 

lib/mentat/reports/utils.py

@@ -283,12 +283,13 @@ class ThresholdingCache:
         """
         raise NotImplementedError()
 
-    def relapses(self, group_name, severity):
+    def relapses(self, group_name, severity, ttl):
         """
         Search for list of relapsed events for given group and severity.
 
         :param str group_name: Name of the abuse group.
         :param str severity: Event severity.
+        :param datetime.datetime ttl: Record TTL time.
         :return: List of relapsed events as :py:class:`mentat.idea.internal.Idea` objects.
         :rtype: list
         """
@@ -364,12 +365,13 @@ class NoThresholdingCache(ThresholdingCache):
         """
         return
 
-    def relapses(self, group_name, severity):
+    def relapses(self, group_name, severity, ttl):
         """
         Search for list of relapsed events for given group and severity.
 
         :param str group_name: Name of the abuse group.
         :param str severity: Event severity.
+        :param datetime.datetime ttl: Record TTL time.
         :return: List of relapsed events as :py:class:`mentat.idea.internal.Idea` objects.
         :rtype: list
         """
@@ -455,16 +457,17 @@ class StorageThresholdingCache(ThresholdingCache):
         except mentat.services.eventstorage.StorageIntegrityError:
             pass
 
-    def relapses(self, group_name, severity):
+    def relapses(self, group_name, severity, ttl):
         """
         Search for list of relapsed events for given group and severity.
 
         :param str group_name: Name of the abuse group.
         :param str severity: Event severity.
+        :param datetime.datetime ttl: Record TTL time.
         :return: List of relapsed events as :py:class:`mentat.idea.internal.Idea` objects.
         :rtype: list
         """
-        return self.eventservice.search_relapsed_events(group_name, severity)
+        return self.eventservice.search_relapsed_events(group_name, severity, ttl)
 
     def cleanup(self, ttl):
         """