rename interval count to interval attempts

handlers/classes/Ticket.py

@@ -1,5 +1,5 @@
 from datetime import datetime
-from config import DEFAULT_INTERVAL_COUNT
+from config import DEFAULT_INTERVAL_ATTEMPTS
 
 class Ticket(object):
     def __init__(
@@ -17,7 +17,7 @@ class Ticket(object):
             assigned_to=None,
             note=None,
 
-            interval_count: int = DEFAULT_INTERVAL_COUNT
+            interval_attempts: int = DEFAULT_INTERVAL_ATTEMPTS
     ):
         self.id = id
         self.status = status
@@ -32,7 +32,7 @@ class Ticket(object):
         self.assigned_to = assigned_to
         self.note = note
 
-        self.interval_count = interval_count
+        self.interval_attempts = interval_attempts
 
     def __str__(self):
         return "{0}, {1}, {2}, {3}, {4}, {5}, {6}, {7}, {8}, {9}".format(

handlers/config.py

@@ -34,4 +34,4 @@ API_URL = "https://testopen.sharix-app.org/"
 # LOG_DIR = "/var/log/"
 LOG_DIR = "./log/"
 
-DEFAULT_INTERVAL_COUNT = 10
+DEFAULT_INTERVAL_ATTEMPTS = 10

handlers/handlers/open_access_request_pending.py

@@ -32,7 +32,7 @@ proceed_to = [
     "open_service_request_forcemajeure@ej.sharix-app.org"
 ]
 
-INTERVAL_COUNT = 3
+INTERVAL_ATTEMPTS = 3
 # INTERVAL_TIME = 30 * 60  # 30 минут в секундах
 INTERVAL_TIME = 5 # Для проверки
 
@@ -59,10 +59,12 @@ def start_handler():
     tickets = get_fake_data()
 
     while(True):
+        # TODO: Придумать более надёжный механизм парарельной обработки тикетов
+        # А также более надёжный механизм удаления тикетов из массива
         if tickets:
             for ticket in tickets:
-                ticket.interval_count -= 1
-                if ticket.interval_count <= 0:
+                ticket.interval_attempts -= 1
+                if ticket.interval_attempts <= 0:
                     processing_interval_unlimited(ticket)
                 else:
                     processing(ticket)
@@ -98,12 +100,12 @@ def processing(ticket):
 
 def get_fake_data() -> List[Ticket]:
     return [
-        Ticket(0, "t", 0,0,0,0,0,0,0,0,0,"note",INTERVAL_COUNT - 2),
-        Ticket(1, "t", 0,1,0,0,0,0,0,0,0,"note",INTERVAL_COUNT + 1),
-        Ticket(2, "t", 0,2,0,0,0,0,0,0,0,"note",INTERVAL_COUNT - 1),
-        Ticket(3, "t", 0,3,0,0,0,0,0,0,0,"note",INTERVAL_COUNT + 2),
-        Ticket(4, "t", 0,4,0,0,0,0,0,0,0,"note",INTERVAL_COUNT + 1),
-        Ticket(5, "t", 0,5,0,0,0,0,0,0,0,"note",INTERVAL_COUNT - 1),
+        Ticket(0, "t", 0,0,0,0,0,0,0,0,0,"note",INTERVAL_ATTEMPTS - 2),
+        Ticket(1, "t", 0,1,0,0,0,0,0,0,0,"note",INTERVAL_ATTEMPTS + 1),
+        Ticket(2, "t", 0,2,0,0,0,0,0,0,0,"note",INTERVAL_ATTEMPTS - 1),
+        Ticket(3, "t", 0,3,0,0,0,0,0,0,0,"note",INTERVAL_ATTEMPTS + 2),
+        Ticket(4, "t", 0,4,0,0,0,0,0,0,0,"note",INTERVAL_ATTEMPTS + 1),
+        Ticket(5, "t", 0,5,0,0,0,0,0,0,0,"note",INTERVAL_ATTEMPTS - 1),
     ]
 
 # def get_token():

handlers/lib.py

@@ -1,5 +1,5 @@
 
 def filter_interval_tickets(tickets):
     """ Очистка тикетов, у которых закончились попытки """
-    return list(filter(lambda ticket: ticket.interval_count > 0, tickets))
+    return list(filter(lambda ticket: ticket.interval_attempts > 0, tickets))