aa-killtracker 0.12.1__py3-none-any.whl → 0.14.0__py3-none-any.whl

{aa_killtracker-0.12.1.dist-info → aa_killtracker-0.14.0.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: aa-killtracker
-Version: 0.12.1
+Version: 0.14.0
 Summary: "An app for running killmail trackers with Alliance Auth and Discord.
 Author-email: Erik Kalkoken <kalkoken87@gmail.com>
 Requires-Python: >=3.8
@@ -8,6 +8,7 @@ Description-Content-Type: text/markdown
 Classifier: Environment :: Web Environment
 Classifier: Framework :: Django
 Classifier: Framework :: Django :: 4.0
+Classifier: Framework :: Django :: 4.2
 Classifier: Intended Audience :: End Users/Desktop
 Classifier: License :: OSI Approved :: MIT License
 Classifier: Operating System :: OS Independent
@@ -26,7 +27,7 @@ Requires-Dist: django-eveuniverse>=1.3
 Requires-Dist: redis-simple-mq>=0.5
 Project-URL: Home, https://gitlab.com/ErikKalkoken/aa-killtracker
 
-# killtracker
+# Killtracker
 
 An app for running killmail trackers with Alliance Auth and Discord.
 
@@ -99,19 +100,45 @@ pip install aa-killtracker
 
 ### Step 3 - Configure settings
 
-Configure your Auth settings (`local.py`) as follows:
+Configure your AA settings (`local.py`) as follows:
 
-- Add `'killtracker'` to `INSTALLED_APPS`
-- Add below lines to your settings file:
+### Installed apps
+
+Add `'killtracker'` to `INSTALLED_APPS`.
+
+### Killtracker configuration
+
+Add below lines to your settings file:
 
 ```python
+# aa-killtracker
 CELERYBEAT_SCHEDULE['killtracker_run_killtracker'] = {
     'task': 'killtracker.tasks.run_killtracker',
     'schedule': crontab(minute='*/1'),
 }
+KILLTRACKER_QUEUE_ID = ""  # Put your unique queue ID here
+```
+
+### Queue ID
+
+Please note that the queue ID must be globally unique for all users of the zKillboard API, so choose carefully.
+
+We suggest to use your alliance name or alliance tag (without any spaces and special characters) as queue ID.
+
+We recommend using only characters (upper and lower case) and numbers,
+but no spaces or any special characters when choosing your ID.
+
+Example (don't use this exact example):
+
+```Python
+KILLTRACKER_QUEUE_ID = "Voltron9000"
 ```
 
-- Optional: Add additional settings if you want to change any defaults. See [Settings](#settings) for the full list.
+If you are running multiple instances of Killtracker please choose a different queue ID for each of them.
+
+### Additional settings (optional)
+
+Add additional settings if you want to change any defaults. See [Settings](#settings) for the full list.
 
 ### Step 4 - Finalize installation
 
@@ -212,6 +239,7 @@ Name | Description | Default
 `KILLTRACKER_KILLMAIL_MAX_AGE_FOR_TRACKER`| Ignore killmails that are older than the given number in minutes. Sometimes killmails appear belated on ZKB, this feature ensures they don't create new alerts | `60`
 `KILLTRACKER_MAX_KILLMAILS_PER_RUN`| Maximum number of killmails retrieved from ZKB by task run. This value should be set such that the task that fetches new killmails from ZKB every minute will reliable finish within one minute. To test this run a "Catch all" tracker and see how many killmails your system is capable of processing. Note that you can get that information from the worker's log file. It will look something like this: `Total killmails received from ZKB in 49 secs: 251`   | `250`
 `KILLTRACKER_PURGE_KILLMAILS_AFTER_DAYS`| Killmails older than set number of days will be purged from the database. If you want to keep all killmails set this to 0. Note that this setting is only relevant if you have storing killmails enabled.  | `30`
-`KILLTRACKER_WEBHOOK_SET_AVATAR`| Wether app sets the name and avatar icon of a webhook. When False the webhook will use it's own values as set on the platform  | `True`
+`KILLTRACKER_QUEUE_ID`| Unique ID used to identify this server when fetching killmails from zKillboard. This setting is mandatory.  | ``
 `KILLTRACKER_STORING_KILLMAILS_ENABLED`| If set to true Killtracker will automatically store all received killmails in the local database. This can be useful if you want to run analytics on killmails etc. However, please note that Killtracker itself currently does not use stored killmails in any way.  | `False`
+`KILLTRACKER_WEBHOOK_SET_AVATAR`| Wether app sets the name and avatar icon of a webhook. When False the webhook will use it's own values as set on the platform  | `True`
 

{aa_killtracker-0.12.1.dist-info → aa_killtracker-0.14.0.dist-info}/RECORD

@@ -1,6 +1,6 @@
-killtracker/__init__.py,sha256=V4m-5KJOKyodZ4W8yOfYnVSdPSXA-9ROan6IGpI_Axs,356
+killtracker/__init__.py,sha256=qmlkoj0QbgRePuQ6rH64unfUejmQPj_Ebs9EzZSrYAs,356
 killtracker/admin.py,sha256=CHudWND2slzqCt046xdf2lzhFaAuEsNKiF7ptaXm1wQ,13696
-killtracker/app_settings.py,sha256=4Hzd2BhOoNTZ5RakJ_Hd4PMQPdLSyKN2SE-dIs_iaBY,2839
+killtracker/app_settings.py,sha256=aN93musXOQ0AAVVWz67oSy9ryEiNXrcCCz6G2NlJ5QQ,3608
 killtracker/apps.py,sha256=CfmDvqVXmoy6sumpjXKldhSlJt5xDiQW3XLBfCqH3-c,307
 killtracker/constants.py,sha256=W7-VARE3B4_sdzV_9k7qunUzlxTcdSAeSp_ZJVnbUhw,2514
 killtracker/exceptions.py,sha256=aFY6qxQOta1V-qvgKp19Cgy6M16O7Si8moc2205OsX0,846
@@ -10,7 +10,7 @@ killtracker/providers.py,sha256=smkZe_rKHkZeWFzJ0RhIhJVcbrZUpLYR5fKCge-dpXY,348
 killtracker/tasks.py,sha256=u_ZAOEeFZWW6qpWcB0HCzgbN0VjA1ZZDHdKPJGHKl0U,7884
 killtracker/core/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 killtracker/core/discord_messages.py,sha256=mOKiMWq-3WnaSUFbfgVmlkAedGTZ7OWcVxLp7n58-Z0,14132
-killtracker/core/killmails.py,sha256=ahppV9_MPi-0uPVo1brQflu9h5osK_uLzWwxLa7KveM,19734
+killtracker/core/killmails.py,sha256=V8mXnp0rVqS3EcHgwU4BWq_h900B0dfGbdgAqvPOTSI,20306
 killtracker/management/commands/killtracker_load_eve.py,sha256=5P2wr6LU-EMl9_gG-DKP2yw3eFXOU7ApeuGAWEbvCKk,1159
 killtracker/migrations/0001_initial_new.py,sha256=WszI5DmNFtk45IZ2Zul3_Ak-VXmye9ffJKFAsGIxoXA,27818
 killtracker/migrations/0001_squashed_all.py,sha256=KXwOcRayjGGGmleg7-aTcXeIi-92Mn4BaGkEY3iE9Vc,26221
@@ -33,19 +33,19 @@ killtracker/static/killtracker/killtracker_logo.png,sha256=3jc9zmYHqP60Np5piP5Rf
 killtracker/static/killtracker/zkb_icon.png,sha256=wuVfgyTbTs9qS4KGbDAH3Q9KVPgHqYV5eaVrjEmTjsE,328
 killtracker/templates/admin/killtracker/tracker/killmail_test.html,sha256=TI2ON8qf9pW4rX6G7pT990ZadkipwncQgGUC0FPcWQY,649
 killtracker/tests/__init__.py,sha256=CEt5qqp6ptDrx1lwuA6epZ5bzh1CwUJYXeMZqWK9jT0,278
-killtracker/tests/test_admin.py,sha256=Yj3CQ2ZaOq0PnsP6X_cC6iZEJ9gPdna6Oyx84G2-Fmg,5642
+killtracker/tests/test_admin.py,sha256=XFAlF_Q4h5Z_agkmRtB30GmCayqQPblLolFrN41xu7Q,5659
 killtracker/tests/test_admin_2.py,sha256=rP0EscM9qUil_ZuXute3R8TQY2P5XSjmxHLbziCGcVw,1140
 killtracker/tests/test_exceptions.py,sha256=wheTwm0JOBqYVI-DJM4KK2usFAZT1Q-O52VMOnSAz8Y,326
-killtracker/tests/test_integration.py,sha256=8ISULhhkvymFJ2DHgl3Xpr8CihXBuUpESI_4NB23Bz4,3155
+killtracker/tests/test_integration.py,sha256=EX0IQGU_Vwsmjeoqeprg13VuW8AT9I8CT1bm3_cvfPs,3226
 killtracker/tests/test_tasks.py,sha256=ZDoCUBd-1kSOKrvSeTrlDaSGFmzHieT5ef0iBz6nr2I,13929
 killtracker/tests/core/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
-killtracker/tests/core/test_discord_messages_1.py,sha256=dXEj36ejOtf1t6E9gM1GgpOHd77NIxDVlNf4rOrPzxc,3054
-killtracker/tests/core/test_discord_messages_2.py,sha256=Dm1hzJOg3E_yfkGaU0dbvjucmm5pVjjclOmfO7NDapI,4743
-killtracker/tests/core/test_killmails.py,sha256=mZzeED2rd2vXHdV5NmPxC0Wt8qkvNz6OX3l046BnEi8,11647
+killtracker/tests/core/test_discord_messages_1.py,sha256=1cYpj4E9pNqQOeE7yWeV1mme-JYGIHfSIibOauEHi88,3101
+killtracker/tests/core/test_discord_messages_2.py,sha256=AppA_FUFQA5I35UKjaEwn_ZQcnscqillR1SIo1unwJg,4774
+killtracker/tests/core/test_killmails.py,sha256=GdU5glj9as4l17GQpzZvNCaXzLM2fP2LLhbF7JOUogU,14148
 killtracker/tests/models/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
-killtracker/tests/models/test_killmails.py,sha256=qSEClhyrqmvsU2P1DiCUonfnl5NDUu50aReQIsCz9CQ,8233
-killtracker/tests/models/test_trackers_1.py,sha256=KgpoEE7IrfRGe1UMTA7geFb-sOWkU8Ulo5iJrgA_LKw,35211
-killtracker/tests/models/test_trackers_2.py,sha256=ry4Bb3ab3OTC7Df9hTow1UuKwXULpDrF_qhbGCV8uPo,5373
+killtracker/tests/models/test_killmails.py,sha256=0ytwIGbTPb1OTzmK8B9VnR1ylxMuaYtp2tvCXzNOwNc,8293
+killtracker/tests/models/test_trackers_1.py,sha256=h9RNQ8h4bCf_LsbyO-wycbFn3WcmADZS4qnmo2B1RMo,35242
+killtracker/tests/models/test_trackers_2.py,sha256=FmtaWBjV32NlIjYPaG5Kh87oES5ChoDMVJ4ol2uWopE,5404
 killtracker/tests/models/test_webhook.py,sha256=E4BgmQw9mI5ZenV6ncYHbBonlEeWvvdilAS8IKFkbjw,5246
 killtracker/tests/testdata/__init__.py,sha256=9aQhf8V-DseZMWjJ_QMXOba6CypoHFSVpYRZEUh-oFc,212
 killtracker/tests/testdata/create_eveuniverse.py,sha256=Ewr5OBiQwjK1kwDCRh3A3f0Z-CCPi8Gp8dpsPgVAU4A,966
@@ -59,7 +59,7 @@ killtracker/tests/testdata/killmails.json,sha256=HKfpXQJ_ikymBSewh4wWixYpLwC3kNB
 killtracker/tests/testdata/load_eveuniverse.py,sha256=FitVc12E_ob56ezK5Y1q07Kbyc7N8poHiCNaLRGU4Jg,388
 killtracker/tools/drop_tables_killtracker.sql,sha256=fJrGY23NKRunpYC3hI-klFkWub4sBuhfP8TaT__zjPg,1726
 killtracker/tools/generate_conditions_text.py,sha256=CiXBtaH2KY6JHpuxNlGmxLI6GsvxKKBX5xhXsSz3Rno,768
-aa_killtracker-0.12.1.dist-info/LICENSE,sha256=XZiwB_S_40_HhnvLg5xvtBb3g1oGjPrk0rpFwk8iInE,1070
-aa_killtracker-0.12.1.dist-info/WHEEL,sha256=EZbGkh7Ie4PoZfRQ8I0ZuP9VklN_TvcZ6DSE5Uar4z4,81
-aa_killtracker-0.12.1.dist-info/METADATA,sha256=wi0FJgujuWNYApqjRCeX37PbzxRh6MR8rVatiOXuc2c,12484
-aa_killtracker-0.12.1.dist-info/RECORD,,
+aa_killtracker-0.14.0.dist-info/LICENSE,sha256=XZiwB_S_40_HhnvLg5xvtBb3g1oGjPrk0rpFwk8iInE,1070
+aa_killtracker-0.14.0.dist-info/WHEEL,sha256=EZbGkh7Ie4PoZfRQ8I0ZuP9VklN_TvcZ6DSE5Uar4z4,81
+aa_killtracker-0.14.0.dist-info/METADATA,sha256=3RNa9LwqMBs6kQUdcSusm5qm883oTXuz1z1brXzRxqA,13380
+aa_killtracker-0.14.0.dist-info/RECORD,,

killtracker/__init__.py

@@ -3,7 +3,7 @@
 # pylint: disable = invalid-name
 default_app_config = "killtracker.apps.KillmailsConfig"
 
-__version__ = "0.12.1"
+__version__ = "0.14.0"
 __title__ = "Killtracker"
 
 APP_NAME = "aa-killtracker"

killtracker/app_settings.py

@@ -2,77 +2,100 @@
 
 from app_utils.app_settings import clean_setting
 
-# Timeout for lock to ensure atomic access to ZKB RedisQ
 KILLTRACKER_REDISQ_LOCK_TIMEOUT = clean_setting("KILLTRACKER_REDISQ_LOCK_TIMEOUT", 5)
+"""Timeout for lock to ensure atomic access to ZKB RedisQ."""
 
-# ignore killmails that are older than the given number in minutes
-# sometimes killmails appear belated on ZKB,
-# this feature ensures they don't create new alerts
 KILLTRACKER_KILLMAIL_MAX_AGE_FOR_TRACKER = clean_setting(
     "KILLTRACKER_KILLMAIL_MAX_AGE_FOR_TRACKER", 60
 )
+"""Ignore killmails that are older than the given number in minutes
+sometimes killmails appear belated on ZKB,
+this feature ensures they don't create new alerts.
+"""
 
-# Maximum number of killmails retrieved from ZKB by task run
 KILLTRACKER_MAX_KILLMAILS_PER_RUN = clean_setting(
     "KILLTRACKER_MAX_KILLMAILS_PER_RUN", 200
 )
+"""Maximum number of killmails retrieved from ZKB by task run."""
 
-# Killmails older than set number of days will be purged from the database.
-# If you want to keep all killmails set this to 0.
 KILLTRACKER_PURGE_KILLMAILS_AFTER_DAYS = clean_setting(
     "KILLTRACKER_PURGE_KILLMAILS_AFTER_DAYS", 30
 )
+"""Killmails older than set number of days will be purged from the database.
+If you want to keep all killmails set this to 0.
+"""
+
+KILLTRACKER_QUEUE_ID = clean_setting("KILLTRACKER_QUEUE_ID", "")
+"""Unique ID used to identify this server when fetching killmails from zKillboard.
+
+Please note that the queue ID must be globally unique for all users of the zKillboard API, so choose carefully.
+
+We recommend using only characters (upper and lower case) and numbers,
+but no spaces or any special characters when choosing your ID.
+
+Example: ``"Voltron9000"`` (don't use this exact example)
+
+We suggest to use your alliance or corporation name (without spaces and special characters) as queue ID.
+
+If you are running multiple instances of Killtracker please choose a different queue ID for each of them.
+
+This setting is mandatory.
+"""
+
 
-# whether killmails retrieved from ZKB are stored in the database
 KILLTRACKER_STORING_KILLMAILS_ENABLED = clean_setting(
     "KILLTRACKER_STORING_KILLMAILS_ENABLED", False
 )
+"""Whether killmails retrieved from ZKB are stored in the database."""
 
-# Wether app sets the name and avatar icon of a webhook.
-# When False the webhook will use it's own values as set on the platform
 KILLTRACKER_WEBHOOK_SET_AVATAR = clean_setting("KILLTRACKER_WEBHOOK_SET_AVATAR", True)
+"""Wether app sets the name and avatar icon of a webhook.
+When False the webhook will use it's own values as set on the platform.
+"""
 
-
-# Wether NPC types (e.g. Guristas Assaulter) can be selected as attacker types
-# when creating trackers
 KILLTRACKER_SHOW_NPC_TYPES = clean_setting("KILLTRACKER_SHOW_NPC_TYPES", True)
+"""Wether NPC types (e.g. Guristas Assaulter) can be selected as attacker types
+when creating trackers.
+"""
+
 
 #####################
 # INTERNAL SETTINGS
 
-# Max duration to wait for new killmails from redisq in seconds
 KILLTRACKER_REDISQ_TTW = clean_setting("KILLTRACKER_REDISQ_TTW", 5)
+"""Max duration to wait for new killmails from redisq in seconds."""
 
-# Tasks hard timeout
 KILLTRACKER_TASKS_TIMEOUT = clean_setting("KILLTRACKER_TASKS_TIMEOUT", 1_800)
+"""Tasks hard timeout."""
 
-# delay in seconds between every message sent to Discord
-# this needs to be >= 1 to prevent 429 Too Many Request errors
 KILLTRACKER_DISCORD_SEND_DELAY = clean_setting(
     "KILLTRACKER_DISCORD_SEND_DELAY", default_value=2, min_value=1, max_value=900
 )
+"""Delay in seconds between every message sent to Discord
+this needs to be >= 1 to prevent 429 Too Many Request errors.
+"""
 
-# Maximum retries when generating a message from a killmail
 KILLTRACKER_GENERATE_MESSAGE_MAX_RETRIES = clean_setting(
     "KILLTRACKER_GENERATE_MESSAGE_MAX_RETRIES", 3
 )
+"""Maximum retries when generating a message from a killmail."""
 
-# Delay when retrying to generate a message in seconds
 KILLTRACKER_GENERATE_MESSAGE_RETRY_COUNTDOWN = clean_setting(
     "KILLTRACKER_GENERATE_MESSAGE_RETRY_COUNTDOWN", 10
 )
+"""Delay when retrying to generate a message in seconds."""
 
-# Cache duration for objects in tasks in seconds
 KILLTRACKER_TASK_OBJECTS_CACHE_TIMEOUT = clean_setting(
     "KILLTRACKER_TASK_OBJECTS_CACHE_TIMEOUT", 60
 )
+"""Cache duration for objects in tasks in seconds."""
 
-# Minimum delay when retrying a task
 KILLTRACKER_TASK_MINIMUM_RETRY_DELAY = clean_setting(
     "KILLTRACKER_TASK_MINIMUM_RETRY_DELAY", default_value=0.05
 )
+"""Minimum delay when retrying a task."""
 
-# Max lifetime of killmails in temporary storage in seconds
 KILLTRACKER_STORAGE_KILLMAILS_LIFETIME = clean_setting(
     "KILLTRACKER_STORAGE_KILLMAILS_LIFETIME", 3_600 * 1
 )
+"""Max lifetime of killmails in temporary storage in seconds."""

killtracker/core/killmails.py

@@ -8,6 +8,7 @@ from dataclasses import asdict, dataclass
 from datetime import datetime
 from http import HTTPStatus
 from typing import List, Optional, Set
+from urllib.parse import quote_plus
 
 import requests
 from dacite import DaciteError, from_dict
@@ -16,6 +17,7 @@ from simplejson.errors import JSONDecodeError
 
 from django.conf import settings
 from django.core.cache import cache
+from django.core.exceptions import ImproperlyConfigured
 from django.utils.dateparse import parse_datetime
 from eveuniverse.models import EveType
 
@@ -26,6 +28,7 @@ from app_utils.logging import LoggerAddTag
 
 from killtracker import USER_AGENT_TEXT, __title__
 from killtracker.app_settings import (
+    KILLTRACKER_QUEUE_ID,
     KILLTRACKER_REDISQ_LOCK_TIMEOUT,
     KILLTRACKER_REDISQ_TTW,
     KILLTRACKER_STORAGE_KILLMAILS_LIFETIME,
@@ -43,6 +46,8 @@ REQUESTS_TIMEOUT = (5, 30)
 MAIN_MINIMUM_COUNT = 2
 MAIN_MINIMUM_SHARE = 0.25
 
+# TODO: Factor out logic for accessing the API to another module
+
 
 @dataclass
 class _KillmailBase:
@@ -385,15 +390,27 @@ class Killmail(_KillmailBase):
 
         Returns None if no killmail is received.
         """
-        logger.info("Trying to fetch killmail from ZKB RedisQ...")
+        if not KILLTRACKER_QUEUE_ID:
+            raise ImproperlyConfigured(
+                "You need to define a queue ID in your settings."
+            )
+
+        if "," in KILLTRACKER_QUEUE_ID:
+            raise ImproperlyConfigured("A queue ID must not contains commas.")
+
         redis = get_redis_client()
+        params = {
+            "queueID": quote_plus(KILLTRACKER_QUEUE_ID),
+            "ttw": KILLTRACKER_REDISQ_TTW,
+        }
         try:
+            logger.info("Trying to fetch killmail from ZKB RedisQ...")
             with redis.lock(
                 cls.lock_key(), blocking_timeout=KILLTRACKER_REDISQ_LOCK_TIMEOUT
             ):
                 response = requests.get(
                     ZKB_REDISQ_URL,
-                    params={"ttw": KILLTRACKER_REDISQ_TTW},
+                    params=params,
                     timeout=REQUESTS_TIMEOUT,
                     headers={"User-Agent": USER_AGENT_TEXT},
                 )
@@ -407,7 +424,9 @@ class Killmail(_KillmailBase):
         if response.status_code == HTTPStatus.TOO_MANY_REQUESTS:
             logger.error("429 Client Error: Too many requests: %s", response.text)
             return None
+
         response.raise_for_status()
+
         try:
             data = response.json()
         except JSONDecodeError:

killtracker/tests/core/test_discord_messages_1.py

@@ -3,15 +3,14 @@ import dhooks_lite
 from app_utils.testing import NoSocketsTestCase
 
 from killtracker.core import discord_messages
-
-from ..testdata.factories import (
+from killtracker.tests.testdata.factories import (
     EveEntityVariant,
     KillmailFactory,
     TrackerFactory,
     random_eve_entity,
 )
-from ..testdata.helpers import load_eve_entities
-from ..testdata.load_eveuniverse import load_eveuniverse
+from killtracker.tests.testdata.helpers import load_eve_entities
+from killtracker.tests.testdata.load_eveuniverse import load_eveuniverse
 
 
 class TestCreateEmbed(NoSocketsTestCase):

killtracker/tests/core/test_discord_messages_2.py

@@ -10,9 +10,8 @@ from app_utils.django import app_labels
 
 from killtracker.core.killmails import Killmail
 from killtracker.models import Tracker
-
-from ..testdata.factories import TrackerFactory
-from ..testdata.helpers import LoadTestDataMixin, load_killmail
+from killtracker.tests.testdata.factories import TrackerFactory
+from killtracker.tests.testdata.helpers import LoadTestDataMixin, load_killmail
 
 DISCORD_MESSAGES_PATH = "killtracker.core.discord_messages"
 

killtracker/tests/core/test_killmails.py

@@ -6,6 +6,7 @@ import requests_mock
 from redis.exceptions import LockError
 
 from django.core.cache import cache
+from django.core.exceptions import ImproperlyConfigured
 from django.test import TestCase
 from django.utils.dateparse import parse_datetime
 from django.utils.timezone import now
@@ -20,18 +21,19 @@ from killtracker.core.killmails import (
     _EntityCount,
 )
 from killtracker.exceptions import KillmailDoesNotExist
-
-from .. import CacheStub
-from ..testdata.factories import KillmailFactory
-from ..testdata.helpers import killmails_data, load_killmail
+from killtracker.tests import CacheStub
+from killtracker.tests.testdata.factories import KillmailFactory
+from killtracker.tests.testdata.helpers import killmails_data, load_killmail
 
 MODULE_PATH = "killtracker.core.killmails"
 unittest.util._MAX_LENGTH = 1000
+requests_mock.mock.case_sensitive = True
 
 
 @requests_mock.Mocker()
 @patch(MODULE_PATH + ".get_redis_client")
 class TestCreateFromZkbRedisq(NoSocketsTestCase):
+    @patch(MODULE_PATH + ".KILLTRACKER_QUEUE_ID", "dummy")
     def test_should_return_killmail(self, requests_mocker, mock_redis):
         # given
         requests_mocker.register_uri(
@@ -71,6 +73,7 @@ class TestCreateFromZkbRedisq(NoSocketsTestCase):
         self.assertFalse(killmail.zkb.is_solo)
         self.assertFalse(killmail.zkb.is_awox)
 
+    @patch(MODULE_PATH + ".KILLTRACKER_QUEUE_ID", "dummy")
     def test_should_return_none_when_zkb_returns_empty_package(
         self, requests_mocker, mock_redis
     ):
@@ -83,6 +86,7 @@ class TestCreateFromZkbRedisq(NoSocketsTestCase):
         # then
         self.assertIsNone(killmail)
 
+    @patch(MODULE_PATH + ".KILLTRACKER_QUEUE_ID", "dummy")
     def test_should_handle_zkb_data_has_no_solar_system(
         self, requests_mocker, mock_redis
     ):
@@ -98,6 +102,7 @@ class TestCreateFromZkbRedisq(NoSocketsTestCase):
         # then
         self.assertIsNotNone(killmail)
 
+    @patch(MODULE_PATH + ".KILLTRACKER_QUEUE_ID", "dummy")
     def test_should_return_none_when_zkb_returns_429_error(
         self, requests_mocker, mock_redis
     ):
@@ -110,6 +115,7 @@ class TestCreateFromZkbRedisq(NoSocketsTestCase):
         # then
         self.assertIsNone(killmail)
 
+    @patch(MODULE_PATH + ".KILLTRACKER_QUEUE_ID", "dummy")
     def test_should_return_none_when_zkb_returns_general_error(
         self, requests_mocker, mock_redis
     ):
@@ -127,6 +133,7 @@ You can only have one request to listen.php in flight at any time, otherwise you
         # then
         self.assertIsNone(killmail)
 
+    @patch(MODULE_PATH + ".KILLTRACKER_QUEUE_ID", "dummy")
     def test_should_return_none_when_zkb_does_not_return_json(
         self, requests_mocker, mock_redis
     ):
@@ -139,6 +146,7 @@ You can only have one request to listen.php in flight at any time, otherwise you
         # then
         self.assertIsNone(killmail)
 
+    @patch(MODULE_PATH + ".KILLTRACKER_QUEUE_ID", "dummy")
     def test_should_return_none_if_lock_not_acquired(self, requests_mocker, mock_redis):
         # given
         mock_redis.return_value.lock.side_effect = LockError
@@ -147,6 +155,56 @@ You can only have one request to listen.php in flight at any time, otherwise you
         # then
         self.assertIsNone(killmail)
 
+    @patch(MODULE_PATH + ".KILLTRACKER_QUEUE_ID", "Voltron9000")
+    def test_should_have_queue_id_in_request(self, requests_mocker, mock_redis):
+        # given
+        requests_mocker.register_uri(
+            "GET", ZKB_REDISQ_URL, status_code=200, json={"package": None}
+        )
+        # when
+        Killmail.create_from_zkb_redisq()
+        # then
+        qs = requests_mocker.last_request.qs
+        self.assertIn("queueID", qs)
+        queue_id = qs["queueID"]
+        self.assertEqual(len(queue_id), 1)
+        self.assertEqual(queue_id[0], "Voltron9000")
+
+    @patch(MODULE_PATH + ".KILLTRACKER_QUEUE_ID", "")
+    def test_should_abort_when_no_queue_id_defined(self, requests_mocker, mock_redis):
+        # given
+        requests_mocker.register_uri(
+            "GET", ZKB_REDISQ_URL, status_code=200, json={"package": None}
+        )
+        # when/then
+        with self.assertRaises(ImproperlyConfigured):
+            Killmail.create_from_zkb_redisq()
+
+    @patch(MODULE_PATH + ".KILLTRACKER_QUEUE_ID", "Möchtegern")
+    def test_should_urlize_queue_ids(self, requests_mocker, mock_redis):
+        # given
+        requests_mocker.register_uri(
+            "GET", ZKB_REDISQ_URL, status_code=200, json={"package": None}
+        )
+        # when
+        Killmail.create_from_zkb_redisq()
+        # then
+        qs = requests_mocker.last_request.qs
+        self.assertIn("queueID", qs)
+        queue_id = qs["queueID"]
+        self.assertEqual(len(queue_id), 1)
+        self.assertEqual(queue_id[0], "M%C3%B6chtegern")
+
+    @patch(MODULE_PATH + ".KILLTRACKER_QUEUE_ID", "alpha,bravo")
+    def test_should_not_accept_list_for_queue_id(self, requests_mocker, mock_redis):
+        # given
+        requests_mocker.register_uri(
+            "GET", ZKB_REDISQ_URL, status_code=200, json={"package": None}
+        )
+        # when/then
+        with self.assertRaises(ImproperlyConfigured):
+            Killmail.create_from_zkb_redisq()
+
 
 class TestKillmailSerialization(NoSocketsTestCase):
     def test_dict_serialization(self):

killtracker/tests/models/test_killmails.py

@@ -7,15 +7,17 @@ from eveuniverse.models import EveEntity
 from app_utils.testing import NoSocketsTestCase
 
 from killtracker.models import EveKillmail
-
-from ..testdata.factories import EveKillmailAttackerFactory, EveKillmailFactory
-from ..testdata.helpers import (
+from killtracker.tests.testdata.factories import (
+    EveKillmailAttackerFactory,
+    EveKillmailFactory,
+)
+from killtracker.tests.testdata.helpers import (
     LoadTestDataMixin,
     load_eve_entities,
     load_eve_killmails,
     load_killmail,
 )
-from ..testdata.load_eveuniverse import load_eveuniverse
+from killtracker.tests.testdata.load_eveuniverse import load_eveuniverse
 
 MODELS_PATH = "killtracker.models.killmails"
 

killtracker/tests/models/test_trackers_1.py

@@ -22,14 +22,13 @@ from app_utils.testing import NoSocketsTestCase, add_character_to_user_2
 from killtracker.constants import EveGroupId
 from killtracker.core.killmails import Killmail, _EntityCount
 from killtracker.models import Tracker
-
-from ..testdata.factories import (
+from killtracker.tests.testdata.factories import (
     KillmailAttackerFactory,
     KillmailFactory,
     KillmailVictimFactory,
     TrackerFactory,
 )
-from ..testdata.helpers import LoadTestDataMixin, load_killmail
+from killtracker.tests.testdata.helpers import LoadTestDataMixin, load_killmail
 
 MODELS_PATH = "killtracker.models"
 

killtracker/tests/models/test_trackers_2.py

@@ -9,9 +9,8 @@ from eveuniverse.models import EveConstellation, EveRegion, EveSolarSystem, EveT
 from app_utils.testing import NoSocketsTestCase
 
 from killtracker.core.killmails import Killmail
-
-from ..testdata.factories import TrackerFactory
-from ..testdata.helpers import LoadTestDataMixin, load_killmail
+from killtracker.tests.testdata.factories import TrackerFactory
+from killtracker.tests.testdata.helpers import LoadTestDataMixin, load_killmail
 
 MODELS_PATH = "killtracker.models.trackers"
 

killtracker/tests/test_admin.py

@@ -62,7 +62,7 @@ class TestTrackerValidations(LoadTestDataMixin, WebTest):
         # user tries to add new notification rule
         add_page = self.app.get(self.url_add)
         self.assertEqual(add_page.status_code, 200)
-        form = add_page.form
+        form = add_page.forms["tracker_form"]
         form["name"] = "Test Tracker"
         form["webhook"] = self.webhook_1.pk
         return form

killtracker/tests/test_integration.py

@@ -18,6 +18,7 @@ PACKAGE_PATH = "killtracker"
 
 @patch("celery.app.task.Context.called_directly", False)  # make retry work with eager
 @override_settings(CELERY_ALWAYS_EAGER=True)
+@patch(PACKAGE_PATH + ".core.killmails.KILLTRACKER_QUEUE_ID", "dummy")
 @patch(PACKAGE_PATH + ".tasks.is_esi_online", lambda: True)
 @patch(PACKAGE_PATH + ".models.webhooks.dhooks_lite.Webhook.execute", spec=True)
 @requests_mock.Mocker()