TheLovinator/ttvdrops
1
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Allow operation_names to be a list instead of a singular item

Browse source
This commit is contained in:
Joakim Hellsén 2026-01-17 07:05:41 +01:00
commit 65a7622582
No known key found for this signature in database
7 changed files with 104 additions and 42 deletions
Download patch file Download diff file Expand all files Collapse all files

33
twitch/tests/test_better_import_drops.py
View file

@ -169,7 +169,7 @@ class ExtractCampaignsTests(TestCase):
# Check that campaign was created with operation_name
campaign: DropCampaign = DropCampaign.objects.get(twitch_id="inventory-campaign-1")
assert campaign.name == "Test Inventory Campaign"
assert campaign.operation_name == "Inventory"
assert campaign.operation_names == ["Inventory"]
def test_handles_inventory_with_null_campaigns(self) -> None:
"""Ensure Inventory JSON with null dropCampaignsInProgress is handled correctly."""
@ -467,24 +467,25 @@ class OperationNameFilteringTests(TestCase):
command.process_responses([viewer_drops_payload], Path("viewer.json"), {})
command.process_responses([inventory_payload], Path("inventory.json"), {})
# Verify we can filter by operation_name
viewer_campaigns: QuerySet[DropCampaign, DropCampaign] = DropCampaign.objects.filter(
operation_name="ViewerDropsDashboard",
)
inventory_campaigns: QuerySet[DropCampaign, DropCampaign] = DropCampaign.objects.filter(
operation_name="Inventory",
)
# Verify we can filter by operation_names
# SQLite doesn't support JSON contains, so we filter in Python
all_campaigns: QuerySet[DropCampaign, DropCampaign] = DropCampaign.objects.all()
viewer_campaigns: list[DropCampaign] = [c for c in all_campaigns if "ViewerDropsDashboard" in c.operation_names]
inventory_campaigns: list[DropCampaign] = [c for c in all_campaigns if "Inventory" in c.operation_names]
assert viewer_campaigns.count() >= 1
assert inventory_campaigns.count() >= 1
assert len(viewer_campaigns) >= 1
assert len(inventory_campaigns) >= 1
# Verify the correct campaigns are in each queryset
assert viewer_campaigns.filter(twitch_id="viewer-campaign-1").exists()
assert inventory_campaigns.filter(twitch_id="inventory-campaign-1").exists()
# Verify the correct campaigns are in each list
viewer_ids = [c.twitch_id for c in viewer_campaigns]
inventory_ids = [c.twitch_id for c in inventory_campaigns]
assert "viewer-campaign-1" in viewer_ids
assert "inventory-campaign-1" in inventory_ids
# Cross-check: Inventory campaign should not be in viewer campaigns
assert not viewer_campaigns.filter(twitch_id="inventory-campaign-1").exists()
assert not inventory_campaigns.filter(twitch_id="viewer-campaign-1").exists()
assert "inventory-campaign-1" not in viewer_ids
assert "viewer-campaign-1" not in inventory_ids
class GameImportTests(TestCase):
@ -586,7 +587,7 @@ class ExampleJsonImportTests(TestCase):
assert campaign.allow_channels.count() == 0
# Operation name provenance
assert campaign.operation_name == "DropCampaignDetails"
assert campaign.operation_names == ["DropCampaignDetails"]
# Related game/org normalization
game: Game = Game.objects.get(twitch_id="2094865572")

6
twitch/tests/test_feeds.py
View file

@ -39,7 +39,7 @@ class RSSFeedTestCase(TestCase):
game=self.game,
start_at=timezone.now(),
end_at=timezone.now() + timedelta(days=7),
operation_name="DropCampaignDetails",
operation_names=["DropCampaignDetails"],
)
def test_organization_feed(self) -> None:
@ -132,7 +132,7 @@ class RSSFeedTestCase(TestCase):
game=other_game,
start_at=timezone.now(),
end_at=timezone.now() + timedelta(days=7),
operation_name="DropCampaignDetails",
operation_names=["DropCampaignDetails"],
)
# Get feed for first game
@ -165,7 +165,7 @@ class RSSFeedTestCase(TestCase):
game=other_game,
start_at=timezone.now(),
end_at=timezone.now() + timedelta(days=7),
operation_name="DropCampaignDetails",
operation_names=["DropCampaignDetails"],
)
# Get feed for first organization

12
twitch/tests/test_views.py
View file

@ -47,7 +47,7 @@ class TestSearchView:
name="Test Campaign",
description="A test campaign",
game=game,
operation_name="DropCampaignDetails",
operation_names=["DropCampaignDetails"],
)
drop: TimeBasedDrop = TimeBasedDrop.objects.create(
twitch_id="1011",
@ -268,7 +268,7 @@ class TestChannelListView:
twitch_id=f"campaign{i}",
name=f"Campaign {i}",
game=game,
operation_name="DropCampaignDetails",
operation_names=["DropCampaignDetails"],
)
campaign.allow_channels.add(channel)
campaigns.append(campaign)
@ -357,7 +357,7 @@ class TestChannelListView:
twitch_id=f"campaign_ch2_{i}",
name=f"Campaign Ch2 {i}",
game=game,
operation_name="DropCampaignDetails",
operation_names=["DropCampaignDetails"],
)
campaign.allow_channels.add(channel2)
@ -422,7 +422,7 @@ class TestChannelListView:
twitch_id="camp1",
name="Campaign",
game=game,
operation_name="DropCampaignDetails",
operation_names=["DropCampaignDetails"],
start_at=now - datetime.timedelta(hours=1),
end_at=now + datetime.timedelta(hours=1),
)
@ -464,7 +464,7 @@ class TestChannelListView:
twitch_id="c1",
name="Campaign",
game=game,
operation_name="DropCampaignDetails",
operation_names=["DropCampaignDetails"],
)
url: str = reverse("twitch:campaign_detail", args=[campaign.twitch_id])
response: _MonkeyPatchedWSGIResponse = client.get(url)
@ -482,7 +482,7 @@ class TestChannelListView:
twitch_id="c-badge",
name="Campaign",
game=game,
operation_name="DropCampaignDetails",
operation_names=["DropCampaignDetails"],
)
drop = TimeBasedDrop.objects.create(