review feedback

Author: artcz

intbot/core/bot/channel_router.py

@@ -9,7 +9,7 @@
     GithubRepositories,
     parse_github_webhook,
 )
-from core.integrations.zammad import ZammadGroups
+from core.integrations.zammad import ZammadConfig
 from core.models import Webhook
 from django.conf import settings
 
@@ -108,8 +108,8 @@ def github_router(wh: Webhook) -> DiscordChannel:
 
 def zammad_router(wh: Webhook) -> DiscordChannel:
     groups = {
-        ZammadGroups.helpdesk: Channels.helpdesk_channel,
-        ZammadGroups.billing: Channels.billing_channel,
+        ZammadConfig.helpdesk_group: Channels.helpdesk_channel,
+        ZammadConfig.billing_group: Channels.billing_channel,
     }
 
     if channel := groups.get(wh.extra["group"]):

intbot/core/integrations/zammad.py

@@ -5,10 +5,10 @@
 from pydantic import BaseModel
 
 
-class ZammadGroups:
-    billing = settings.ZAMMAD_GROUP_BILLING
-    helpdesk = settings.ZAMMAD_GROUP_HELPDESK
-
+class ZammadConfig:
+    url = settings.ZAMMAD_URL  # servicedesk.europython.eu
+    billing_group = settings.ZAMMAD_GROUP_BILLING
+    helpdesk_group = settings.ZAMMAD_GROUP_HELPDESK
 
 class ZammadGroup(BaseModel):
     id: int
@@ -92,19 +92,20 @@ def action(self):
         # first message that originally creates the ticket. However first time
         # we get a message, we will return "New ticket" and second time "New
         # message in the thread".
-        if self.article and len(self.ticket.article_ids) == 1:
-            # This means we have an article, and it's a first one, therefore a
-            # ticket is new.
-            return self.Actions.new_ticket_created
+        if self.article:
+            if len(self.ticket.article_ids) == 1:
+                # This means we have an article, and it's a first one, therefore a
+                # ticket is new.
+                return self.Actions.new_ticket_created
 
-        elif self.article and self.article.internal is True:
-            return self.Actions.new_internal_note
+            elif self.article.internal is True:
+                return self.Actions.new_internal_note
 
-        elif self.article and self.article.sender == "Customer":
-            return self.Actions.new_message_in_thread
+            elif self.article.sender == "Customer":
+                return self.Actions.new_message_in_thread
 
-        elif self.article and self.article.sender == "Agent":
-            return self.Actions.replied_in_thread
+            elif self.article.sender == "Agent":
+                return self.Actions.replied_in_thread
 
         elif not self.article:
             return self.Actions.updated_ticket
@@ -121,7 +122,7 @@ def group(self):
 
     @property
     def url(self):
-        return f"https://servicedesk.europython.eu/#ticket/zoom/{self.ticket.id}"
+        return f"https://{ZammadConfig.url}/#ticket/zoom/{self.ticket.id}"
 
     def to_discord_message(self):
         message = "{group}: {sender} {action} {details}".format

intbot/intbot/settings.py

@@ -175,6 +175,7 @@ def get(name) -> str:
 # Zammad
 ZAMMAD_WEBHOOK_SECRET_TOKEN = get("ZAMMAD_WEBHOOK_SECRET_TOKEN")
 
+ZAMMAD_URL = "servicedesk.europython.eu"
 ZAMMAD_GROUP_BILLING = get("ZAMMAD_GROUP_BILLING")
 ZAMMAD_GROUP_HELPDESK = get("ZAMMAD_GROUP_HELPDESK")