using Ticket, delete Ticket_user

handlers/classes/Ticket_user.py

@@ -1,38 +0,0 @@
-class Ticket_user(object):
-    def __init__(
-            self,
-            id,
-            status,
-            title,
-            ticket_type,
-            created_at,
-            updated_at,
-            due_date,
-            priority,
-            created_by,
-            assigned_to
-    ):
-        self.id = id
-        self.status = status
-        self.title = title
-        self.ticket_type = ticket_type
-        self.created_at = created_at
-        self.updated_at = updated_at
-        self.due_date = due_date
-        self.priority = priority
-        self.created_by = created_by
-        self.assigned_to = assigned_to
-
-    def __str__(self):
-        return "{0}, {1}, {2}, {3}, {4}, {5}, {6}, {7}, {8}, {9}\n".format(
-            self.id,
-            self.status,
-            self.title,
-            self.ticket_type,
-            self.created_at,
-            self.updated_at,
-            self.due_date,
-            self.priority,
-            self.created_by,
-            self.assigned_to
-        )

handlers/depr/handlers/old_st_request_assigned.py

@@ -49,7 +49,7 @@ def status_changer_wait(period, localtask):
 
 def status_changer_process(ticket):
     bot.bot_log(botname + " " + str(datetime.now()) + " " + "Тикет в обработчике\n")
-    tickets_new = jsreq.requestGetTicket_user(token, config.API_URL + f"tickets/api/ticket_list/{ticket.id}")
+    tickets_new = jsreq.requestGetTicket(token, config.API_URL + f"tickets/api/ticket_list/{ticket.id}")
     # if ticket.id == 2103:
     #     for ticket_new in tickets_new:
     #         metaservice_admin(ticket_new,ticket.group)

handlers/depr/handlers/old_st_request_done.py

@@ -49,7 +49,7 @@ def status_changer_wait(period, localtask):
 
 def status_changer_process(ticket):
     bot.bot_log(botname + " " + str(datetime.now()) + " " + "Тикет в обработчике\n")
-    tickets_new = jsreq.requestGetTicket_user(token, config.API_URL + f"tickets/api/ticket_list/{ticket.id}")
+    tickets_new = jsreq.requestGetTicket(token, config.API_URL + f"tickets/api/ticket_list/{ticket.id}")
     # if ticket.id == 2103:
     #     for ticket_new in tickets_new:
     #         metaservice_admin(ticket_new,ticket.group)

handlers/depr/handlers/old_st_request_new.py

@@ -43,7 +43,7 @@ idle_value = 10
 
 
 def status_new_process(ticket):
-    tickets_new = jsreq.requestGetTicket_user(token, config.API_URL + f"tickets/api/ticket_list/{ticket.id}")
+    tickets_new = jsreq.requestGetTicket(token, config.API_URL + f"tickets/api/ticket_list/{ticket.id}")
     for ticket_new in tickets_new:
         send_to_user(ticket_new)
 

handlers/depr/handlers/old_st_request_wontfix.py

@@ -49,7 +49,7 @@ def status_changer_wait(period, localtask):
 
 def status_changer_process(ticket):
     bot.bot_log(botname + " " + str(datetime.now()) + " " + "Тикет в обработчике\n")
-    tickets_new = jsreq.requestGetTicket_user(token, config.API_URL + f"tickets/api/ticket_list/{ticket.id}")
+    tickets_new = jsreq.requestGetTicket(token, config.API_URL + f"tickets/api/ticket_list/{ticket.id}")
     # if ticket.id == 2103:
     #     for ticket_new in tickets_new:
     #         metaservice_admin(ticket_new,ticket.group)

handlers/depr/handlers/st_request_in_process.py

@@ -61,7 +61,7 @@ def process_in_progress_ticket(ticket, timeout, reminder_interval):
                 break
 
         # Проверяем, не изменился ли статус тикета
-        updated_ticket_list = jsreq.requestGetTicket_user(token, config.API_URL + f"tickets/api/ticket/{ticket.id}/")
+        updated_ticket_list = jsreq.requestGetTicket(token, config.API_URL + f"tickets/api/ticket/{ticket.id}/")
         if updated_ticket_list and updated_ticket_list[0].status != "IN PROCESS":
             break
 

handlers/jsonAndRequest.py

@@ -6,7 +6,7 @@ import config
 from classes.Answer import Answer
 from classes.Order import Order
 from classes.OrderTicket import OrderTicket
-from classes.Ticket_user import Ticket_user
+from classes.Ticket import Ticket
 
 
 # Функция преобразования json в объект класса Order
@@ -119,7 +119,7 @@ def requestGetList(auth_token, url):
     return startlist
 
 
-def requestGetTicket_user(auth_token, url):
+def requestGetTicket(auth_token, url):
     headers = {'Authorization': f'Token {auth_token}'}
     response = requests.get(url, headers=headers)
 
@@ -131,7 +131,7 @@ def requestGetTicket_user(auth_token, url):
     else:
         for i in tickettext:
             try:
-                ticket = Ticket_user(**i)
+                ticket = Ticket(**i)
                 startlist.append(ticket)
             except Exception as ex:
                 print(ex)

handlers/status_changer.py

@@ -49,7 +49,7 @@ def status_changer_wait(period, localtask):
 
 def status_changer_process(ticket):
     bot.bot_log(botname + " " + str(datetime.now()) + " " + "Тикет в обработчике\n")
-    tickets_new = jsreq.requestGetTicket_user(token, config.API_URL + f"tickets/api/ticket_list/{ticket.id}")
+    tickets_new = jsreq.requestGetTicket(token, config.API_URL + f"tickets/api/ticket_list/{ticket.id}")
     if ticket.id == 2103:
         for ticket_new in tickets_new:
             metaservice_admin(ticket_new, ticket.group)