Skip to content

added zammad and discord configuration for other servicedesk groups #27

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 1 commit into from
Mar 22, 2025
Merged

added zammad and discord configuration for other servicedesk groups #27

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
14 changes: 14 additions & 0 deletions deploy/templates/app/intbot.env.example
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -28,6 +28,16 @@ DISCORD_HELPDESK_CHANNEL_ID="DISCORD_HELPDESK_CHANNEL_ID"
DISCORD_HELPDESK_CHANNEL_NAME="DISCORD_HELPDESK_CHANNEL_NAME"
DISCORD_BILLING_CHANNEL_ID="DISCORD_BILLING_CHANNEL_ID"
DISCORD_BILLING_CHANNEL_NAME="DISCORD_BILLING_CHANNEL_NAME"
DISCORD_BILLING_CHANNEL_ID="DISCORD_BILLING_CHANNEL_ID"
DISCORD_BILLING_CHANNEL_NAME="DISCORD_BILLING_CHANNEL_NAME"
DISCORD_PROGRAMME_CHANNEL_ID="DISCORD_PROGRAMME_CHANNEL_ID"
DISCORD_PROGRAMME_CHANNEL_NAME="DISCORD_PROGRAMME_CHANNEL_NAME"
DISCORD_FINAID_CHANNEL_ID="DISCORD_FINAID_CHANNEL_ID"
DISCORD_FINAID_CHANNEL_NAME="DISCORD_FINAID_CHANNEL_NAME"
DISCORD_SPONSORS_CHANNEL_ID="DISCORD_SPONSORS_CHANNEL_ID"
DISCORD_SPONSORS_CHANNEL_NAME="DISCORD_SPONSORS_CHANNEL_NAME"
DISCORD_GRANTS_CHANNEL_ID="DISCORD_GRANTS_CHANNEL_ID"
DISCORD_GRANTS_CHANNEL_NAME="DISCORD_GRANTS_CHANNEL_NAME"

# Webhooks
WEBHOOK_INTERNAL_TOKEN="asdf"
Expand All @@ -44,3 +54,7 @@ GITHUB_EM_PROJECT_ID="GITHUB_EM_PROJECT_ID"
ZAMMAD_WEBHOOK_SECRET_TOKEN="zammad-shared-secret-goes-here"
ZAMMAD_GROUP_BILLING="zammad-billing-group-name-goes-here"
ZAMMAD_GROUP_HELPDESK="zammad-helpdesk-group-name-goes-here"
ZAMMAD_GROUP_PROGRAMME="zammad-programme-group-name-goes-here"
ZAMMAD_GROUP_FINAID="zammad-finaid-group-name-goes-here"
ZAMMAD_GROUP_SPONSORS="zammad-sponsors-group-name-goes-here"
ZAMMAD_GROUP_GRANTS="zammad-grants-group-name-goes-here"
20 changes: 20 additions & 0 deletions intbot/core/bot/channel_router.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -60,6 +60,22 @@ class Channels:
channel_id=settings.DISCORD_HELPDESK_CHANNEL_ID,
channel_name=settings.DISCORD_HELPDESK_CHANNEL_NAME,
)
programme_channel = DiscordChannel(
channel_id=settings.DISCORD_PROGRAMME_CHANNEL_ID,
channel_name=settings.DISCORD_PROGRAMME_CHANNEL_NAME,
)
finaid_channel = DiscordChannel(
channel_id=settings.DISCORD_FINAID_CHANNEL_ID,
channel_name=settings.DISCORD_FINAID_CHANNEL_NAME,
)
sponsors_channel = DiscordChannel(
channel_id=settings.DISCORD_SPONSORS_CHANNEL_ID,
channel_name=settings.DISCORD_SPONSORS_CHANNEL_NAME,
)
grants_channel = DiscordChannel(
channel_id=settings.DISCORD_GRANTS_CHANNEL_ID,
channel_name=settings.DISCORD_GRANTS_CHANNEL_NAME,
)


def discord_channel_router(wh: Webhook) -> DiscordChannel:
Expand Down Expand Up @@ -110,6 +126,10 @@ def zammad_router(wh: Webhook) -> DiscordChannel:
groups = {
ZammadConfig.helpdesk_group: Channels.helpdesk_channel,
ZammadConfig.billing_group: Channels.billing_channel,
ZammadConfig.programme_group: Channels.programme_channel,
ZammadConfig.finaid_group: Channels.finaid_channel,
ZammadConfig.sponsors_group: Channels.sponsors_channel,
ZammadConfig.grants_group: Channels.grants_channel,
}

if channel := groups.get(wh.extra["group"]):
Expand Down
4 changes: 4 additions & 0 deletions intbot/core/integrations/zammad.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,6 +9,10 @@ class ZammadConfig:
url = settings.ZAMMAD_URL # servicedesk.europython.eu
billing_group = settings.ZAMMAD_GROUP_BILLING
helpdesk_group = settings.ZAMMAD_GROUP_HELPDESK
programme_group = settings.ZAMMAD_GROUP_PROGRAMME
finaid_group = settings.ZAMMAD_GROUP_FINAID
sponsors_group = settings.ZAMMAD_GROUP_SPONSORS
grants_group = settings.ZAMMAD_GROUP_GRANTS

class ZammadGroup(BaseModel):
id: int
Expand Down
12 changes: 12 additions & 0 deletions intbot/intbot/settings.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -163,6 +163,14 @@ def get(name) -> str:
DISCORD_HELPDESK_CHANNEL_NAME = get("DISCORD_HELPDESK_CHANNEL_NAME")
DISCORD_BILLING_CHANNEL_ID = get("DISCORD_BILLING_CHANNEL_ID")
DISCORD_BILLING_CHANNEL_NAME = get("DISCORD_BILLING_CHANNEL_NAME")
DISCORD_PROGRAMME_CHANNEL_ID = get("DISCORD_PROGRAMME_CHANNEL_ID")
DISCORD_PROGRAMME_CHANNEL_NAME = get("DISCORD_PROGRAMME_CHANNEL_NAME")
DISCORD_FINAID_CHANNEL_ID = get("DISCORD_FINAID_CHANNEL_ID")
DISCORD_FINAID_CHANNEL_NAME = get("DISCORD_FINAID_CHANNEL_NAME")
DISCORD_SPONSORS_CHANNEL_ID = get("DISCORD_SPONSORS_CHANNEL_ID")
DISCORD_SPONSORS_CHANNEL_NAME = get("DISCORD_SPONSORS_CHANNEL_NAME")
DISCORD_GRANTS_CHANNEL_ID = get("DISCORD_GRANTS_CHANNEL_ID")
DISCORD_GRANTS_CHANNEL_NAME = get("DISCORD_GRANTS_CHANNEL_NAME")

# Github
GITHUB_API_TOKEN = get("GITHUB_API_TOKEN")
Expand All @@ -178,6 +186,10 @@ def get(name) -> str:
ZAMMAD_URL = "servicedesk.europython.eu"
ZAMMAD_GROUP_BILLING = get("ZAMMAD_GROUP_BILLING")
ZAMMAD_GROUP_HELPDESK = get("ZAMMAD_GROUP_HELPDESK")
ZAMMAD_GROUP_PROGRAMME = get("ZAMMAD_GROUP_PROGRAMME")
ZAMMAD_GROUP_FINAID = get("ZAMMAD_GROUP_FINAID")
ZAMMAD_GROUP_SPONSORS = get("ZAMMAD_GROUP_SPONSORS")
ZAMMAD_GROUP_GRANTS = get("ZAMMAD_GROUP_GRANTS")



Expand Down