Refactor campaign list view
This commit is contained in:
parent
db927f0baa
commit
aed8adeea4
4 changed files with 304 additions and 98 deletions
|
|
@ -90,12 +90,13 @@ line-length = 120
|
||||||
"**/tests/**" = [
|
"**/tests/**" = [
|
||||||
"ARG",
|
"ARG",
|
||||||
"FBT",
|
"FBT",
|
||||||
|
"PLR0904",
|
||||||
"PLR2004",
|
"PLR2004",
|
||||||
"S101",
|
|
||||||
"S311",
|
|
||||||
"S106",
|
|
||||||
"PLR6301",
|
"PLR6301",
|
||||||
|
"S101",
|
||||||
"S105",
|
"S105",
|
||||||
|
"S106",
|
||||||
|
"S311",
|
||||||
"SLF001",
|
"SLF001",
|
||||||
]
|
]
|
||||||
"**/migrations/**" = ["RUF012"]
|
"**/migrations/**" = ["RUF012"]
|
||||||
|
|
|
||||||
|
|
@ -6,47 +6,25 @@
|
||||||
{% block content %}
|
{% block content %}
|
||||||
<main>
|
<main>
|
||||||
<header>
|
<header>
|
||||||
<h1 id="page-title">Drop Campaigns</h1>
|
<h1>Drop Campaigns</h1>
|
||||||
<p>Browse all available drop campaigns</p>
|
|
||||||
<!-- RSS Feeds -->
|
<!-- RSS Feeds -->
|
||||||
<div style="margin-bottom: 1rem;">
|
<div>
|
||||||
<a href="{% url 'twitch:campaign_feed' %}"
|
<a href="{% url 'twitch:campaign_feed' %}"
|
||||||
style="margin-right: 1rem"
|
title="RSS feed for all campaigns">[rss]</a>
|
||||||
title="RSS feed for all campaigns">RSS feed for all campaigns</a>
|
|
||||||
</div>
|
|
||||||
<!-- Export Options -->
|
|
||||||
<div style="margin-bottom: 1rem;
|
|
||||||
display: flex;
|
|
||||||
gap: 1rem;
|
|
||||||
flex-wrap: wrap">
|
|
||||||
<a href="{% url 'twitch:export_campaigns_csv' %}{% if request.GET %}?{{ request.GET.urlencode }}{% endif %}"
|
<a href="{% url 'twitch:export_campaigns_csv' %}{% if request.GET %}?{{ request.GET.urlencode }}{% endif %}"
|
||||||
title="Export campaigns as CSV">📥 Campaigns (CSV)</a>
|
title="Export campaigns as CSV">[csv]</a>
|
||||||
<a href="{% url 'twitch:export_campaigns_json' %}{% if request.GET %}?{{ request.GET.urlencode }}{% endif %}"
|
<a href="{% url 'twitch:export_campaigns_json' %}{% if request.GET %}?{{ request.GET.urlencode }}{% endif %}"
|
||||||
title="Export campaigns as JSON">📥 Campaigns (JSON)</a>
|
title="Export campaigns as JSON">[json]</a>
|
||||||
<a href="{% url 'twitch:export_games_csv' %}"
|
|
||||||
title="Export all games as CSV">📥 Games (CSV)</a>
|
|
||||||
<a href="{% url 'twitch:export_games_json' %}"
|
|
||||||
title="Export all games as JSON">📥 Games (JSON)</a>
|
|
||||||
<a href="{% url 'twitch:export_organizations_csv' %}"
|
|
||||||
title="Export all organizations as CSV">📥 Organizations (CSV)</a>
|
|
||||||
<a href="{% url 'twitch:export_organizations_json' %}"
|
|
||||||
title="Export all organizations as JSON">📥 Organizations (JSON)</a>
|
|
||||||
</div>
|
</div>
|
||||||
</header>
|
</header>
|
||||||
<form id="filter-form"
|
<form method="get" action="{% url 'twitch:campaign_list' %}">
|
||||||
method="get"
|
|
||||||
action="{% url 'twitch:campaign_list' %}"
|
|
||||||
style="margin-bottom: 2rem;
|
|
||||||
padding: 1rem;
|
|
||||||
border-radius: 8px">
|
|
||||||
<div style="display: flex;
|
<div style="display: flex;
|
||||||
gap: 1rem;
|
gap: 1rem;
|
||||||
align-items: center;
|
align-items: center;
|
||||||
flex-wrap: wrap">
|
flex-wrap: wrap">
|
||||||
<!-- Game Filter -->
|
<!-- Game Filter -->
|
||||||
<div>
|
<div>
|
||||||
<label for="game" style="margin-right: 0.5rem; font-weight: 600;">Game:</label>
|
<select name="game">
|
||||||
<select id="game" name="game">
|
|
||||||
<option value="">All Games</option>
|
<option value="">All Games</option>
|
||||||
{% for game in games %}
|
{% for game in games %}
|
||||||
<option value="{{ game.twitch_id }}"
|
<option value="{{ game.twitch_id }}"
|
||||||
|
|
@ -55,10 +33,7 @@
|
||||||
</option>
|
</option>
|
||||||
{% endfor %}
|
{% endfor %}
|
||||||
</select>
|
</select>
|
||||||
</div>
|
|
||||||
<!-- Status Filter -->
|
<!-- Status Filter -->
|
||||||
<div>
|
|
||||||
<label for="status" style="margin-right: 0.5rem; font-weight: 600;">Status:</label>
|
|
||||||
<select id="status" name="status">
|
<select id="status" name="status">
|
||||||
<option value="">All Statuses</option>
|
<option value="">All Statuses</option>
|
||||||
{% for status in status_options %}
|
{% for status in status_options %}
|
||||||
|
|
@ -66,24 +41,23 @@
|
||||||
{% if selected_status == status %}selected{% endif %}>{{ status|title }}</option>
|
{% if selected_status == status %}selected{% endif %}>{{ status|title }}</option>
|
||||||
{% endfor %}
|
{% endfor %}
|
||||||
</select>
|
</select>
|
||||||
</div>
|
|
||||||
<button id="apply-filters-button" type="submit">Apply Filters</button>
|
<button id="apply-filters-button" type="submit">Apply Filters</button>
|
||||||
</div>
|
</div>
|
||||||
|
</div>
|
||||||
</form>
|
</form>
|
||||||
|
<br />
|
||||||
{% if campaigns %}
|
{% if campaigns %}
|
||||||
{% regroup campaigns by game as campaigns_by_game %}
|
{% regroup campaigns by game as campaigns_by_game %}
|
||||||
{% for game_group in campaigns_by_game %}
|
{% for game_group in campaigns_by_game %}
|
||||||
<section id="game-group-{{ game_group.grouper.twitch_id }}"
|
<section>
|
||||||
style="margin-bottom: 3rem">
|
|
||||||
<div style="display: flex; gap: 1rem;">
|
<div style="display: flex; gap: 1rem;">
|
||||||
<div style="flex-shrink: 0;">
|
<div>
|
||||||
{% if game_group.grouper.box_art_best_url %}
|
{% if game_group.grouper.box_art_best_url %}
|
||||||
<img src="{{ game_group.grouper.box_art_best_url }}"
|
<img src="{{ game_group.grouper.box_art_best_url }}"
|
||||||
loading="lazy"
|
loading="lazy"
|
||||||
alt="Box art for {{ game_group.grouper.display_name }}"
|
alt="Box art for {{ game_group.grouper.display_name }}"
|
||||||
width="120"
|
width="120"
|
||||||
height="160"
|
height="160" />
|
||||||
style="border-radius: 8px" />
|
|
||||||
{% else %}
|
{% else %}
|
||||||
<div style="width: 120px;
|
<div style="width: 120px;
|
||||||
height: 160px;
|
height: 160px;
|
||||||
|
|
@ -100,18 +74,14 @@
|
||||||
{% endif %}
|
{% endif %}
|
||||||
</div>
|
</div>
|
||||||
<div style="flex: 1;">
|
<div style="flex: 1;">
|
||||||
{% comment %} Find this header section in your template {% endcomment %}
|
|
||||||
<header style="margin-bottom: 1rem;">
|
<header style="margin-bottom: 1rem;">
|
||||||
<h2 style="margin: 0 0 0.5rem 0;">
|
<h2 style="margin: 0 0 0.5rem 0;">
|
||||||
<a id="game-link-{{ game_group.grouper.twitch_id }}"
|
<a href="{% url 'twitch:game_detail' game_group.grouper.twitch_id %}"
|
||||||
href="{% url 'twitch:game_detail' game_group.grouper.twitch_id %}"
|
|
||||||
style="text-decoration: none">{{ game_group.grouper.display_name|default:game_group.grouper.name|default:game_group.grouper.slug|default:game_group.grouper.twitch_id }}</a>
|
style="text-decoration: none">{{ game_group.grouper.display_name|default:game_group.grouper.name|default:game_group.grouper.slug|default:game_group.grouper.twitch_id }}</a>
|
||||||
</h2>
|
</h2>
|
||||||
{% comment %} Check if the owner exists and has a valid ID before creating the link {% endcomment %}
|
|
||||||
{% if game_group.grouper.owner and game_group.grouper.owner.twitch_id %}
|
{% if game_group.grouper.owner and game_group.grouper.owner.twitch_id %}
|
||||||
<p style="margin: 0;">
|
<p style="margin: 0;">
|
||||||
<a id="org-link-{{ game_group.grouper.owner.twitch_id }}"
|
<a href="{% url 'twitch:organization_detail' game_group.grouper.owner.twitch_id %}"
|
||||||
href="{% url 'twitch:organization_detail' game_group.grouper.owner.twitch_id %}"
|
|
||||||
style="text-decoration: none">{{ game_group.grouper.owner.name }}</a>
|
style="text-decoration: none">{{ game_group.grouper.owner.name }}</a>
|
||||||
</p>
|
</p>
|
||||||
{% endif %}
|
{% endif %}
|
||||||
|
|
@ -119,40 +89,22 @@
|
||||||
<div style="overflow-x: auto;">
|
<div style="overflow-x: auto;">
|
||||||
<div style="display: flex; gap: 1rem; min-width: max-content;">
|
<div style="display: flex; gap: 1rem; min-width: max-content;">
|
||||||
{% for campaign in game_group.list %}
|
{% for campaign in game_group.list %}
|
||||||
<article id="campaign-{{ campaign.twitch_id }}"
|
<article style="display: flex;
|
||||||
style="display: flex;
|
|
||||||
flex-direction: column;
|
flex-direction: column;
|
||||||
align-items: flex-start;
|
align-items: flex-start;
|
||||||
padding: 0.5rem;
|
padding: 0.5rem;
|
||||||
flex-shrink: 0">
|
flex-shrink: 0">
|
||||||
<div>
|
<div>
|
||||||
<a id="campaign-link-{{ campaign.twitch_id }}"
|
<a href="{% url 'twitch:campaign_detail' campaign.twitch_id %}"
|
||||||
href="{% url 'twitch:campaign_detail' campaign.twitch_id %}"
|
|
||||||
style="text-decoration: none">
|
style="text-decoration: none">
|
||||||
{% if campaign.image_best_url or campaign.image_url %}
|
{% if campaign.image_best_url or campaign.image_url %}
|
||||||
<img id="campaign-image-{{ campaign.twitch_id }}"
|
<img src="{{ campaign.image_best_url|default:campaign.image_url }}"
|
||||||
src="{{ campaign.image_best_url|default:campaign.image_url }}"
|
|
||||||
alt="Campaign artwork for {{ campaign.name }}"
|
alt="Campaign artwork for {{ campaign.name }}"
|
||||||
width="120"
|
width="120"
|
||||||
height="120"
|
height="120"
|
||||||
style="border-radius: 4px" />
|
style="border-radius: 4px" />
|
||||||
{% else %}
|
|
||||||
<div style="width: 120px;
|
|
||||||
height: 120px;
|
|
||||||
border: 1px solid;
|
|
||||||
border-radius: 4px;
|
|
||||||
display: flex;
|
|
||||||
align-items: center;
|
|
||||||
justify-content: center;
|
|
||||||
font-size: 0.9rem">
|
|
||||||
📦
|
|
||||||
<br />
|
|
||||||
No Image
|
|
||||||
</div>
|
|
||||||
{% endif %}
|
{% endif %}
|
||||||
<h4 id="campaign-name-{{ campaign.twitch_id }}"
|
<h4 style="margin: 0.5rem 0; text-align: left">{{ campaign.clean_name }}</h4>
|
||||||
style="margin: 0.5rem 0;
|
|
||||||
text-align: left">{{ campaign.clean_name }}</h4>
|
|
||||||
</a>
|
</a>
|
||||||
<div style="font-size: 0.9rem;">
|
<div style="font-size: 0.9rem;">
|
||||||
<time datetime="{{ campaign.start_at|date:'c' }}"
|
<time datetime="{{ campaign.start_at|date:'c' }}"
|
||||||
|
|
@ -167,16 +119,11 @@
|
||||||
</div>
|
</div>
|
||||||
<div style="margin-top: 0.5rem;">
|
<div style="margin-top: 0.5rem;">
|
||||||
{% if campaign.start_at <= now and campaign.end_at >= now %}
|
{% if campaign.start_at <= now and campaign.end_at >= now %}
|
||||||
<span id="campaign-status-{{ campaign.twitch_id }}"
|
<span style="font-weight: 600; color: #28a745">Active</span>
|
||||||
style="font-weight: 600;
|
|
||||||
color: #28a745">Active</span>
|
|
||||||
{% elif campaign.start_at > now %}
|
{% elif campaign.start_at > now %}
|
||||||
<span id="campaign-status-{{ campaign.twitch_id }}"
|
<span style="font-weight: 600">Upcoming</span>
|
||||||
style="font-weight: 600">Upcoming</span>
|
|
||||||
{% else %}
|
{% else %}
|
||||||
<span id="campaign-status-{{ campaign.twitch_id }}"
|
<span style="font-weight: 600; color: #dc3545">Expired</span>
|
||||||
style="font-weight: 600;
|
|
||||||
color: #dc3545">Expired</span>
|
|
||||||
{% endif %}
|
{% endif %}
|
||||||
</div>
|
</div>
|
||||||
</div>
|
</div>
|
||||||
|
|
@ -190,7 +137,6 @@
|
||||||
{% endfor %}
|
{% endfor %}
|
||||||
{% else %}
|
{% else %}
|
||||||
<section style="text-align: center; padding: 3rem 1rem;">
|
<section style="text-align: center; padding: 3rem 1rem;">
|
||||||
<div style="font-size: 4rem; margin-bottom: 1rem;">📦</div>
|
|
||||||
<h2 style="margin: 0 0 1rem 0;">No Campaigns Found</h2>
|
<h2 style="margin: 0 0 1rem 0;">No Campaigns Found</h2>
|
||||||
<p style="margin: 0; font-size: 1.1rem;">
|
<p style="margin: 0; font-size: 1.1rem;">
|
||||||
No campaigns match your current filters.
|
No campaigns match your current filters.
|
||||||
|
|
@ -201,39 +147,39 @@
|
||||||
{% endif %}
|
{% endif %}
|
||||||
<!-- Pagination -->
|
<!-- Pagination -->
|
||||||
{% if is_paginated %}
|
{% if is_paginated %}
|
||||||
<nav id="pagination" style="margin-top: 3rem; text-align: center;">
|
<nav style="margin-top: 3rem; text-align: center;">
|
||||||
<div style="display: flex;
|
<div style="display: flex;
|
||||||
justify-content: center;
|
justify-content: center;
|
||||||
align-items: center;
|
align-items: center;
|
||||||
gap: 0.5rem;
|
gap: 0.5rem;
|
||||||
flex-wrap: wrap">
|
flex-wrap: wrap">
|
||||||
{% if page_obj.has_previous %}
|
{% if page_obj.has_previous %}
|
||||||
<a href="?{% if selected_status %}status={{ selected_status }}&{% endif %}{% if selected_game %}game={{ selected_game }}&{% endif %}{% if selected_per_page != 24 %}per_page={{ selected_per_page }}&{% endif %}page=1"
|
<a href="?{% if selected_status %}status={{ selected_status }}&{% endif %}{% if selected_game %}game={{ selected_game }}&{% endif %}{% if selected_per_page != 100 %}per_page={{ selected_per_page }}&{% endif %}page=1"
|
||||||
style="padding: 0.5rem 1rem;
|
style="padding: 0.5rem 1rem;
|
||||||
border: 1px solid;
|
border: 1px solid;
|
||||||
border-radius: 4px;
|
border-radius: 4px;
|
||||||
text-decoration: none">««</a>
|
text-decoration: none">[first]</a>
|
||||||
<a href="?{% if selected_status %}status={{ selected_status }}&{% endif %}{% if selected_game %}game={{ selected_game }}&{% endif %}{% if selected_per_page != 24 %}per_page={{ selected_per_page }}&{% endif %}page={{ page_obj.previous_page_number }}"
|
<a href="?{% if selected_status %}status={{ selected_status }}&{% endif %}{% if selected_game %}game={{ selected_game }}&{% endif %}{% if selected_per_page != 100 %}per_page={{ selected_per_page }}&{% endif %}page={{ page_obj.previous_page_number }}"
|
||||||
style="padding: 0.5rem 1rem;
|
style="padding: 0.5rem 1rem;
|
||||||
border: 1px solid;
|
border: 1px solid;
|
||||||
border-radius: 4px;
|
border-radius: 4px;
|
||||||
text-decoration: none"
|
text-decoration: none"
|
||||||
aria-label="Previous">«</a>
|
aria-label="Previous">[previous]</a>
|
||||||
{% else %}
|
{% else %}
|
||||||
<span style="padding: 0.5rem 1rem;">««</span>
|
<span style="padding: 0.5rem 1rem;">[first]</span>
|
||||||
<span style="padding: 0.5rem 1rem;">«</span>
|
<span style="padding: 0.5rem 1rem;">[previous]</span>
|
||||||
{% endif %}
|
{% endif %}
|
||||||
{% for num in page_obj.paginator.page_range %}
|
{% for num in page_obj.paginator.page_range %}
|
||||||
{% if page_obj.number == num %}
|
{% if page_obj.number == num %}
|
||||||
<span style="padding: 0.5rem 1rem; border-radius: 4px; font-weight: 600">{{ num }}</span>
|
<span style="padding: 0.5rem 1rem; border-radius: 4px; font-weight: 600">{{ num }}</span>
|
||||||
{% elif num > page_obj.number|add:'-3' and num < page_obj.number|add:'3' %}
|
{% elif num > page_obj.number|add:'-3' and num < page_obj.number|add:'3' %}
|
||||||
<a href="?{% if selected_status %}status={{ selected_status }}&{% endif %}{% if selected_game %}game={{ selected_game }}&{% endif %}{% if selected_per_page != 24 %}per_page={{ selected_per_page }}&{% endif %}page={{ num }}"
|
<a href="?{% if selected_status %}status={{ selected_status }}&{% endif %}{% if selected_game %}game={{ selected_game }}&{% endif %}{% if selected_per_page != 100 %}per_page={{ selected_per_page }}&{% endif %}page={{ num }}"
|
||||||
style="padding: 0.5rem 1rem;
|
style="padding: 0.5rem 1rem;
|
||||||
border: 1px solid;
|
border: 1px solid;
|
||||||
border-radius: 4px;
|
border-radius: 4px;
|
||||||
text-decoration: none">{{ num }}</a>
|
text-decoration: none">{{ num }}</a>
|
||||||
{% elif num == 1 or num == page_obj.paginator.num_pages %}
|
{% elif num == 1 or num == page_obj.paginator.num_pages %}
|
||||||
<a href="?{% if selected_status %}status={{ selected_status }}&{% endif %}{% if selected_game %}game={{ selected_game }}&{% endif %}{% if selected_per_page != 24 %}per_page={{ selected_per_page }}&{% endif %}page={{ num }}"
|
<a href="?{% if selected_status %}status={{ selected_status }}&{% endif %}{% if selected_game %}game={{ selected_game }}&{% endif %}{% if selected_per_page != 100 %}per_page={{ selected_per_page }}&{% endif %}page={{ num }}"
|
||||||
style="padding: 0.5rem 1rem;
|
style="padding: 0.5rem 1rem;
|
||||||
border: 1px solid;
|
border: 1px solid;
|
||||||
border-radius: 4px;
|
border-radius: 4px;
|
||||||
|
|
@ -243,19 +189,19 @@
|
||||||
{% endif %}
|
{% endif %}
|
||||||
{% endfor %}
|
{% endfor %}
|
||||||
{% if page_obj.has_next %}
|
{% if page_obj.has_next %}
|
||||||
<a href="?{% if selected_status %}status={{ selected_status }}&{% endif %}{% if selected_game %}game={{ selected_game }}&{% endif %}{% if selected_per_page != 24 %}per_page={{ selected_per_page }}&{% endif %}page={{ page_obj.next_page_number }}"
|
<a href="?{% if selected_status %}status={{ selected_status }}&{% endif %}{% if selected_game %}game={{ selected_game }}&{% endif %}{% if selected_per_page != 100 %}per_page={{ selected_per_page }}&{% endif %}page={{ page_obj.next_page_number }}"
|
||||||
style="padding: 0.5rem 1rem;
|
style="padding: 0.5rem 1rem;
|
||||||
border: 1px solid;
|
border: 1px solid;
|
||||||
border-radius: 4px;
|
border-radius: 4px;
|
||||||
text-decoration: none">»</a>
|
text-decoration: none">[next]</a>
|
||||||
<a href="?{% if selected_status %}status={{ selected_status }}&{% endif %}{% if selected_game %}game={{ selected_game }}&{% endif %}{% if selected_per_page != 24 %}per_page={{ selected_per_page }}&{% endif %}page={{ page_obj.paginator.num_pages }}"
|
<a href="?{% if selected_status %}status={{ selected_status }}&{% endif %}{% if selected_game %}game={{ selected_game }}&{% endif %}{% if selected_per_page != 100 %}per_page={{ selected_per_page }}&{% endif %}page={{ page_obj.paginator.num_pages }}"
|
||||||
style="padding: 0.5rem 1rem;
|
style="padding: 0.5rem 1rem;
|
||||||
border: 1px solid;
|
border: 1px solid;
|
||||||
border-radius: 4px;
|
border-radius: 4px;
|
||||||
text-decoration: none">»»</a>
|
text-decoration: none">[last]</a>
|
||||||
{% else %}
|
{% else %}
|
||||||
<span style="padding: 0.5rem 1rem;">»</span>
|
<span style="padding: 0.5rem 1rem;">[next]</span>
|
||||||
<span style="padding: 0.5rem 1rem;">»»</span>
|
<span style="padding: 0.5rem 1rem;">[last]</span>
|
||||||
{% endif %}
|
{% endif %}
|
||||||
</div>
|
</div>
|
||||||
<small style="display: block; margin-top: 1rem;">
|
<small style="display: block; margin-top: 1rem;">
|
||||||
|
|
|
||||||
|
|
@ -1,6 +1,7 @@
|
||||||
from __future__ import annotations
|
from __future__ import annotations
|
||||||
|
|
||||||
import datetime
|
import datetime
|
||||||
|
from datetime import timedelta
|
||||||
from typing import TYPE_CHECKING
|
from typing import TYPE_CHECKING
|
||||||
from typing import Any
|
from typing import Any
|
||||||
from typing import Literal
|
from typing import Literal
|
||||||
|
|
@ -456,6 +457,262 @@ class TestChannelListView:
|
||||||
assert response.status_code == 200
|
assert response.status_code == 200
|
||||||
assert "campaigns" in response.context
|
assert "campaigns" in response.context
|
||||||
|
|
||||||
|
@pytest.mark.django_db
|
||||||
|
def test_drop_campaign_list_pagination(self, client: Client) -> None:
|
||||||
|
"""Test pagination works correctly with 100 items per page."""
|
||||||
|
game: Game = Game.objects.create(twitch_id="g1", name="Game", display_name="Game")
|
||||||
|
now: datetime.datetime = timezone.now()
|
||||||
|
|
||||||
|
# Create 150 campaigns to test pagination
|
||||||
|
campaigns = [
|
||||||
|
DropCampaign(
|
||||||
|
twitch_id=f"c{i}",
|
||||||
|
name=f"Campaign {i}",
|
||||||
|
game=game,
|
||||||
|
start_at=now - timedelta(days=10),
|
||||||
|
end_at=now + timedelta(days=10),
|
||||||
|
operation_names=["DropCampaignDetails"],
|
||||||
|
)
|
||||||
|
for i in range(150)
|
||||||
|
]
|
||||||
|
DropCampaign.objects.bulk_create(campaigns)
|
||||||
|
|
||||||
|
# Test first page
|
||||||
|
response: _MonkeyPatchedWSGIResponse = client.get(reverse("twitch:campaign_list"))
|
||||||
|
assert response.status_code == 200
|
||||||
|
assert "is_paginated" in response.context
|
||||||
|
assert response.context["is_paginated"] is True
|
||||||
|
assert "page_obj" in response.context
|
||||||
|
assert len(response.context["campaigns"]) == 100
|
||||||
|
assert response.context["page_obj"].number == 1
|
||||||
|
assert response.context["page_obj"].has_next() is True
|
||||||
|
|
||||||
|
# Test second page
|
||||||
|
response = client.get(reverse("twitch:campaign_list") + "?page=2")
|
||||||
|
assert response.status_code == 200
|
||||||
|
assert len(response.context["campaigns"]) == 50
|
||||||
|
assert response.context["page_obj"].number == 2
|
||||||
|
assert response.context["page_obj"].has_previous() is True
|
||||||
|
assert response.context["page_obj"].has_next() is False
|
||||||
|
|
||||||
|
@pytest.mark.django_db
|
||||||
|
def test_drop_campaign_list_status_filter_active(self, client: Client) -> None:
|
||||||
|
"""Test filtering for active campaigns only."""
|
||||||
|
game: Game = Game.objects.create(twitch_id="g1", name="Game", display_name="Game")
|
||||||
|
now: datetime.datetime = timezone.now()
|
||||||
|
|
||||||
|
# Create active campaign
|
||||||
|
_active_campaign: DropCampaign = DropCampaign.objects.create(
|
||||||
|
twitch_id="active",
|
||||||
|
name="Active Campaign",
|
||||||
|
game=game,
|
||||||
|
start_at=now - timedelta(days=5),
|
||||||
|
end_at=now + timedelta(days=5),
|
||||||
|
operation_names=["DropCampaignDetails"],
|
||||||
|
)
|
||||||
|
|
||||||
|
# Create upcoming campaign
|
||||||
|
DropCampaign.objects.create(
|
||||||
|
twitch_id="upcoming",
|
||||||
|
name="Upcoming Campaign",
|
||||||
|
game=game,
|
||||||
|
start_at=now + timedelta(days=5),
|
||||||
|
end_at=now + timedelta(days=10),
|
||||||
|
operation_names=["DropCampaignDetails"],
|
||||||
|
)
|
||||||
|
|
||||||
|
# Create expired campaign
|
||||||
|
DropCampaign.objects.create(
|
||||||
|
twitch_id="expired",
|
||||||
|
name="Expired Campaign",
|
||||||
|
game=game,
|
||||||
|
start_at=now - timedelta(days=10),
|
||||||
|
end_at=now - timedelta(days=5),
|
||||||
|
operation_names=["DropCampaignDetails"],
|
||||||
|
)
|
||||||
|
|
||||||
|
# Test active filter
|
||||||
|
response: _MonkeyPatchedWSGIResponse = client.get(
|
||||||
|
reverse("twitch:campaign_list") + "?status=active",
|
||||||
|
)
|
||||||
|
assert response.status_code == 200
|
||||||
|
campaigns: list[DropCampaign] = list(response.context["campaigns"])
|
||||||
|
assert len(campaigns) == 1
|
||||||
|
assert campaigns[0].twitch_id == "active"
|
||||||
|
|
||||||
|
@pytest.mark.django_db
|
||||||
|
def test_drop_campaign_list_status_filter_upcoming(self, client: Client) -> None:
|
||||||
|
"""Test filtering for upcoming campaigns only."""
|
||||||
|
game: Game = Game.objects.create(twitch_id="g1", name="Game", display_name="Game")
|
||||||
|
now: datetime.datetime = timezone.now()
|
||||||
|
|
||||||
|
# Create active campaign
|
||||||
|
DropCampaign.objects.create(
|
||||||
|
twitch_id="active",
|
||||||
|
name="Active Campaign",
|
||||||
|
game=game,
|
||||||
|
start_at=now - timedelta(days=5),
|
||||||
|
end_at=now + timedelta(days=5),
|
||||||
|
operation_names=["DropCampaignDetails"],
|
||||||
|
)
|
||||||
|
|
||||||
|
# Create upcoming campaign
|
||||||
|
_upcoming_campaign: DropCampaign = DropCampaign.objects.create(
|
||||||
|
twitch_id="upcoming",
|
||||||
|
name="Upcoming Campaign",
|
||||||
|
game=game,
|
||||||
|
start_at=now + timedelta(days=5),
|
||||||
|
end_at=now + timedelta(days=10),
|
||||||
|
operation_names=["DropCampaignDetails"],
|
||||||
|
)
|
||||||
|
|
||||||
|
# Create expired campaign
|
||||||
|
DropCampaign.objects.create(
|
||||||
|
twitch_id="expired",
|
||||||
|
name="Expired Campaign",
|
||||||
|
game=game,
|
||||||
|
start_at=now - timedelta(days=10),
|
||||||
|
end_at=now - timedelta(days=5),
|
||||||
|
operation_names=["DropCampaignDetails"],
|
||||||
|
)
|
||||||
|
|
||||||
|
# Test upcoming filter
|
||||||
|
response: _MonkeyPatchedWSGIResponse = client.get(
|
||||||
|
reverse("twitch:campaign_list") + "?status=upcoming",
|
||||||
|
)
|
||||||
|
assert response.status_code == 200
|
||||||
|
campaigns: list[DropCampaign] = list(response.context["campaigns"])
|
||||||
|
assert len(campaigns) == 1
|
||||||
|
assert campaigns[0].twitch_id == "upcoming"
|
||||||
|
|
||||||
|
@pytest.mark.django_db
|
||||||
|
def test_drop_campaign_list_status_filter_expired(self, client: Client) -> None:
|
||||||
|
"""Test filtering for expired campaigns only."""
|
||||||
|
game: Game = Game.objects.create(twitch_id="g1", name="Game", display_name="Game")
|
||||||
|
now: datetime.datetime = timezone.now()
|
||||||
|
|
||||||
|
# Create active campaign
|
||||||
|
DropCampaign.objects.create(
|
||||||
|
twitch_id="active",
|
||||||
|
name="Active Campaign",
|
||||||
|
game=game,
|
||||||
|
start_at=now - timedelta(days=5),
|
||||||
|
end_at=now + timedelta(days=5),
|
||||||
|
operation_names=["DropCampaignDetails"],
|
||||||
|
)
|
||||||
|
|
||||||
|
# Create upcoming campaign
|
||||||
|
DropCampaign.objects.create(
|
||||||
|
twitch_id="upcoming",
|
||||||
|
name="Upcoming Campaign",
|
||||||
|
game=game,
|
||||||
|
start_at=now + timedelta(days=5),
|
||||||
|
end_at=now + timedelta(days=10),
|
||||||
|
operation_names=["DropCampaignDetails"],
|
||||||
|
)
|
||||||
|
|
||||||
|
# Create expired campaign
|
||||||
|
_expired_campaign: DropCampaign = DropCampaign.objects.create(
|
||||||
|
twitch_id="expired",
|
||||||
|
name="Expired Campaign",
|
||||||
|
game=game,
|
||||||
|
start_at=now - timedelta(days=10),
|
||||||
|
end_at=now - timedelta(days=5),
|
||||||
|
operation_names=["DropCampaignDetails"],
|
||||||
|
)
|
||||||
|
|
||||||
|
# Test expired filter
|
||||||
|
response: _MonkeyPatchedWSGIResponse = client.get(
|
||||||
|
reverse("twitch:campaign_list") + "?status=expired",
|
||||||
|
)
|
||||||
|
assert response.status_code == 200
|
||||||
|
campaigns: list[DropCampaign] = list(response.context["campaigns"])
|
||||||
|
assert len(campaigns) == 1
|
||||||
|
assert campaigns[0].twitch_id == "expired"
|
||||||
|
|
||||||
|
@pytest.mark.django_db
|
||||||
|
def test_drop_campaign_list_game_filter(self, client: Client) -> None:
|
||||||
|
"""Test filtering campaigns by game."""
|
||||||
|
game1: Game = Game.objects.create(twitch_id="g1", name="Game 1", display_name="Game 1")
|
||||||
|
game2: Game = Game.objects.create(twitch_id="g2", name="Game 2", display_name="Game 2")
|
||||||
|
now: datetime.datetime = timezone.now()
|
||||||
|
|
||||||
|
# Create campaigns for game 1
|
||||||
|
DropCampaign.objects.create(
|
||||||
|
twitch_id="c1",
|
||||||
|
name="Campaign 1",
|
||||||
|
game=game1,
|
||||||
|
start_at=now - timedelta(days=5),
|
||||||
|
end_at=now + timedelta(days=5),
|
||||||
|
operation_names=["DropCampaignDetails"],
|
||||||
|
)
|
||||||
|
DropCampaign.objects.create(
|
||||||
|
twitch_id="c2",
|
||||||
|
name="Campaign 2",
|
||||||
|
game=game1,
|
||||||
|
start_at=now - timedelta(days=5),
|
||||||
|
end_at=now + timedelta(days=5),
|
||||||
|
operation_names=["DropCampaignDetails"],
|
||||||
|
)
|
||||||
|
|
||||||
|
# Create campaign for game 2
|
||||||
|
DropCampaign.objects.create(
|
||||||
|
twitch_id="c3",
|
||||||
|
name="Campaign 3",
|
||||||
|
game=game2,
|
||||||
|
start_at=now - timedelta(days=5),
|
||||||
|
end_at=now + timedelta(days=5),
|
||||||
|
operation_names=["DropCampaignDetails"],
|
||||||
|
)
|
||||||
|
|
||||||
|
# Test filtering by game1
|
||||||
|
response: _MonkeyPatchedWSGIResponse = client.get(
|
||||||
|
reverse("twitch:campaign_list") + "?game=g1",
|
||||||
|
)
|
||||||
|
assert response.status_code == 200
|
||||||
|
campaigns: list[DropCampaign] = list(response.context["campaigns"])
|
||||||
|
assert len(campaigns) == 2
|
||||||
|
assert all(c.game.twitch_id == "g1" for c in campaigns)
|
||||||
|
|
||||||
|
# Test filtering by game2
|
||||||
|
response = client.get(reverse("twitch:campaign_list") + "?game=g2")
|
||||||
|
assert response.status_code == 200
|
||||||
|
campaigns = list(response.context["campaigns"])
|
||||||
|
assert len(campaigns) == 1
|
||||||
|
assert campaigns[0].game.twitch_id == "g2"
|
||||||
|
|
||||||
|
@pytest.mark.django_db
|
||||||
|
def test_drop_campaign_list_pagination_preserves_filters(self, client: Client) -> None:
|
||||||
|
"""Test that pagination links preserve game and status filters."""
|
||||||
|
game: Game = Game.objects.create(twitch_id="g1", name="Game", display_name="Game")
|
||||||
|
now: datetime.datetime = timezone.now()
|
||||||
|
|
||||||
|
# Create 150 active campaigns for game g1
|
||||||
|
campaigns = [
|
||||||
|
DropCampaign(
|
||||||
|
twitch_id=f"c{i}",
|
||||||
|
name=f"Campaign {i}",
|
||||||
|
game=game,
|
||||||
|
start_at=now - timedelta(days=5),
|
||||||
|
end_at=now + timedelta(days=5),
|
||||||
|
operation_names=["DropCampaignDetails"],
|
||||||
|
)
|
||||||
|
for i in range(150)
|
||||||
|
]
|
||||||
|
DropCampaign.objects.bulk_create(campaigns)
|
||||||
|
|
||||||
|
# Request first page with filters
|
||||||
|
response: _MonkeyPatchedWSGIResponse = client.get(
|
||||||
|
reverse("twitch:campaign_list") + "?game=g1&status=active",
|
||||||
|
)
|
||||||
|
assert response.status_code == 200
|
||||||
|
assert response.context["is_paginated"] is True
|
||||||
|
|
||||||
|
# Check that response HTML contains pagination links with filters
|
||||||
|
content: str = response.content.decode("utf-8")
|
||||||
|
assert "?status=active&game=g1" in content
|
||||||
|
assert "page=2" in content
|
||||||
|
|
||||||
@pytest.mark.django_db
|
@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: object) -> None:
|
||||||
"""Test campaign detail view returns 200 and has campaign in context."""
|
"""Test campaign detail view returns 200 and has campaign in context."""
|
||||||
|
|
|
||||||
|
|
@ -282,7 +282,7 @@ def drop_campaign_list_view(request: HttpRequest) -> HttpResponse:
|
||||||
queryset = queryset.prefetch_related("game__owners").order_by("-start_at")
|
queryset = queryset.prefetch_related("game__owners").order_by("-start_at")
|
||||||
|
|
||||||
# Optionally filter by status (active, upcoming, expired)
|
# Optionally filter by status (active, upcoming, expired)
|
||||||
now = timezone.now()
|
now: datetime.datetime = timezone.now()
|
||||||
if status_filter == "active":
|
if status_filter == "active":
|
||||||
queryset = queryset.filter(start_at__lte=now, end_at__gte=now)
|
queryset = queryset.filter(start_at__lte=now, end_at__gte=now)
|
||||||
elif status_filter == "upcoming":
|
elif status_filter == "upcoming":
|
||||||
|
|
@ -290,10 +290,10 @@ def drop_campaign_list_view(request: HttpRequest) -> HttpResponse:
|
||||||
elif status_filter == "expired":
|
elif status_filter == "expired":
|
||||||
queryset = queryset.filter(end_at__lt=now)
|
queryset = queryset.filter(end_at__lt=now)
|
||||||
|
|
||||||
paginator = Paginator(queryset, per_page)
|
paginator: Paginator[DropCampaign] = Paginator(queryset, per_page)
|
||||||
page = request.GET.get("page") or 1
|
page: str | Literal[1] = request.GET.get("page") or 1
|
||||||
try:
|
try:
|
||||||
campaigns = paginator.page(page)
|
campaigns: Page[DropCampaign] = paginator.page(page)
|
||||||
except PageNotAnInteger:
|
except PageNotAnInteger:
|
||||||
campaigns = paginator.page(1)
|
campaigns = paginator.page(1)
|
||||||
except EmptyPage:
|
except EmptyPage:
|
||||||
|
|
@ -301,6 +301,8 @@ def drop_campaign_list_view(request: HttpRequest) -> HttpResponse:
|
||||||
|
|
||||||
context: dict[str, Any] = {
|
context: dict[str, Any] = {
|
||||||
"campaigns": campaigns,
|
"campaigns": campaigns,
|
||||||
|
"page_obj": campaigns,
|
||||||
|
"is_paginated": campaigns.has_other_pages(),
|
||||||
"games": Game.objects.all().order_by("display_name"),
|
"games": Game.objects.all().order_by("display_name"),
|
||||||
"status_options": ["active", "upcoming", "expired"],
|
"status_options": ["active", "upcoming", "expired"],
|
||||||
"now": now,
|
"now": now,
|
||||||
|
|
|
||||||
Loading…
Add table
Add a link
Reference in a new issue