Merge pull request #30 from PinoutLTD/development

fix bug for ticket-done. add last occurred field

rrs_operator/src/odoo.py

@@ -1,7 +1,7 @@
-import base64
 import typing as tp
 
 from tenacity import *
+from datetime import datetime
 
 from helpers.logger import Logger
 from helpers.odoo import OdooHelper
@@ -12,6 +12,7 @@
 load_dotenv()
 ODOO_HELPDESK_NEW_STAGE_ID = os.getenv("ODOO_HELPDESK_NEW_STAGE_ID")
 ODOO_HELPDESK_INPROGRESS_STAGE_ID = os.getenv("ODOO_HELPDESK_INPROGRESS_STAGE_ID")
+ODOO_LOGS_LINK_FORMAT = os.getenv("ODOO_LOGS_LINK_FORMAT")
 
 
 class Odoo:
@@ -141,11 +142,12 @@ def find_ticket_with_source(self, source: str, email: str) -> int:
             return ticket_ids[0]
         self._logger.debug(f"No ticket found")
 
+    @retry(wait=wait_fixed(5))
     def get_hashes_from_ticket(self, ticket_id: int) -> list:
         self._logger.debug(f"Looking for ipfs hashes in ticket {ticket_id}")
         message_ids = self.helper.search(model="mail.message", search_domains=[("model", "=", "helpdesk.ticket"), ("res_id", "=", ticket_id)])
         messages = self.helper.read(model="mail.message", record_ids=[message_ids], fields=["id", "body"])
-        hashes = [msg["body"] for msg in messages if msg["body"].startswith("<p>Qm")]
+        hashes = [msg["body"] for msg in messages if msg["body"].startswith(f"<p>{ODOO_LOGS_LINK_FORMAT}Qm")]
         hashes = [format_hash(hash) for hash in hashes]
         return hashes
 
@@ -184,4 +186,20 @@ def get_and_update_description(self, ticket_id: int, new_description: str) -> bo
     @retry(wait=wait_fixed(5))
     def get_description_from_ticket(self, ticket_id: int) -> str:
         description = self.helper.read("helpdesk.ticket", [ticket_id], ["description"])[0]["description"]
-        return description
+        return description
+
+    @retry(wait=wait_fixed(5))
+    def set_last_occurred(self, ticket_id: int) -> bool:
+        current_datetime = datetime.now().strftime('%Y-%m-%d %H:%M:%S')
+        self._logger.debug(f"Updating last occurred for ticket {ticket_id}... Current date: {current_datetime}")
+        try: 
+            return self.helper.update(
+                "helpdesk.ticket",
+                ticket_id,
+                {
+                    "last_occurred": f"{current_datetime}",
+                },
+            )
+        except Exception as e:
+            self._logger.error(f"Couldn't update last occurred {e}")
+            raise Exception("Failed to update last occurred")

rrs_operator/src/ws_client.py

@@ -60,6 +60,7 @@ def _on_message(self, ws, message):
                         ticket_id = self.odoo.find_ticket_with_source(source, email)
                     if ticket_id:
                         self.odoo.get_and_increase_problem_counter(ticket_id)
+                        self.odoo.set_last_occurred(ticket_id)
                         current_description = self.odoo.get_description_from_ticket(ticket_id)
                         self._logger.debug(f"Current description: {current_description}")
                         if description in current_description:

template.env

@@ -15,4 +15,5 @@ ODOO_RRS_STATUS_PAID_ID=
 ODOO_HELPDESK_DONE_STAGE_ID=
 FLASK_PORT=5000
 ODOO_HELPDESK_NEW_STAGE_ID=
-ODOO_HELPDESK_INPROGRESS_STAGE_ID=
+ODOO_HELPDESK_INPROGRESS_STAGE_ID=
+ODOO_LOGS_LINK_FORMAT=