Improve performance and add type hints
This commit is contained in:
parent
1782db4840
commit
b7e10e766e
Signed by:
Joakim Hellsén
Joakim Hellsén
SSH key fingerprint:
SHA256:/9h/CsExpFp+PRhsfA0xznFx2CGfTT5R/kpuFfUgEQk
23 changed files with 745 additions and 178 deletions
|
|
@ -161,7 +161,7 @@ class TTVDropsBaseFeed(Feed):
|
|||
|
||||
response.content = content.encode(encoding)
|
||||
|
||||
def get_feed(self, obj: object, request: HttpRequest) -> SyndicationFeed:
|
||||
def get_feed(self, obj: Model | None, request: HttpRequest) -> SyndicationFeed:
|
||||
"""Use deterministic BASE_URL handling for syndication feed generation.
|
||||
|
||||
Returns:
|
||||
|
|
@ -199,8 +199,8 @@ class TTVDropsBaseFeed(Feed):
|
|||
def __call__(
|
||||
self,
|
||||
request: HttpRequest,
|
||||
*args: object,
|
||||
**kwargs: object,
|
||||
*args: str | int,
|
||||
**kwargs: str | int,
|
||||
) -> HttpResponse:
|
||||
"""Return feed response with inline content disposition for browser display."""
|
||||
original_stylesheets: list[str] = self.stylesheets
|
||||
|
|
@ -745,8 +745,8 @@ class OrganizationRSSFeed(TTVDropsBaseFeed):
|
|||
def __call__(
|
||||
self,
|
||||
request: HttpRequest,
|
||||
*args: object,
|
||||
**kwargs: object,
|
||||
*args: str | int,
|
||||
**kwargs: str | int,
|
||||
) -> HttpResponse:
|
||||
"""Override to capture limit parameter from request.
|
||||
|
||||
|
|
@ -822,8 +822,8 @@ class GameFeed(TTVDropsBaseFeed):
|
|||
def __call__(
|
||||
self,
|
||||
request: HttpRequest,
|
||||
*args: object,
|
||||
**kwargs: object,
|
||||
*args: str | int,
|
||||
**kwargs: str | int,
|
||||
) -> HttpResponse:
|
||||
"""Override to capture limit parameter from request.
|
||||
|
||||
|
|
@ -975,8 +975,8 @@ class DropCampaignFeed(TTVDropsBaseFeed):
|
|||
def __call__(
|
||||
self,
|
||||
request: HttpRequest,
|
||||
*args: object,
|
||||
**kwargs: object,
|
||||
*args: str | int,
|
||||
**kwargs: str | int,
|
||||
) -> HttpResponse:
|
||||
"""Override to capture limit parameter from request.
|
||||
|
||||
|
|
@ -1114,8 +1114,8 @@ class GameCampaignFeed(TTVDropsBaseFeed):
|
|||
def __call__(
|
||||
self,
|
||||
request: HttpRequest,
|
||||
*args: object,
|
||||
**kwargs: object,
|
||||
*args: str | int,
|
||||
**kwargs: str | int,
|
||||
) -> HttpResponse:
|
||||
"""Override to capture limit parameter from request.
|
||||
|
||||
|
|
@ -1293,8 +1293,8 @@ class RewardCampaignFeed(TTVDropsBaseFeed):
|
|||
def __call__(
|
||||
self,
|
||||
request: HttpRequest,
|
||||
*args: object,
|
||||
**kwargs: object,
|
||||
*args: str | int,
|
||||
**kwargs: str | int,
|
||||
) -> HttpResponse:
|
||||
"""Override to capture limit parameter from request.
|
||||
|
||||
|
|
|
|||
|
|
@ -7,6 +7,7 @@ from compression import zstd
|
|||
from datetime import datetime
|
||||
from pathlib import Path
|
||||
from typing import TYPE_CHECKING
|
||||
from typing import Protocol
|
||||
|
||||
from django.conf import settings
|
||||
from django.core.management.base import BaseCommand
|
||||
|
|
@ -19,6 +20,15 @@ if TYPE_CHECKING:
|
|||
from argparse import ArgumentParser
|
||||
|
||||
|
||||
class SupportsStr(Protocol):
|
||||
"""Protocol for values that provide a string representation."""
|
||||
|
||||
def __str__(self) -> str: ...
|
||||
|
||||
|
||||
type SqlSerializable = bool | int | float | bytes | SupportsStr | None
|
||||
|
||||
|
||||
class Command(BaseCommand):
|
||||
"""Create a compressed SQL dump of the Twitch and Kick dataset tables."""
|
||||
|
||||
|
|
@ -285,7 +295,7 @@ def _write_postgres_dump(output_path: Path, tables: list[str]) -> None:
|
|||
raise CommandError(msg)
|
||||
|
||||
|
||||
def _sql_literal(value: object) -> str:
|
||||
def _sql_literal(value: SqlSerializable) -> str:
|
||||
"""Convert a Python value to a SQL literal.
|
||||
|
||||
Args:
|
||||
|
|
@ -305,7 +315,7 @@ def _sql_literal(value: object) -> str:
|
|||
return "'" + str(value).replace("'", "''") + "'"
|
||||
|
||||
|
||||
def _json_default(value: object) -> str:
|
||||
def _json_default(value: bytes | SupportsStr) -> str:
|
||||
"""Convert non-serializable values to JSON-compatible strings.
|
||||
|
||||
Args:
|
||||
|
|
|
|||
|
|
@ -583,16 +583,31 @@ class Command(BaseCommand):
|
|||
Returns:
|
||||
Organization instance.
|
||||
"""
|
||||
org_obj, created = Organization.objects.get_or_create(
|
||||
cache: dict[str, Organization] = getattr(self, "_org_cache", {})
|
||||
if not hasattr(self, "_org_cache"):
|
||||
self._org_cache = cache
|
||||
|
||||
cached_org: Organization | None = cache.get(org_data.twitch_id)
|
||||
if cached_org is not None:
|
||||
self._save_if_changed(cached_org, {"name": org_data.name})
|
||||
return cached_org
|
||||
|
||||
org_obj: Organization | None = Organization.objects.filter(
|
||||
twitch_id=org_data.twitch_id,
|
||||
defaults={"name": org_data.name},
|
||||
)
|
||||
if not created:
|
||||
self._save_if_changed(org_obj, {"name": org_data.name})
|
||||
else:
|
||||
).first()
|
||||
_created: bool = org_obj is None
|
||||
if org_obj is None:
|
||||
org_obj = Organization.objects.create(
|
||||
twitch_id=org_data.twitch_id,
|
||||
name=org_data.name,
|
||||
)
|
||||
tqdm.write(
|
||||
f"{Fore.GREEN}✓{Style.RESET_ALL} Created new organization: {org_data.name}",
|
||||
)
|
||||
else:
|
||||
self._save_if_changed(org_obj, {"name": org_data.name})
|
||||
|
||||
cache[org_data.twitch_id] = org_obj
|
||||
|
||||
return org_obj
|
||||
|
||||
|
|
@ -621,6 +636,10 @@ class Command(BaseCommand):
|
|||
if campaign_org_obj:
|
||||
owner_orgs.add(campaign_org_obj)
|
||||
|
||||
cache: dict[str, Game] = getattr(self, "_game_cache", {})
|
||||
if not hasattr(self, "_game_cache"):
|
||||
self._game_cache = cache
|
||||
|
||||
defaults: dict[str, object] = {
|
||||
"display_name": game_data.display_name or (game_data.name or ""),
|
||||
"name": game_data.name or "",
|
||||
|
|
@ -628,10 +647,22 @@ class Command(BaseCommand):
|
|||
"box_art": game_data.box_art_url or "",
|
||||
}
|
||||
|
||||
game_obj, created = Game.objects.get_or_create(
|
||||
cached_game: Game | None = cache.get(game_data.twitch_id)
|
||||
if cached_game is not None:
|
||||
if owner_orgs:
|
||||
cached_game.owners.add(*owner_orgs)
|
||||
self._save_if_changed(cached_game, defaults)
|
||||
return cached_game
|
||||
|
||||
game_obj: Game | None = Game.objects.filter(
|
||||
twitch_id=game_data.twitch_id,
|
||||
defaults=defaults,
|
||||
)
|
||||
).first()
|
||||
created: bool = game_obj is None
|
||||
if game_obj is None:
|
||||
game_obj = Game.objects.create(
|
||||
twitch_id=game_data.twitch_id,
|
||||
**defaults,
|
||||
)
|
||||
# Set owners (ManyToMany)
|
||||
if created or owner_orgs:
|
||||
game_obj.owners.add(*owner_orgs)
|
||||
|
|
@ -642,6 +673,7 @@ class Command(BaseCommand):
|
|||
f"{Fore.GREEN}✓{Style.RESET_ALL} Created new game: {game_data.display_name}",
|
||||
)
|
||||
self._download_game_box_art(game_obj, game_obj.box_art)
|
||||
cache[game_data.twitch_id] = game_obj
|
||||
return game_obj
|
||||
|
||||
def _download_game_box_art(self, game_obj: Game, box_art_url: str | None) -> None:
|
||||
|
|
@ -701,7 +733,7 @@ class Command(BaseCommand):
|
|||
|
||||
return channel_obj
|
||||
|
||||
def process_responses(
|
||||
def process_responses( # noqa: PLR0915
|
||||
self,
|
||||
responses: list[dict[str, Any]],
|
||||
file_path: Path,
|
||||
|
|
@ -792,13 +824,18 @@ class Command(BaseCommand):
|
|||
"account_link_url": drop_campaign.account_link_url,
|
||||
}
|
||||
|
||||
campaign_obj, created = DropCampaign.objects.get_or_create(
|
||||
campaign_obj: DropCampaign | None = DropCampaign.objects.filter(
|
||||
twitch_id=drop_campaign.twitch_id,
|
||||
defaults=defaults,
|
||||
)
|
||||
if not created:
|
||||
self._save_if_changed(campaign_obj, defaults)
|
||||
).first()
|
||||
created: bool = campaign_obj is None
|
||||
if campaign_obj is None:
|
||||
campaign_obj = DropCampaign.objects.create(
|
||||
twitch_id=drop_campaign.twitch_id,
|
||||
**defaults,
|
||||
)
|
||||
else:
|
||||
self._save_if_changed(campaign_obj, defaults)
|
||||
if created:
|
||||
tqdm.write(
|
||||
f"{Fore.GREEN}✓{Style.RESET_ALL} Created new campaign: {drop_campaign.name}",
|
||||
)
|
||||
|
|
@ -882,13 +919,18 @@ class Command(BaseCommand):
|
|||
if end_at_dt is not None:
|
||||
drop_defaults["end_at"] = end_at_dt
|
||||
|
||||
drop_obj, created = TimeBasedDrop.objects.get_or_create(
|
||||
drop_obj: TimeBasedDrop | None = TimeBasedDrop.objects.filter(
|
||||
twitch_id=drop_schema.twitch_id,
|
||||
defaults=drop_defaults,
|
||||
)
|
||||
if not created:
|
||||
self._save_if_changed(drop_obj, drop_defaults)
|
||||
).first()
|
||||
created: bool = drop_obj is None
|
||||
if drop_obj is None:
|
||||
drop_obj = TimeBasedDrop.objects.create(
|
||||
twitch_id=drop_schema.twitch_id,
|
||||
**drop_defaults,
|
||||
)
|
||||
else:
|
||||
self._save_if_changed(drop_obj, drop_defaults)
|
||||
if created:
|
||||
tqdm.write(
|
||||
f"{Fore.GREEN}✓{Style.RESET_ALL} Created TimeBasedDrop: {drop_schema.name}",
|
||||
)
|
||||
|
|
@ -900,6 +942,10 @@ class Command(BaseCommand):
|
|||
|
||||
def _get_or_update_benefit(self, benefit_schema: DropBenefitSchema) -> DropBenefit:
|
||||
"""Return a DropBenefit, creating or updating as needed."""
|
||||
cache: dict[str, DropBenefit] = getattr(self, "_benefit_cache", {})
|
||||
if not hasattr(self, "_benefit_cache"):
|
||||
self._benefit_cache = cache
|
||||
|
||||
distribution_type: str = (benefit_schema.distribution_type or "").strip()
|
||||
benefit_defaults: dict[str, str | int | datetime | bool | None] = {
|
||||
"name": benefit_schema.name,
|
||||
|
|
@ -914,10 +960,20 @@ class Command(BaseCommand):
|
|||
if created_at_dt:
|
||||
benefit_defaults["created_at"] = created_at_dt
|
||||
|
||||
benefit_obj, created = DropBenefit.objects.get_or_create(
|
||||
cached_benefit: DropBenefit | None = cache.get(benefit_schema.twitch_id)
|
||||
if cached_benefit is not None:
|
||||
self._save_if_changed(cached_benefit, benefit_defaults)
|
||||
return cached_benefit
|
||||
|
||||
benefit_obj: DropBenefit | None = DropBenefit.objects.filter(
|
||||
twitch_id=benefit_schema.twitch_id,
|
||||
defaults=benefit_defaults,
|
||||
)
|
||||
).first()
|
||||
created: bool = benefit_obj is None
|
||||
if benefit_obj is None:
|
||||
benefit_obj = DropBenefit.objects.create(
|
||||
twitch_id=benefit_schema.twitch_id,
|
||||
**benefit_defaults,
|
||||
)
|
||||
if not created:
|
||||
self._save_if_changed(benefit_obj, benefit_defaults)
|
||||
else:
|
||||
|
|
@ -925,6 +981,8 @@ class Command(BaseCommand):
|
|||
f"{Fore.GREEN}✓{Style.RESET_ALL} Created DropBenefit: {benefit_schema.name}",
|
||||
)
|
||||
|
||||
cache[benefit_schema.twitch_id] = benefit_obj
|
||||
|
||||
return benefit_obj
|
||||
|
||||
def _process_benefit_edges(
|
||||
|
|
@ -946,11 +1004,17 @@ class Command(BaseCommand):
|
|||
)
|
||||
|
||||
defaults = {"entitlement_limit": edge_schema.entitlement_limit}
|
||||
edge_obj, created = DropBenefitEdge.objects.get_or_create(
|
||||
edge_obj: DropBenefitEdge | None = DropBenefitEdge.objects.filter(
|
||||
drop=drop_obj,
|
||||
benefit=benefit_obj,
|
||||
defaults=defaults,
|
||||
)
|
||||
).first()
|
||||
created: bool = edge_obj is None
|
||||
if edge_obj is None:
|
||||
edge_obj = DropBenefitEdge.objects.create(
|
||||
drop=drop_obj,
|
||||
benefit=benefit_obj,
|
||||
**defaults,
|
||||
)
|
||||
if not created:
|
||||
self._save_if_changed(edge_obj, defaults)
|
||||
else:
|
||||
|
|
|
|||
|
|
@ -39,9 +39,13 @@ class Command(BaseCommand):
|
|||
help="Re-download even if a local box art file already exists.",
|
||||
)
|
||||
|
||||
def handle(self, *_args: object, **options: object) -> None: # noqa: PLR0914, PLR0915
|
||||
def handle( # noqa: PLR0914, PLR0915
|
||||
self,
|
||||
*_args: str,
|
||||
**options: str | bool | int | None,
|
||||
) -> None:
|
||||
"""Download Twitch box art images for all games."""
|
||||
limit_value: object | None = options.get("limit")
|
||||
limit_value: str | bool | int | None = options.get("limit")
|
||||
limit: int | None = limit_value if isinstance(limit_value, int) else None
|
||||
force: bool = bool(options.get("force"))
|
||||
|
||||
|
|
|
|||
|
|
@ -50,10 +50,14 @@ class Command(BaseCommand):
|
|||
help="Re-download even if a local image file already exists.",
|
||||
)
|
||||
|
||||
def handle(self, *_args: object, **options: object) -> None:
|
||||
def handle(
|
||||
self,
|
||||
*_args: str,
|
||||
**options: str | bool | int | None,
|
||||
) -> None:
|
||||
"""Download images for campaigns, benefits, and/or rewards."""
|
||||
model_choice: str = str(options.get("model", "all"))
|
||||
limit_value: object | None = options.get("limit")
|
||||
limit_value: str | bool | int | None = options.get("limit")
|
||||
limit: int | None = limit_value if isinstance(limit_value, int) else None
|
||||
force: bool = bool(options.get("force"))
|
||||
|
||||
|
|
|
|||
|
|
@ -196,9 +196,12 @@ class Command(BaseCommand):
|
|||
Returns:
|
||||
Tuple of (ChatBadgeSet instance, created flag)
|
||||
"""
|
||||
badge_set_obj, created = ChatBadgeSet.objects.get_or_create(
|
||||
badge_set_obj: ChatBadgeSet | None = ChatBadgeSet.objects.filter(
|
||||
set_id=badge_set_schema.set_id,
|
||||
)
|
||||
).first()
|
||||
created: bool = badge_set_obj is None
|
||||
if badge_set_obj is None:
|
||||
badge_set_obj = ChatBadgeSet.objects.create(set_id=badge_set_schema.set_id)
|
||||
|
||||
if created:
|
||||
self.stdout.write(
|
||||
|
|
@ -258,11 +261,25 @@ class Command(BaseCommand):
|
|||
"click_url": version_schema.click_url,
|
||||
}
|
||||
|
||||
_badge_obj, created = ChatBadge.objects.update_or_create(
|
||||
badge_obj: ChatBadge | None = ChatBadge.objects.filter(
|
||||
badge_set=badge_set_obj,
|
||||
badge_id=version_schema.badge_id,
|
||||
defaults=defaults,
|
||||
)
|
||||
).first()
|
||||
created: bool = badge_obj is None
|
||||
if badge_obj is None:
|
||||
badge_obj = ChatBadge.objects.create(
|
||||
badge_set=badge_set_obj,
|
||||
badge_id=version_schema.badge_id,
|
||||
**defaults,
|
||||
)
|
||||
else:
|
||||
changed_fields: list[str] = []
|
||||
for field, value in defaults.items():
|
||||
if getattr(badge_obj, field) != value:
|
||||
setattr(badge_obj, field, value)
|
||||
changed_fields.append(field)
|
||||
if changed_fields:
|
||||
badge_obj.save(update_fields=changed_fields)
|
||||
|
||||
if created:
|
||||
msg: str = (
|
||||
|
|
|
|||
|
|
@ -2,6 +2,7 @@ import logging
|
|||
from collections import OrderedDict
|
||||
from typing import TYPE_CHECKING
|
||||
from typing import Any
|
||||
from typing import cast
|
||||
|
||||
import auto_prefetch
|
||||
from django.conf import settings
|
||||
|
|
@ -531,6 +532,8 @@ class DropCampaign(auto_prefetch.Model):
|
|||
"name",
|
||||
"image_url",
|
||||
"image_file",
|
||||
"image_width",
|
||||
"image_height",
|
||||
"start_at",
|
||||
"end_at",
|
||||
"allow_is_enabled",
|
||||
|
|
@ -540,6 +543,8 @@ class DropCampaign(auto_prefetch.Model):
|
|||
"game__slug",
|
||||
"game__box_art",
|
||||
"game__box_art_file",
|
||||
"game__box_art_width",
|
||||
"game__box_art_height",
|
||||
)
|
||||
.select_related("game")
|
||||
.prefetch_related(
|
||||
|
|
@ -577,26 +582,90 @@ class DropCampaign(auto_prefetch.Model):
|
|||
"""
|
||||
campaigns_by_game: OrderedDict[str, dict[str, Any]] = OrderedDict()
|
||||
|
||||
for campaign in campaigns:
|
||||
game: Game = campaign.game
|
||||
game_id: str = game.twitch_id
|
||||
campaigns_list: list[DropCampaign] = list(campaigns)
|
||||
game_pks: list[int] = sorted({
|
||||
cast("Any", campaign).game_id for campaign in campaigns_list
|
||||
})
|
||||
games: models.QuerySet[Game, Game] = (
|
||||
Game.objects
|
||||
.filter(pk__in=game_pks)
|
||||
.only(
|
||||
"pk",
|
||||
"twitch_id",
|
||||
"display_name",
|
||||
"slug",
|
||||
"box_art",
|
||||
"box_art_file",
|
||||
"box_art_width",
|
||||
"box_art_height",
|
||||
)
|
||||
.prefetch_related(
|
||||
models.Prefetch(
|
||||
"owners",
|
||||
queryset=Organization.objects.only("twitch_id", "name"),
|
||||
),
|
||||
)
|
||||
)
|
||||
games_by_pk: dict[int, Game] = {game.pk: game for game in games}
|
||||
|
||||
def _clean_name(campaign_name: str, game_display_name: str) -> str:
|
||||
if not game_display_name:
|
||||
return campaign_name
|
||||
|
||||
game_variations: list[str] = [game_display_name]
|
||||
if "&" in game_display_name:
|
||||
game_variations.append(game_display_name.replace("&", "and"))
|
||||
if "and" in game_display_name:
|
||||
game_variations.append(game_display_name.replace("and", "&"))
|
||||
|
||||
for game_name in game_variations:
|
||||
for separator in [" - ", " | ", " "]:
|
||||
prefix_to_check: str = game_name + separator
|
||||
if campaign_name.startswith(prefix_to_check):
|
||||
return campaign_name.removeprefix(prefix_to_check).strip()
|
||||
|
||||
return campaign_name
|
||||
|
||||
for campaign in campaigns_list:
|
||||
game_pk: int = cast("Any", campaign).game_id
|
||||
game: Game | None = games_by_pk.get(game_pk)
|
||||
game_id: str = game.twitch_id if game else ""
|
||||
game_display_name: str = game.display_name if game else ""
|
||||
|
||||
if game_id not in campaigns_by_game:
|
||||
campaigns_by_game[game_id] = {
|
||||
"name": game.display_name,
|
||||
"box_art": game.box_art_best_url,
|
||||
"owners": list(game.owners.all()),
|
||||
"name": game_display_name,
|
||||
"box_art": game.box_art_best_url if game else "",
|
||||
"owners": list(game.owners.all()) if game else [],
|
||||
"campaigns": [],
|
||||
}
|
||||
|
||||
campaigns_by_game[game_id]["campaigns"].append({
|
||||
"campaign": campaign,
|
||||
"clean_name": _clean_name(campaign.name, game_display_name),
|
||||
"image_url": campaign.listing_image_url,
|
||||
"allowed_channels": getattr(campaign, "channels_ordered", []),
|
||||
"game_display_name": game_display_name,
|
||||
"game_twitch_directory_url": game.twitch_directory_url if game else "",
|
||||
})
|
||||
|
||||
return campaigns_by_game
|
||||
|
||||
@classmethod
|
||||
def campaigns_by_game_for_dashboard(
|
||||
cls,
|
||||
now: datetime.datetime,
|
||||
) -> OrderedDict[str, dict[str, Any]]:
|
||||
"""Return active campaigns grouped by game for dashboard rendering.
|
||||
|
||||
Args:
|
||||
now: Current timestamp used to evaluate active campaigns.
|
||||
|
||||
Returns:
|
||||
Ordered mapping keyed by game twitch_id.
|
||||
"""
|
||||
return cls.grouped_by_game(cls.active_for_dashboard(now))
|
||||
|
||||
@property
|
||||
def is_active(self) -> bool:
|
||||
"""Check if the campaign is currently active."""
|
||||
|
|
|
|||
|
|
@ -7,6 +7,7 @@ from typing import Any
|
|||
from typing import Literal
|
||||
|
||||
import pytest
|
||||
from django.core.files.base import ContentFile
|
||||
from django.core.handlers.wsgi import WSGIRequest
|
||||
from django.core.paginator import Paginator
|
||||
from django.db import connection
|
||||
|
|
@ -40,12 +41,13 @@ if TYPE_CHECKING:
|
|||
from django.test import Client
|
||||
from django.test.client import _MonkeyPatchedWSGIResponse
|
||||
from django.test.utils import ContextList
|
||||
from pytest_django.fixtures import SettingsWrapper
|
||||
|
||||
from twitch.views import Page
|
||||
|
||||
|
||||
@pytest.fixture(autouse=True)
|
||||
def apply_base_url_override(settings: object) -> None:
|
||||
def apply_base_url_override(settings: SettingsWrapper) -> None:
|
||||
"""Ensure BASE_URL is globally overridden for all tests."""
|
||||
settings.BASE_URL = "https://ttvdrops.lovinator.space" # pyright: ignore[reportAttributeAccessIssue]
|
||||
|
||||
|
|
@ -492,10 +494,10 @@ class TestChannelListView:
|
|||
|
||||
@pytest.mark.django_db
|
||||
def test_dashboard_view(self, client: Client) -> None:
|
||||
"""Test dashboard view returns 200 and has active_campaigns in context."""
|
||||
"""Test dashboard view returns 200 and has grouped campaign data in context."""
|
||||
response: _MonkeyPatchedWSGIResponse = client.get(reverse("twitch:dashboard"))
|
||||
assert response.status_code == 200
|
||||
assert "active_campaigns" in response.context
|
||||
assert "campaigns_by_game" in response.context
|
||||
|
||||
@pytest.mark.django_db
|
||||
def test_dashboard_dedupes_campaigns_for_multi_owner_game(
|
||||
|
|
@ -622,10 +624,7 @@ class TestChannelListView:
|
|||
now,
|
||||
)
|
||||
active_reward_campaigns_qs: QuerySet[RewardCampaign] = (
|
||||
RewardCampaign.objects
|
||||
.filter(starts_at__lte=now, ends_at__gte=now)
|
||||
.select_related("game")
|
||||
.order_by("-starts_at")
|
||||
RewardCampaign.active_for_dashboard(now)
|
||||
)
|
||||
|
||||
campaigns_plan: str = active_campaigns_qs.explain()
|
||||
|
|
@ -759,6 +758,291 @@ class TestChannelListView:
|
|||
f"baseline={baseline_select_count}, scaled={scaled_select_count}"
|
||||
)
|
||||
|
||||
@pytest.mark.django_db
|
||||
def test_dashboard_avoids_n_plus_one_game_queries_in_drop_loop(
|
||||
self,
|
||||
client: Client,
|
||||
) -> None:
|
||||
"""Dashboard should not issue per-campaign Game SELECTs while rendering drops."""
|
||||
now: datetime.datetime = timezone.now()
|
||||
|
||||
org: Organization = Organization.objects.create(
|
||||
twitch_id="org_no_n_plus_one_game",
|
||||
name="Org No N+1 Game",
|
||||
)
|
||||
game: Game = Game.objects.create(
|
||||
twitch_id="game_no_n_plus_one_game",
|
||||
name="game_no_n_plus_one_game",
|
||||
display_name="Game No N+1 Game",
|
||||
)
|
||||
game.owners.add(org)
|
||||
|
||||
campaigns: list[DropCampaign] = [
|
||||
DropCampaign(
|
||||
twitch_id=f"no_n_plus_one_campaign_{i}",
|
||||
name=f"No N+1 campaign {i}",
|
||||
game=game,
|
||||
operation_names=["DropCampaignDetails"],
|
||||
start_at=now - timedelta(hours=2),
|
||||
end_at=now + timedelta(hours=2),
|
||||
)
|
||||
for i in range(10)
|
||||
]
|
||||
DropCampaign.objects.bulk_create(campaigns)
|
||||
|
||||
with CaptureQueriesContext(connection) as queries:
|
||||
response: _MonkeyPatchedWSGIResponse = client.get(
|
||||
reverse("twitch:dashboard"),
|
||||
)
|
||||
assert response.status_code == 200
|
||||
|
||||
context: ContextList | dict[str, Any] = response.context # type: ignore[assignment]
|
||||
if isinstance(context, list):
|
||||
context = context[-1]
|
||||
|
||||
grouped_campaigns: list[dict[str, Any]] = context["campaigns_by_game"][
|
||||
game.twitch_id
|
||||
]["campaigns"]
|
||||
assert grouped_campaigns
|
||||
assert all(
|
||||
"game_display_name" in campaign_data for campaign_data in grouped_campaigns
|
||||
)
|
||||
assert all(
|
||||
"game_twitch_directory_url" in campaign_data
|
||||
for campaign_data in grouped_campaigns
|
||||
)
|
||||
|
||||
game_select_queries: list[str] = [
|
||||
query_info["sql"]
|
||||
for query_info in queries.captured_queries
|
||||
if query_info["sql"].lstrip().upper().startswith("SELECT")
|
||||
and "twitch_game" in query_info["sql"].lower()
|
||||
and "join" not in query_info["sql"].lower()
|
||||
]
|
||||
|
||||
assert len(game_select_queries) <= 1, (
|
||||
"Expected at most one standalone Game SELECT for dashboard drop grouping; "
|
||||
f"got {len(game_select_queries)}. Queries: {game_select_queries}"
|
||||
)
|
||||
|
||||
@pytest.mark.django_db
|
||||
def test_dashboard_avoids_n_plus_one_game_queries_with_multiple_games(
|
||||
self,
|
||||
client: Client,
|
||||
) -> None:
|
||||
"""Dashboard should keep standalone Game SELECTs bounded with many campaigns and games."""
|
||||
now: datetime.datetime = timezone.now()
|
||||
|
||||
game_ids: list[str] = []
|
||||
for i in range(5):
|
||||
org: Organization = Organization.objects.create(
|
||||
twitch_id=f"org_multi_game_{i}",
|
||||
name=f"Org Multi Game {i}",
|
||||
)
|
||||
game: Game = Game.objects.create(
|
||||
twitch_id=f"game_multi_game_{i}",
|
||||
name=f"game_multi_game_{i}",
|
||||
display_name=f"Game Multi Game {i}",
|
||||
)
|
||||
game.owners.add(org)
|
||||
game_ids.append(game.twitch_id)
|
||||
|
||||
campaigns: list[DropCampaign] = [
|
||||
DropCampaign(
|
||||
twitch_id=f"multi_game_campaign_{i}_{j}",
|
||||
name=f"Multi game campaign {i}-{j}",
|
||||
game=game,
|
||||
operation_names=["DropCampaignDetails"],
|
||||
start_at=now - timedelta(hours=2),
|
||||
end_at=now + timedelta(hours=2),
|
||||
)
|
||||
for j in range(20)
|
||||
]
|
||||
DropCampaign.objects.bulk_create(campaigns)
|
||||
|
||||
with CaptureQueriesContext(connection) as queries:
|
||||
response: _MonkeyPatchedWSGIResponse = client.get(
|
||||
reverse("twitch:dashboard"),
|
||||
)
|
||||
assert response.status_code == 200
|
||||
|
||||
context: ContextList | dict[str, Any] = response.context # type: ignore[assignment]
|
||||
if isinstance(context, list):
|
||||
context = context[-1]
|
||||
|
||||
campaigns_by_game: dict[str, Any] = context["campaigns_by_game"]
|
||||
for game_id in game_ids:
|
||||
assert game_id in campaigns_by_game
|
||||
grouped_campaigns: list[dict[str, Any]] = campaigns_by_game[game_id][
|
||||
"campaigns"
|
||||
]
|
||||
assert len(grouped_campaigns) == 20
|
||||
assert all(
|
||||
"game_display_name" in campaign_data
|
||||
for campaign_data in grouped_campaigns
|
||||
)
|
||||
assert all(
|
||||
"game_twitch_directory_url" in campaign_data
|
||||
for campaign_data in grouped_campaigns
|
||||
)
|
||||
|
||||
game_select_queries: list[str] = [
|
||||
query_info["sql"]
|
||||
for query_info in queries.captured_queries
|
||||
if query_info["sql"].lstrip().upper().startswith("SELECT")
|
||||
and "twitch_game" in query_info["sql"].lower()
|
||||
and "join" not in query_info["sql"].lower()
|
||||
]
|
||||
|
||||
assert len(game_select_queries) <= 1, (
|
||||
"Expected a bounded number of standalone Game SELECTs for dashboard grouping; "
|
||||
f"got {len(game_select_queries)}. Queries: {game_select_queries}"
|
||||
)
|
||||
|
||||
@pytest.mark.django_db
|
||||
def test_dashboard_does_not_refresh_dropcampaign_rows_for_image_dimensions(
|
||||
self,
|
||||
client: Client,
|
||||
) -> None:
|
||||
"""Dashboard should not issue per-row DropCampaign refreshes for image dimensions."""
|
||||
now: datetime.datetime = timezone.now()
|
||||
|
||||
org: Organization = Organization.objects.create(
|
||||
twitch_id="org_image_dimensions",
|
||||
name="Org Image Dimensions",
|
||||
)
|
||||
game: Game = Game.objects.create(
|
||||
twitch_id="game_image_dimensions",
|
||||
name="game_image_dimensions",
|
||||
display_name="Game Image Dimensions",
|
||||
)
|
||||
game.owners.add(org)
|
||||
|
||||
# 1x1 transparent PNG
|
||||
png_1x1: bytes = (
|
||||
b"\x89PNG\r\n\x1a\n\x00\x00\x00\rIHDR\x00\x00\x00\x01"
|
||||
b"\x00\x00\x00\x01\x08\x06\x00\x00\x00\x1f\x15\xc4\x89"
|
||||
b"\x00\x00\x00\x0bIDATx\x9cc\x00\x01\x00\x00\x05\x00\x01"
|
||||
b"\r\n-\xb4\x00\x00\x00\x00IEND\xaeB`\x82"
|
||||
)
|
||||
|
||||
campaigns: list[DropCampaign] = []
|
||||
for i in range(3):
|
||||
campaign: DropCampaign = DropCampaign.objects.create(
|
||||
twitch_id=f"image_dim_campaign_{i}",
|
||||
name=f"Image dim campaign {i}",
|
||||
game=game,
|
||||
operation_names=["DropCampaignDetails"],
|
||||
start_at=now - timedelta(hours=2),
|
||||
end_at=now + timedelta(hours=2),
|
||||
)
|
||||
assert campaign.image_file is not None
|
||||
campaign.image_file.save(
|
||||
f"image_dim_campaign_{i}.png",
|
||||
ContentFile(png_1x1),
|
||||
save=True,
|
||||
)
|
||||
campaigns.append(campaign)
|
||||
|
||||
with CaptureQueriesContext(connection) as queries:
|
||||
response: _MonkeyPatchedWSGIResponse = client.get(
|
||||
reverse("twitch:dashboard"),
|
||||
)
|
||||
assert response.status_code == 200
|
||||
|
||||
context: ContextList | dict[str, Any] = response.context # type: ignore[assignment]
|
||||
if isinstance(context, list):
|
||||
context = context[-1]
|
||||
|
||||
grouped_campaigns: list[dict[str, Any]] = context["campaigns_by_game"][
|
||||
game.twitch_id
|
||||
]["campaigns"]
|
||||
assert len(grouped_campaigns) == len(campaigns)
|
||||
|
||||
per_row_refresh_queries: list[str] = [
|
||||
query_info["sql"]
|
||||
for query_info in queries.captured_queries
|
||||
if query_info["sql"].lstrip().upper().startswith("SELECT")
|
||||
and 'from "twitch_dropcampaign"' in query_info["sql"].lower()
|
||||
and 'where "twitch_dropcampaign"."id" =' in query_info["sql"].lower()
|
||||
]
|
||||
|
||||
assert not per_row_refresh_queries, (
|
||||
"Dashboard unexpectedly refreshed DropCampaign rows one-by-one while "
|
||||
"resolving image dimensions. Queries: "
|
||||
f"{per_row_refresh_queries}"
|
||||
)
|
||||
|
||||
@pytest.mark.django_db
|
||||
def test_dashboard_does_not_refresh_game_rows_for_box_art_dimensions(
|
||||
self,
|
||||
client: Client,
|
||||
) -> None:
|
||||
"""Dashboard should not issue per-row Game refreshes for box art dimensions."""
|
||||
now: datetime.datetime = timezone.now()
|
||||
|
||||
org: Organization = Organization.objects.create(
|
||||
twitch_id="org_box_art_dimensions",
|
||||
name="Org Box Art Dimensions",
|
||||
)
|
||||
game: Game = Game.objects.create(
|
||||
twitch_id="game_box_art_dimensions",
|
||||
name="game_box_art_dimensions",
|
||||
display_name="Game Box Art Dimensions",
|
||||
)
|
||||
game.owners.add(org)
|
||||
|
||||
# 1x1 transparent PNG
|
||||
png_1x1: bytes = (
|
||||
b"\x89PNG\r\n\x1a\n\x00\x00\x00\rIHDR\x00\x00\x00\x01"
|
||||
b"\x00\x00\x00\x01\x08\x06\x00\x00\x00\x1f\x15\xc4\x89"
|
||||
b"\x00\x00\x00\x0bIDATx\x9cc\x00\x01\x00\x00\x05\x00\x01"
|
||||
b"\r\n-\xb4\x00\x00\x00\x00IEND\xaeB`\x82"
|
||||
)
|
||||
|
||||
assert game.box_art_file is not None
|
||||
game.box_art_file.save(
|
||||
"game_box_art_dimensions.png",
|
||||
ContentFile(png_1x1),
|
||||
save=True,
|
||||
)
|
||||
|
||||
DropCampaign.objects.create(
|
||||
twitch_id="game_box_art_campaign",
|
||||
name="Game box art campaign",
|
||||
game=game,
|
||||
operation_names=["DropCampaignDetails"],
|
||||
start_at=now - timedelta(hours=2),
|
||||
end_at=now + timedelta(hours=2),
|
||||
)
|
||||
|
||||
with CaptureQueriesContext(connection) as queries:
|
||||
response: _MonkeyPatchedWSGIResponse = client.get(
|
||||
reverse("twitch:dashboard"),
|
||||
)
|
||||
assert response.status_code == 200
|
||||
|
||||
context: ContextList | dict[str, Any] = response.context # type: ignore[assignment]
|
||||
if isinstance(context, list):
|
||||
context = context[-1]
|
||||
|
||||
campaigns_by_game: dict[str, Any] = context["campaigns_by_game"]
|
||||
assert game.twitch_id in campaigns_by_game
|
||||
|
||||
per_row_refresh_queries: list[str] = [
|
||||
query_info["sql"]
|
||||
for query_info in queries.captured_queries
|
||||
if query_info["sql"].lstrip().upper().startswith("SELECT")
|
||||
and 'from "twitch_game"' in query_info["sql"].lower()
|
||||
and 'where "twitch_game"."id" =' in query_info["sql"].lower()
|
||||
]
|
||||
|
||||
assert not per_row_refresh_queries, (
|
||||
"Dashboard unexpectedly refreshed Game rows one-by-one while resolving "
|
||||
"box art dimensions. Queries: "
|
||||
f"{per_row_refresh_queries}"
|
||||
)
|
||||
|
||||
@pytest.mark.django_db
|
||||
def test_debug_view(self, client: Client) -> None:
|
||||
"""Test debug view returns 200 and has games_without_owner in context."""
|
||||
|
|
@ -1079,7 +1363,7 @@ class TestChannelListView:
|
|||
assert "page=2" in content
|
||||
|
||||
@pytest.mark.django_db
|
||||
def test_drop_campaign_detail_view(self, client: Client, db: object) -> None:
|
||||
def test_drop_campaign_detail_view(self, client: Client, db: None) -> None:
|
||||
"""Test campaign detail view returns 200 and has campaign in context."""
|
||||
game: Game = Game.objects.create(
|
||||
twitch_id="g1",
|
||||
|
|
@ -1164,7 +1448,7 @@ class TestChannelListView:
|
|||
assert "games" in response.context
|
||||
|
||||
@pytest.mark.django_db
|
||||
def test_game_detail_view(self, client: Client, db: object) -> None:
|
||||
def test_game_detail_view(self, client: Client, db: None) -> None:
|
||||
"""Test game detail view returns 200 and has game in context."""
|
||||
game: Game = Game.objects.create(
|
||||
twitch_id="g2",
|
||||
|
|
@ -1177,7 +1461,7 @@ class TestChannelListView:
|
|||
assert "game" in response.context
|
||||
|
||||
@pytest.mark.django_db
|
||||
def test_game_detail_image_aspect_ratio(self, client: Client, db: object) -> None:
|
||||
def test_game_detail_image_aspect_ratio(self, client: Client, db: None) -> None:
|
||||
"""Box art should render with a width attribute only, preserving aspect ratio."""
|
||||
game: Game = Game.objects.create(
|
||||
twitch_id="g3",
|
||||
|
|
@ -1232,7 +1516,7 @@ class TestChannelListView:
|
|||
assert "orgs" in response.context
|
||||
|
||||
@pytest.mark.django_db
|
||||
def test_organization_detail_view(self, client: Client, db: object) -> None:
|
||||
def test_organization_detail_view(self, client: Client, db: None) -> None:
|
||||
"""Test organization detail view returns 200 and has organization in context."""
|
||||
org: Organization = Organization.objects.create(twitch_id="o1", name="Org1")
|
||||
url: str = reverse("twitch:organization_detail", args=[org.twitch_id])
|
||||
|
|
@ -1241,7 +1525,7 @@ class TestChannelListView:
|
|||
assert "organization" in response.context
|
||||
|
||||
@pytest.mark.django_db
|
||||
def test_channel_detail_view(self, client: Client, db: object) -> None:
|
||||
def test_channel_detail_view(self, client: Client, db: None) -> None:
|
||||
"""Test channel detail view returns 200 and has channel in context."""
|
||||
channel: Channel = Channel.objects.create(
|
||||
twitch_id="ch1",
|
||||
|
|
|
|||
|
|
@ -875,7 +875,7 @@ class GameDetailView(DetailView):
|
|||
|
||||
return game
|
||||
|
||||
def get_context_data(self, **kwargs: object) -> dict[str, Any]: # noqa: PLR0914
|
||||
def get_context_data(self, **kwargs) -> dict[str, Any]: # noqa: PLR0914
|
||||
"""Add additional context data.
|
||||
|
||||
Args:
|
||||
|
|
@ -1071,9 +1071,8 @@ def dashboard(request: HttpRequest) -> HttpResponse:
|
|||
HttpResponse: The rendered dashboard template.
|
||||
"""
|
||||
now: datetime.datetime = timezone.now()
|
||||
active_campaigns: QuerySet[DropCampaign] = DropCampaign.active_for_dashboard(now)
|
||||
campaigns_by_game: OrderedDict[str, dict[str, Any]] = DropCampaign.grouped_by_game(
|
||||
active_campaigns,
|
||||
campaigns_by_game: OrderedDict[str, dict[str, Any]] = (
|
||||
DropCampaign.campaigns_by_game_for_dashboard(now)
|
||||
)
|
||||
|
||||
# Get active reward campaigns (Quest rewards)
|
||||
|
|
@ -1112,7 +1111,6 @@ def dashboard(request: HttpRequest) -> HttpResponse:
|
|||
request,
|
||||
"twitch/dashboard.html",
|
||||
{
|
||||
"active_campaigns": active_campaigns,
|
||||
"campaigns_by_game": campaigns_by_game,
|
||||
"active_reward_campaigns": active_reward_campaigns,
|
||||
"now": now,
|
||||
|
|
@ -1441,7 +1439,7 @@ class ChannelDetailView(DetailView):
|
|||
|
||||
return channel
|
||||
|
||||
def get_context_data(self, **kwargs: object) -> dict[str, Any]: # noqa: PLR0914
|
||||
def get_context_data(self, **kwargs) -> dict[str, Any]: # noqa: PLR0914
|
||||
"""Add additional context data.
|
||||
|
||||
Args:
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue