/", views.playoffs, name="playoffs"),
]
-
-
diff --git a/DSTBundesliga/apps/leagues/views.py b/DSTBundesliga/apps/leagues/views.py
index 83b18d8..0898e5b 100644
--- a/DSTBundesliga/apps/leagues/views.py
+++ b/DSTBundesliga/apps/leagues/views.py
@@ -4,22 +4,53 @@
import django_tables2 as tables
import pytz
from django.core.exceptions import ObjectDoesNotExist
-from django.db.models import Avg, ExpressionWrapper, F, IntegerField, Sum, Count, Min, Max, Window, Value, FloatField
+from django.db.models import (
+ Avg,
+ ExpressionWrapper,
+ F,
+ IntegerField,
+ Sum,
+ Count,
+ Min,
+ Max,
+ Window,
+ Value,
+ FloatField,
+)
from django.db.models.functions import RowNumber
from django.shortcuts import render
from django.urls import reverse
from DSTBundesliga.apps.leagues.config import LEVEL_MAP, LOGO_MAP
-from DSTBundesliga.apps.leagues.models import League, Roster, Draft, Pick, Player, DSTPlayer, Matchup, \
- PlayoffMatchup, Season, PlayerDraftStats, WaiverPickup
-from DSTBundesliga.apps.leagues.tables import LeagueTable, RosterTable, DraftsADPTable, NextDraftsTable, \
- UpsetAndStealPickTable, PlayerStatsTable, WaiverTopBids, WaiverTopPlayers
+from DSTBundesliga.apps.leagues.models import (
+ League,
+ Roster,
+ Draft,
+ Pick,
+ Player,
+ DSTPlayer,
+ Matchup,
+ PlayoffMatchup,
+ Season,
+ PlayerDraftStats,
+ WaiverPickup,
+)
+from DSTBundesliga.apps.leagues.tables import (
+ LeagueTable,
+ RosterTable,
+ DraftsADPTable,
+ NextDraftsTable,
+ UpsetAndStealPickTable,
+ PlayerStatsTable,
+ WaiverTopBids,
+ WaiverTopPlayers,
+)
from DSTBundesliga.apps.services.awards_service import AwardService
class LeagueView(tables.SingleTableView):
table_class = LeagueTable
- queryset = League.objects.get_active().order_by('level', 'sleeper_name')
+ queryset = League.objects.get_active().order_by("level", "sleeper_name")
template_name = "leagues/league_list.html"
@@ -29,14 +60,11 @@ def roster_list(request, league_id):
title = league.sleeper_name
table = RosterTable(Roster.objects.filter(league=league))
- return render(request, "leagues/roster_list.html", {
- "title": title,
- "table": table
- })
+ return render(request, "leagues/roster_list.html", {"title": title, "table": table})
def level_detail(request, level=None, conference=None, region=None, season=None):
- league_objects = League.objects.all().order_by('sleeper_id')
+ league_objects = League.objects.all().order_by("sleeper_id")
header_logo = None
if season:
@@ -55,36 +83,52 @@ def level_detail(request, level=None, conference=None, region=None, season=None)
if region:
if region == "Sued":
- region = 'Süd'
+ region = "Süd"
league_objects = league_objects.filter(region=region)
- leagues = [{
- "title": league.sleeper_name,
- "table": RosterTable(Roster.objects.filter(league=league)),
- "conference": league.conference or "",
- "stats_link": reverse('facts_and_figures_league', kwargs={'league_id': league.sleeper_id}),
- "playoffs_link": reverse('playoffs', kwargs={'league_id': league.sleeper_id}),
- "draft_link": reverse('draft-board',
- kwargs={'league_id': league.sleeper_id}) if league.draft.status != 'pre_draft' else None
- } for league in league_objects]
+ leagues = [
+ {
+ "title": league.sleeper_name,
+ "table": RosterTable(Roster.objects.filter(league=league)),
+ "conference": league.conference or "",
+ "stats_link": reverse(
+ "facts_and_figures_league", kwargs={"league_id": league.sleeper_id}
+ ),
+ "playoffs_link": reverse(
+ "playoffs", kwargs={"league_id": league.sleeper_id}
+ ),
+ "draft_link": reverse(
+ "draft-board", kwargs={"league_id": league.sleeper_id}
+ )
+ if league.draft.status != "pre_draft"
+ else None,
+ }
+ for league in league_objects
+ ]
- return render(request, "leagues/level_detail.html", {
- "leagues": leagues,
- "header_logo": header_logo
- })
+ return render(
+ request,
+ "leagues/level_detail.html",
+ {"leagues": leagues, "header_logo": header_logo},
+ )
def my_league(request):
all_leagues = League.objects.get_active()
context = {
- "levels": [{
- "title": LEVEL_MAP.get(level),
- "leagues": all_leagues.filter(level=level).order_by("sleeper_name")
- } for level in all_leagues.order_by("level").values_list("level", flat=True).distinct()]
+ "levels": [
+ {
+ "title": LEVEL_MAP.get(level),
+ "leagues": all_leagues.filter(level=level).order_by("sleeper_name"),
+ }
+ for level in all_leagues.order_by("level")
+ .values_list("level", flat=True)
+ .distinct()
+ ]
}
- my_league_id = request.COOKIES.get('my_league')
+ my_league_id = request.COOKIES.get("my_league")
if my_league_id:
league = all_leagues.get(sleeper_id=my_league_id)
title = league.sleeper_name
@@ -97,18 +141,25 @@ def my_league(request):
context["table"] = table
context["conference"] = league.conference or ""
context["header_logo"] = header_logo
- context["stats_link"] = reverse('facts_and_figures_league', kwargs={'league_id': league.sleeper_id})
- context["draft_link"] = reverse('draft-board', kwargs={
- 'league_id': league.sleeper_id}) if league.draft.status != 'pre_draft' else None
+ context["stats_link"] = reverse(
+ "facts_and_figures_league", kwargs={"league_id": league.sleeper_id}
+ )
+ context["draft_link"] = (
+ reverse("draft-board", kwargs={"league_id": league.sleeper_id})
+ if league.draft.status != "pre_draft"
+ else None
+ )
return render(request, "leagues/my_league.html", context)
def draft_stats(request, position=None):
- drafts = Draft.objects.filter(league__season__active=True).filter(league__type=League.BUNDESLIGA)
+ drafts = Draft.objects.filter(league__season__active=True).filter(
+ league__type=League.BUNDESLIGA
+ )
- drafts_done = drafts.filter(status='complete').count()
- drafts_running = drafts.filter(status__in=['drafting', 'paused']).count()
+ drafts_done = drafts.filter(status="complete").count()
+ drafts_running = drafts.filter(status__in=["drafting", "paused"]).count()
drafts_overall = League.objects.get_active().filter(type=League.BUNDESLIGA).count()
drafts_done_percent = drafts_done / max(drafts_overall, 1) * 100
@@ -120,30 +171,57 @@ def draft_stats(request, position=None):
else:
player_stats = player_stats.filter(pick_count__gte=drafts_done * 0.5)
- adp_table = DraftsADPTable(player_stats.order_by('adp')[:200])
+ adp_table = DraftsADPTable(player_stats.order_by("adp")[:200])
next_drafts_table = NextDraftsTable(
- drafts.exclude(start_time=None).exclude(start_time__lte=datetime.utcnow().replace(tzinfo=pytz.utc)).exclude(
- status__in=['complete', 'drafting', 'paused']).order_by('start_time', 'league__level',
- 'league__sleeper_name')[:10])
-
- upset_and_value_picks = player_stats.filter(pick_count__gte=drafts_done * 0.8).annotate(
- upset_value=ExpressionWrapper(F('adp') - F('highest_pick'), output_field=IntegerField()),
- steal_value=ExpressionWrapper(F('lowest_pick') - F('adp'), output_field=IntegerField()))
+ drafts.exclude(start_time=None)
+ .exclude(start_time__lte=datetime.utcnow().replace(tzinfo=pytz.utc))
+ .exclude(status__in=["complete", "drafting", "paused"])
+ .order_by("start_time", "league__level", "league__sleeper_name")[:10]
+ )
+
+ upset_and_value_picks = player_stats.filter(
+ pick_count__gte=drafts_done * 0.8
+ ).annotate(
+ upset_value=ExpressionWrapper(
+ F("adp") - F("highest_pick"), output_field=IntegerField()
+ ),
+ steal_value=ExpressionWrapper(
+ F("lowest_pick") - F("adp"), output_field=IntegerField()
+ ),
+ )
upset_picks = []
- for upset_pick in upset_and_value_picks.order_by('-upset_value'):
- pick = picks.filter(player__sleeper_id=upset_pick.player_id, pick_no=upset_pick.highest_pick).annotate(
- adp=ExpressionWrapper(Value(float(upset_pick.adp)), output_field=FloatField())).first()
+ for upset_pick in upset_and_value_picks.order_by("-upset_value"):
+ pick = (
+ picks.filter(
+ player__sleeper_id=upset_pick.player_id, pick_no=upset_pick.highest_pick
+ )
+ .annotate(
+ adp=ExpressionWrapper(
+ Value(float(upset_pick.adp)), output_field=FloatField()
+ )
+ )
+ .first()
+ )
upset_picks.append(pick)
if len(upset_picks) >= 5:
break
steal_picks = []
- for steal_pick in upset_and_value_picks.order_by('-steal_value'):
- pick = picks.filter(player__sleeper_id=steal_pick.player_id, pick_no=steal_pick.lowest_pick).annotate(
- adp=ExpressionWrapper(Value(float(steal_pick.adp)), output_field=FloatField())).first()
+ for steal_pick in upset_and_value_picks.order_by("-steal_value"):
+ pick = (
+ picks.filter(
+ player__sleeper_id=steal_pick.player_id, pick_no=steal_pick.lowest_pick
+ )
+ .annotate(
+ adp=ExpressionWrapper(
+ Value(float(steal_pick.adp)), output_field=FloatField()
+ )
+ )
+ .first()
+ )
steal_picks.append(pick)
if len(steal_picks) >= 5:
@@ -159,21 +237,25 @@ def draft_stats(request, position=None):
{"title": "WR", "position": "WR"},
{"title": "TE", "position": "TE"},
{"title": "K", "position": "K"},
- {"title": "DEF", "position": "DEF"}
+ {"title": "DEF", "position": "DEF"},
]
- return render(request, "stats/draft.html", {
- "drafts_done": drafts_done,
- "drafts_running": drafts_running,
- "drafts_overall": drafts_overall,
- "drafts_done_percent": drafts_done_percent,
- "adp_table": adp_table,
- "positions": positions,
- "selected_position": position or "",
- "upset_table": upset_table,
- "steal_table": steal_table,
- "next_drafts_table": next_drafts_table
- })
+ return render(
+ request,
+ "stats/draft.html",
+ {
+ "drafts_done": drafts_done,
+ "drafts_running": drafts_running,
+ "drafts_overall": drafts_overall,
+ "drafts_done_percent": drafts_done_percent,
+ "adp_table": adp_table,
+ "positions": positions,
+ "selected_position": position or "",
+ "upset_table": upset_table,
+ "steal_table": steal_table,
+ "next_drafts_table": next_drafts_table,
+ },
+ )
def player_stats(request, position=None):
@@ -183,7 +265,10 @@ def player_stats(request, position=None):
pos_filter = "where position = '{position}'".format(position=position)
players = players.raw(
- "select * from (select id, first_name, last_name, position, points, games_played, points/games_played as avg_points from leagues_player as whatever left join (select player_id, sum(points) as points, Sum(Case when stats = '""' then 0 when stats='{}' then 0 else 1 end) as games_played from leagues_statsweek group by player_id) as asdf on id=player_id %s) as player_data left join (select player_id, AVG(pick_no) as adp from leagues_pick group by player_id) as adp_picks on id=player_id order by points desc, adp asc;" % pos_filter)
+ "select * from (select id, first_name, last_name, position, points, games_played, points/games_played as avg_points from leagues_player as whatever left join (select player_id, sum(points) as points, Sum(Case when stats = '"
+ "' then 0 when stats='{}' then 0 else 1 end) as games_played from leagues_statsweek group by player_id) as asdf on id=player_id %s) as player_data left join (select player_id, AVG(pick_no) as adp from leagues_pick group by player_id) as adp_picks on id=player_id order by points desc, adp asc;"
+ % pos_filter
+ )
player_stats = players[:200]
@@ -196,20 +281,24 @@ def player_stats(request, position=None):
{"title": "WR", "position": "WR"},
{"title": "TE", "position": "TE"},
{"title": "K", "position": "K"},
- {"title": "DEF", "position": "DEF"}
+ {"title": "DEF", "position": "DEF"},
]
- return render(request, "stats/player_stats.html", {
- "player_stats_table": player_stats_table,
- "positions": positions,
- "selected_position": position or ""
- })
+ return render(
+ request,
+ "stats/player_stats.html",
+ {
+ "player_stats_table": player_stats_table,
+ "positions": positions,
+ "selected_position": position or "",
+ },
+ )
def draftboard(request, league_id):
draft = Draft.objects.get(league__sleeper_id=league_id)
rosters = draft.league.total_rosters
- picks = draft.picks.order_by('round', 'draft_slot')
+ picks = draft.picks.order_by("round", "draft_slot")
picks_count = picks.count()
fill_picks = []
fill_pick_round = 16
@@ -226,17 +315,24 @@ def draftboard(request, league_id):
owners = DSTPlayer.objects.filter(sleeper_id__in=draft.draft_order.keys())
- draft_order = sorted([(draft.draft_order.get(owner.sleeper_id), owner) for owner in owners], key=lambda do: do[0])
-
- return render(request, "stats/draftboard.html", {
- "pick_width": "{:.2f}% !important".format(100 / rosters),
- "draft": draft,
- "draft_order": draft_order,
- "picks": picks,
- "fill_picks": fill_picks,
- "fill_pick_pos": fill_pick_pos,
- "fill_picks_at_front": fill_picks_at_front
- })
+ draft_order = sorted(
+ [(draft.draft_order.get(owner.sleeper_id), owner) for owner in owners],
+ key=lambda do: do[0],
+ )
+
+ return render(
+ request,
+ "stats/draftboard.html",
+ {
+ "pick_width": "{:.2f}% !important".format(100 / rosters),
+ "draft": draft,
+ "draft_order": draft_order,
+ "picks": picks,
+ "fill_picks": fill_picks,
+ "fill_pick_pos": fill_pick_pos,
+ "fill_picks_at_front": fill_picks_at_front,
+ },
+ )
def playoffs(request, league_id):
@@ -244,26 +340,41 @@ def playoffs(request, league_id):
playoff_matchups = PlayoffMatchup.objects.filter(league_id=league_id)
bracket_names = ["Playoffs", "Toilet Bowl"]
- brackets = [{
- "bracket": bracket,
- "rounds": [
- {
- "round": round,
- "matchups": [
- {
- "roster_one": league.rosters.get(
- roster_id=matchup.roster_id_one) if matchup.roster_id_one else None,
- "roster_two": league.rosters.get(
- roster_id=matchup.roster_id_two) if matchup.roster_id_two else None
- } for matchup in playoff_matchups.filter(round=round, bracket=bracket)]
- } for round in sorted(playoff_matchups.filter(bracket=bracket).values_list('round', flat=True).distinct())
- ]
- } for bracket in bracket_names]
+ brackets = [
+ {
+ "bracket": bracket,
+ "rounds": [
+ {
+ "round": round,
+ "matchups": [
+ {
+ "roster_one": league.rosters.get(
+ roster_id=matchup.roster_id_one
+ )
+ if matchup.roster_id_one
+ else None,
+ "roster_two": league.rosters.get(
+ roster_id=matchup.roster_id_two
+ )
+ if matchup.roster_id_two
+ else None,
+ }
+ for matchup in playoff_matchups.filter(
+ round=round, bracket=bracket
+ )
+ ],
+ }
+ for round in sorted(
+ playoff_matchups.filter(bracket=bracket)
+ .values_list("round", flat=True)
+ .distinct()
+ )
+ ],
+ }
+ for bracket in bracket_names
+ ]
- context = {
- "league": league,
- "brackets": brackets
- }
+ context = {"league": league, "brackets": brackets}
return render(request, "leagues/playoffs.html", context)
@@ -277,8 +388,11 @@ def listener_league(request):
try:
league = League.objects.get(type=League.LISTENER, season=Season.get_active())
- context["draft_link"] = reverse('draft-board', kwargs={
- 'league_id': league.sleeper_id}) if league.draft.status != 'pre_draft' else None
+ context["draft_link"] = (
+ reverse("draft-board", kwargs={"league_id": league.sleeper_id})
+ if league.draft.status != "pre_draft"
+ else None
+ )
except ObjectDoesNotExist:
pass
@@ -297,8 +411,11 @@ def champions_league(request):
try:
league = League.objects.get(type=League.CL, season=Season.get_active())
- context["draft_link"] = reverse('draft-board', kwargs={
- 'league_id': league.sleeper_id}) if league.draft.status != 'pre_draft' else None
+ context["draft_link"] = (
+ reverse("draft-board", kwargs={"league_id": league.sleeper_id})
+ if league.draft.status != "pre_draft"
+ else None
+ )
except ObjectDoesNotExist:
pass
@@ -310,8 +427,9 @@ def champions_league(request):
def cl_quali(request):
context = {}
- cl_quali_rosters = Roster.objects.filter(league__season=Season.get_active(),
- league__type=League.BUNDESLIGA).order_by("-fpts", "-fpts_decimal")
+ cl_quali_rosters = Roster.objects.filter(
+ league__season=Season.get_active(), league__type=League.BUNDESLIGA
+ ).order_by("-fpts", "-fpts_decimal")
top12_rosters = cl_quali_rosters[:12]
in_the_hunt_rosters = cl_quali_rosters[12:100]
@@ -323,22 +441,53 @@ def cl_quali(request):
def some_quali(request):
- ranked_rosters_qs = Roster.objects.annotate(rank=Window(expression=RowNumber(), partition_by=[F('league_id')],
- order_by=[F('wins').desc(), F('ties').desc(),
- F('fpts').desc(), F('fpts_decimal').desc()]))
+ ranked_rosters_qs = Roster.objects.annotate(
+ rank=Window(
+ expression=RowNumber(),
+ partition_by=[F("league_id")],
+ order_by=[
+ F("wins").desc(),
+ F("ties").desc(),
+ F("fpts").desc(),
+ F("fpts_decimal").desc(),
+ ],
+ )
+ )
rank_two_rosters = [roster for roster in ranked_rosters_qs if roster.rank == 2]
rank_three_rosters = [roster for roster in ranked_rosters_qs if roster.rank == 3]
- rank_two_rosters = Roster.objects.annotate(rank=Window(expression=RowNumber(), partition_by=[F('league_id')],
- order_by=[F('wins').desc(), F('ties').desc(),
- F('fpts').desc(),
- F('fpts_decimal').desc()])).filter(
- rank=2).order_by('-fpts', '-fpts_decimal')
- rank_three_rosters = Roster.objects.annotate(rank=Window(expression=RowNumber(), partition_by=[F('league_id')],
- order_by=[F('wins').desc(), F('ties').desc(),
- F('fpts').desc(),
- F('fpts_decimal').desc()])).filter(
- rank=3).order_by('-fpts', '-fpts_decimal')
+ rank_two_rosters = (
+ Roster.objects.annotate(
+ rank=Window(
+ expression=RowNumber(),
+ partition_by=[F("league_id")],
+ order_by=[
+ F("wins").desc(),
+ F("ties").desc(),
+ F("fpts").desc(),
+ F("fpts_decimal").desc(),
+ ],
+ )
+ )
+ .filter(rank=2)
+ .order_by("-fpts", "-fpts_decimal")
+ )
+ rank_three_rosters = (
+ Roster.objects.annotate(
+ rank=Window(
+ expression=RowNumber(),
+ partition_by=[F("league_id")],
+ order_by=[
+ F("wins").desc(),
+ F("ties").desc(),
+ F("fpts").desc(),
+ F("fpts_decimal").desc(),
+ ],
+ )
+ )
+ .filter(rank=3)
+ .order_by("-fpts", "-fpts_decimal")
+ )
# rank_two_rosters = Roster.objects.raw("select * from (select *, row_number() over (partition by league_id order by wins desc, ties asc, fpts desc, fpts_decimal desc) as rank from leagues_roster) where rank=2 order by fpts desc, fpts_decimal desc;")
# rank_three_rosters = Roster.objects.raw("select * from (select *, row_number() over (partition by league_id order by wins desc, ties asc, fpts desc, fpts_decimal desc) as rank from leagues_roster) where rank=3 order by fpts desc, ftps_decimal desc;")
@@ -347,77 +496,107 @@ def some_quali(request):
context = {
"top8_rank_two_roster_table": top8_rank_two_roster_table,
- "top8_rank_three_roster_table": top8_rank_three_roster_table
+ "top8_rank_three_roster_table": top8_rank_three_roster_table,
}
return render(request, "leagues/some_quali.html", context)
def facts_and_figures(request):
- week = Matchup.objects.filter(season=Season.get_active(),
- league_id__in=League.objects.filter(type=League.BUNDESLIGA).values_list(
- 'sleeper_id')).aggregate(Max('week')).get('week__max')
+ week = (
+ Matchup.objects.filter(
+ season=Season.get_active(),
+ league_id__in=League.objects.filter(type=League.BUNDESLIGA).values_list(
+ "sleeper_id"
+ ),
+ )
+ .aggregate(Max("week"))
+ .get("week__max")
+ )
awards_service = AwardService(request, week)
stat_service = StatService(week)
stats = stat_service.get_all()
awards = awards_service.get_all()
- return render(request, "stats/facts_and_figures.html", {
- "current_week": week,
- "stats": stats,
- "awards": awards
- })
+ return render(
+ request,
+ "stats/facts_and_figures.html",
+ {"current_week": week, "stats": stats, "awards": awards},
+ )
def facts_and_figures_for_league(request, league_id, week=None):
if not week:
- week = Matchup.objects.filter(season=Season.get_active(),
- league_id__in=League.objects.filter(type=League.BUNDESLIGA).values_list(
- 'sleeper_id')).aggregate(Max('week')).get('week__max')
+ week = (
+ Matchup.objects.filter(
+ season=Season.get_active(),
+ league_id__in=League.objects.filter(type=League.BUNDESLIGA).values_list(
+ "sleeper_id"
+ ),
+ )
+ .aggregate(Max("week"))
+ .get("week__max")
+ )
awards_service = AwardService(request, week, league_id)
stat_service = StatService(week, league_id)
stats = stat_service.get_all_for_league()
awards = [award for award in awards_service.get_all_for_league() if award]
league = League.objects.get(sleeper_id=league_id)
- return render(request, "stats/facts_and_figures.html", {
- "current_week": week,
- "stats": stats,
- "awards": awards,
- "league_name": league.sleeper_name
- })
+ return render(
+ request,
+ "stats/facts_and_figures.html",
+ {
+ "current_week": week,
+ "stats": stats,
+ "awards": awards,
+ "league_name": league.sleeper_name,
+ },
+ )
def waiver_stats(request):
- waivers = WaiverPickup.objects.filter(season=Season.get_active(),
- changed_ts__gte=datetime.now() - timedelta(days=7))
-
- waivers_for_sum = waivers.values('player').annotate(sum=Sum('bid'), count=Count('player'), avg=Avg('bid'),
- leagues=Count('roster__league', distinct=True)).order_by(
- '-sum')[:20]
- players = Player.objects.filter(id__in=[w.get('player') for w in waivers_for_sum])
-
- waivers = waivers.filter(status='complete').order_by('-bid')
- waivers_for_sum_success = waivers.values('player').annotate(sum=Sum('bid'), count=Count('player'), avg=Avg('bid'))
+ waivers = WaiverPickup.objects.filter(
+ season=Season.get_active(), changed_ts__gte=datetime.now() - timedelta(days=7)
+ )
+
+ waivers_for_sum = (
+ waivers.values("player")
+ .annotate(
+ sum=Sum("bid"),
+ count=Count("player"),
+ avg=Avg("bid"),
+ leagues=Count("roster__league", distinct=True),
+ )
+ .order_by("-sum")[:20]
+ )
+ players = Player.objects.filter(id__in=[w.get("player") for w in waivers_for_sum])
+
+ waivers = waivers.filter(status="complete").order_by("-bid")
+ waivers_for_sum_success = waivers.values("player").annotate(
+ sum=Sum("bid"), count=Count("player"), avg=Avg("bid")
+ )
waiver_sums = []
for w in waivers_for_sum:
- player = players.get(id=w.get('player'))
+ player = players.get(id=w.get("player"))
try:
pickup = waivers_for_sum_success.get(player=player.id)
except WaiverPickup.DoesNotExist:
pickup = {}
- waiver_sums.append({
- 'player': player,
- 'bid_sum': w.get('sum'),
- 'bid_count': w.get('count'),
- 'bid_avg': w.get('avg'),
- 'bid_sum_success': pickup.get('sum', 0),
- 'leagues': w.get('leagues'),
- 'bid_count_success': pickup.get('count', 0),
- 'bid_avg_success': pickup.get('avg', 0)
- })
+ waiver_sums.append(
+ {
+ "player": player,
+ "bid_sum": w.get("sum"),
+ "bid_count": w.get("count"),
+ "bid_avg": w.get("avg"),
+ "bid_sum_success": pickup.get("sum", 0),
+ "leagues": w.get("leagues"),
+ "bid_count_success": pickup.get("count", 0),
+ "bid_avg_success": pickup.get("avg", 0),
+ }
+ )
top20_players_table = WaiverTopPlayers(waiver_sums)
top20_bids_table = WaiverTopBids(waivers[:20])
@@ -429,33 +608,38 @@ def waiver_stats(request):
return render(request, "stats/waiver.html", context)
-class StatService():
+class StatService:
def __init__(self, week=None, league_id=None):
- matchups = Matchup.objects.filter(season=Season.get_active(),
- league_id__in=League.objects.filter(type=League.BUNDESLIGA).values_list(
- 'sleeper_id'))
+ matchups = Matchup.objects.filter(
+ season=Season.get_active(),
+ league_id__in=League.objects.filter(type=League.BUNDESLIGA).values_list(
+ "sleeper_id"
+ ),
+ )
if week:
matchups = matchups.filter(week=week)
self.matchups = matchups
self.league_id = league_id
- self.rosters = Roster.objects.filter(league__season=Season.get_active(), league__type=League.BUNDESLIGA)
+ self.rosters = Roster.objects.filter(
+ league__season=Season.get_active(), league__type=League.BUNDESLIGA
+ )
def get_all_for_league(self):
return [
- {'title': 'Liga Rang', 'value': self.league_ranking()},
- {'title': 'Ø-Punkte/Matchup (Liga)', 'value': self.avg_points_league()},
- {'title': 'Ø-Punkte/Matchup (DST)', 'value': self.avg_points()},
- {'title': 'Ø-FAAB/Spieler', 'value': self.avg_faab()},
- {'title': 'Median', 'value': self.median_points()},
+ {"title": "Liga Rang", "value": self.league_ranking()},
+ {"title": "Ø-Punkte/Matchup (Liga)", "value": self.avg_points_league()},
+ {"title": "Ø-Punkte/Matchup (DST)", "value": self.avg_points()},
+ {"title": "Ø-FAAB/Spieler", "value": self.avg_faab()},
+ {"title": "Median", "value": self.median_points()},
]
def get_all(self):
if len(self.matchups) > 0:
return [
- {'title': 'Ø-Punkte/Matchup', 'value': self.avg_points()},
- {'title': 'Ø-FAAB/Spieler', 'value': self.avg_faab()},
+ {"title": "Ø-Punkte/Matchup", "value": self.avg_points()},
+ {"title": "Ø-FAAB/Spieler", "value": self.avg_faab()},
]
else:
return []
@@ -464,24 +648,37 @@ def avg_faab(self):
rosters = self.rosters
if self.league_id:
rosters = rosters.filter(league__sleeper_id=self.league_id)
- avg_faab_used = rosters.aggregate(avg_faab_used=Avg('waiver_budget_used')).get('avg_faab_used') or 0
- return "{faab}$".format(faab=int(
- 100 - avg_faab_used))
+ avg_faab_used = (
+ rosters.aggregate(avg_faab_used=Avg("waiver_budget_used")).get(
+ "avg_faab_used"
+ )
+ or 0
+ )
+ return "{faab}$".format(faab=int(100 - avg_faab_used))
def avg_points_league(self):
matchups = self.matchups.filter(league_id=self.league_id)
rosters = self.rosters.filter(league__sleeper_id=self.league_id)
- sum_points = matchups.aggregate(sum_points=Sum('points_one') + Sum('points_two')).get('sum_points')
+ sum_points = matchups.aggregate(
+ sum_points=Sum("points_one") + Sum("points_two")
+ ).get("sum_points")
return "{:.2f}".format(sum_points / rosters.count())
def avg_points(self):
- sum_points = self.matchups.aggregate(sum_points=Sum('points_one') + Sum('points_two')).get('sum_points')
+ sum_points = self.matchups.aggregate(
+ sum_points=Sum("points_one") + Sum("points_two")
+ ).get("sum_points")
return "{:.2f}".format(sum_points / self.rosters.count())
def league_ranking(self):
- leagues = self.matchups.values('league_id').annotate(sum_points=Sum('points_one') + Sum('points_two')).order_by(
- '-sum_points')
- ranking = list(leagues.values_list('league_id', flat=True)).index(self.league_id) + 1
+ leagues = (
+ self.matchups.values("league_id")
+ .annotate(sum_points=Sum("points_one") + Sum("points_two"))
+ .order_by("-sum_points")
+ )
+ ranking = (
+ list(leagues.values_list("league_id", flat=True)).index(self.league_id) + 1
+ )
return "#{}".format(ranking)
@@ -489,7 +686,10 @@ def median_loosing_points(self):
matchups = self.matchups
if self.league_id:
matchups = matchups.filter(league_id=self.league_id)
- losing_values = [mu.points_one if mu.points_one < mu.points_two else mu.points_two for mu in matchups]
+ losing_values = [
+ mu.points_one if mu.points_one < mu.points_two else mu.points_two
+ for mu in matchups
+ ]
return "{:.2f}".format(self._median(losing_values))
@@ -508,4 +708,4 @@ def _median(self, data):
if count % 2 == 1:
return values[int(round(count / 2))]
else:
- return sum(values[int(count / 2 - 1):int(count / 2 + 1)]) / Decimal(2.0)
+ return sum(values[int(count / 2 - 1) : int(count / 2 + 1)]) / Decimal(2.0)
diff --git a/DSTBundesliga/apps/services/awards_service.py b/DSTBundesliga/apps/services/awards_service.py
index 421be75..b308e9f 100644
--- a/DSTBundesliga/apps/services/awards_service.py
+++ b/DSTBundesliga/apps/services/awards_service.py
@@ -5,13 +5,28 @@
from django.db.models.functions import Abs
from django.template.loader import render_to_string
-from DSTBundesliga.apps.leagues.models import Matchup, Roster, League, Season, WaiverPickup, Player
+from DSTBundesliga.apps.leagues.models import (
+ Matchup,
+ Roster,
+ League,
+ Season,
+ WaiverPickup,
+ Player,
+)
-class AwardService():
+class AwardService:
def __init__(self, request, week=None, league_id=None):
- matchups = Matchup.objects.filter(season=Season.get_active(), league_id__in=League.objects.filter(type=League.BUNDESLIGA).values_list('sleeper_id'))
- waivers = WaiverPickup.objects.filter(season=Season.get_active(), changed_ts__gte=datetime.now()-timedelta(days=7))
+ matchups = Matchup.objects.filter(
+ season=Season.get_active(),
+ league_id__in=League.objects.filter(type=League.BUNDESLIGA).values_list(
+ "sleeper_id"
+ ),
+ )
+ waivers = WaiverPickup.objects.filter(
+ season=Season.get_active(),
+ changed_ts__gte=datetime.now() - timedelta(days=7),
+ )
if week:
matchups = matchups.filter(week=week)
@@ -23,8 +38,12 @@ def __init__(self, request, week=None, league_id=None):
self.league_id = league_id
self.week = week
self.matchups = matchups
- self.narrow_matchups = matchups.annotate(point_difference=Abs(F('points_one') - F('points_two')))
- self.rosters = Roster.objects.filter(league__season=Season.get_active(), league__type=League.BUNDESLIGA)
+ self.narrow_matchups = matchups.annotate(
+ point_difference=Abs(F("points_one") - F("points_two"))
+ )
+ self.rosters = Roster.objects.filter(
+ league__season=Season.get_active(), league__type=League.BUNDESLIGA
+ )
self.waivers = waivers
self.request = request
@@ -33,225 +52,283 @@ def get_all(self):
awards = []
if self.matchups.count() > 0:
- awards.extend([
- self.get_highscorer(),
- self.get_lowscorer(),
- self.get_blowout_victory(),
- self.get_narrow_victory(),
- self.get_shootout(),
- self.get_buli_leader(),
- self.get_cffc_vs_affc(),
- self.get_cffc_leader(),
- self.get_affc_leader()
- ])
-
- if self.waivers.count() > 0:
awards.extend(
[
- self.get_most_wanted_waiver(),
- self.get_highest_bid_waiver()
+ self.get_highscorer(),
+ self.get_lowscorer(),
+ self.get_blowout_victory(),
+ self.get_narrow_victory(),
+ self.get_shootout(),
+ self.get_buli_leader(),
+ self.get_cffc_vs_affc(),
+ self.get_cffc_leader(),
+ self.get_affc_leader(),
]
)
+ if self.waivers.count() > 0:
+ awards.extend(
+ [self.get_most_wanted_waiver(), self.get_highest_bid_waiver()]
+ )
+
return awards
def get_all_for_league(self):
awards = []
if self.matchups.count() > 0:
- awards.extend([
- self.get_highscorer(),
- self.get_lowscorer(),
- self.get_blowout_victory(),
- self.get_narrow_victory(),
- self.get_shootout(),
- ])
-
- if self.waivers.count() > 0:
awards.extend(
[
- self.get_most_wanted_waiver(),
- self.get_highest_bid_waiver()
+ self.get_highscorer(),
+ self.get_lowscorer(),
+ self.get_blowout_victory(),
+ self.get_narrow_victory(),
+ self.get_shootout(),
]
)
+ if self.waivers.count() > 0:
+ awards.extend(
+ [self.get_most_wanted_waiver(), self.get_highest_bid_waiver()]
+ )
+
return awards
def get_random(self, count=99):
return random.sample(self.get_all(), count)
def get_highscorer(self):
- mpo = self.matchups.order_by('-points_one').first()
- mpt = self.matchups.order_by('-points_two').first()
+ mpo = self.matchups.order_by("-points_one").first()
+ mpt = self.matchups.order_by("-points_two").first()
if mpo.points_one >= mpt.points_two:
most_points_score = mpo.points_one
- most_points_roster = self.rosters.get(league__sleeper_id=mpo.league_id, roster_id=mpo.roster_id_one)
+ most_points_roster = self.rosters.get(
+ league__sleeper_id=mpo.league_id, roster_id=mpo.roster_id_one
+ )
else:
most_points_score = mpt.points_two
- most_points_roster = self.rosters.get(league__sleeper_id=mpt.league_id, roster_id=mpt.roster_id_two)
+ most_points_roster = self.rosters.get(
+ league__sleeper_id=mpt.league_id, roster_id=mpt.roster_id_two
+ )
context = {
- 'roster': most_points_roster,
- 'league': most_points_roster.league,
- 'score': most_points_score
+ "roster": most_points_roster,
+ "league": most_points_roster.league,
+ "score": most_points_score,
}
return HighscorerAward(self.request, context)
def get_lowscorer(self):
- mpo = self.matchups.order_by('points_one').first()
- mpt = self.matchups.order_by('points_two').first()
+ mpo = self.matchups.order_by("points_one").first()
+ mpt = self.matchups.order_by("points_two").first()
if mpo.points_one <= mpt.points_two:
least_points_score = mpo.points_one
- least_points_roster = self.rosters.get(league__sleeper_id=mpo.league_id, roster_id=mpo.roster_id_one)
+ least_points_roster = self.rosters.get(
+ league__sleeper_id=mpo.league_id, roster_id=mpo.roster_id_one
+ )
else:
least_points_score = mpt.points_two
- least_points_roster = self.rosters.get(league__sleeper_id=mpt.league_id, roster_id=mpt.roster_id_two)
+ least_points_roster = self.rosters.get(
+ league__sleeper_id=mpt.league_id, roster_id=mpt.roster_id_two
+ )
context = {
- 'roster': least_points_roster,
- 'league': least_points_roster.league,
- 'score': least_points_score
+ "roster": least_points_roster,
+ "league": least_points_roster.league,
+ "score": least_points_score,
}
return LowscorerAward(self.request, context)
def get_narrow_victory(self):
- head_to_head = self.narrow_matchups.order_by('point_difference').first()
- roster_one = self.rosters.get(league__sleeper_id=head_to_head.league_id, roster_id=head_to_head.roster_id_one)
- roster_two = self.rosters.get(league__sleeper_id=head_to_head.league_id, roster_id=head_to_head.roster_id_two)
+ head_to_head = self.narrow_matchups.order_by("point_difference").first()
+ roster_one = self.rosters.get(
+ league__sleeper_id=head_to_head.league_id,
+ roster_id=head_to_head.roster_id_one,
+ )
+ roster_two = self.rosters.get(
+ league__sleeper_id=head_to_head.league_id,
+ roster_id=head_to_head.roster_id_two,
+ )
context = {
- 'roster_one': roster_one,
- 'roster_two': roster_two,
- 'score_one': head_to_head.points_one,
- 'score_two': head_to_head.points_two,
- 'league': roster_one.league
+ "roster_one": roster_one,
+ "roster_two": roster_two,
+ "score_one": head_to_head.points_one,
+ "score_two": head_to_head.points_two,
+ "league": roster_one.league,
}
return RaceAward(self.request, context)
def get_blowout_victory(self):
- blowout = self.narrow_matchups.order_by('-point_difference').first()
- roster_one = self.rosters.get(league__sleeper_id=blowout.league_id, roster_id=blowout.roster_id_one)
- roster_two = self.rosters.get(league__sleeper_id=blowout.league_id, roster_id=blowout.roster_id_two)
+ blowout = self.narrow_matchups.order_by("-point_difference").first()
+ roster_one = self.rosters.get(
+ league__sleeper_id=blowout.league_id, roster_id=blowout.roster_id_one
+ )
+ roster_two = self.rosters.get(
+ league__sleeper_id=blowout.league_id, roster_id=blowout.roster_id_two
+ )
context = {
- 'roster_one': roster_one,
- 'roster_two': roster_two,
- 'score_one': blowout.points_one,
- 'score_two': blowout.points_two,
- 'league': roster_one.league
+ "roster_one": roster_one,
+ "roster_two": roster_two,
+ "score_one": blowout.points_one,
+ "score_two": blowout.points_two,
+ "league": roster_one.league,
}
return BlowoutAward(self.request, context)
def get_shootout(self):
- shootout = self.narrow_matchups.filter(point_difference__lte=10).annotate(
- points_sum=F('points_one') + F('points_two')).order_by('-points_sum').first()
+ shootout = (
+ self.narrow_matchups.filter(point_difference__lte=10)
+ .annotate(points_sum=F("points_one") + F("points_two"))
+ .order_by("-points_sum")
+ .first()
+ )
if not shootout:
- shootout = self.narrow_matchups.filter(point_difference__lte=20).annotate(
- points_sum=F('points_one') + F('points_two')).order_by('-points_sum').first()
+ shootout = (
+ self.narrow_matchups.filter(point_difference__lte=20)
+ .annotate(points_sum=F("points_one") + F("points_two"))
+ .order_by("-points_sum")
+ .first()
+ )
if not shootout:
- shootout = self.narrow_matchups.annotate(points_sum=F('points_one') + F('points_two')).order_by(
- '-points_sum').first()
+ shootout = (
+ self.narrow_matchups.annotate(
+ points_sum=F("points_one") + F("points_two")
+ )
+ .order_by("-points_sum")
+ .first()
+ )
- roster_one = self.rosters.get(league__sleeper_id=shootout.league_id, roster_id=shootout.roster_id_one)
- roster_two = self.rosters.get(league__sleeper_id=shootout.league_id, roster_id=shootout.roster_id_two)
+ roster_one = self.rosters.get(
+ league__sleeper_id=shootout.league_id, roster_id=shootout.roster_id_one
+ )
+ roster_two = self.rosters.get(
+ league__sleeper_id=shootout.league_id, roster_id=shootout.roster_id_two
+ )
context = {
- 'roster_one': roster_one,
- 'roster_two': roster_two,
- 'score_one': shootout.points_one,
- 'score_two': shootout.points_two,
- 'league': roster_one.league
+ "roster_one": roster_one,
+ "roster_two": roster_two,
+ "score_one": shootout.points_one,
+ "score_two": shootout.points_two,
+ "league": roster_one.league,
}
return ShootoutAward(self.request, context)
def get_cffc_vs_affc(self):
- cffc_league_ids = League.objects.get_active().filter(conference="CFFC").values_list('sleeper_id', flat=True)
- affc_league_ids = League.objects.get_active().filter(conference="AFFC").values_list('sleeper_id', flat=True)
-
- points_cffc = self.matchups.filter(league_id__in=cffc_league_ids).aggregate(
- point_sum=Sum('points_one') + Sum('points_two')).get("point_sum")
- points_affc = self.matchups.filter(league_id__in=affc_league_ids).aggregate(
- point_sum=Sum('points_one') + Sum('points_two')).get("point_sum")
+ cffc_league_ids = (
+ League.objects.get_active()
+ .filter(conference="CFFC")
+ .values_list("sleeper_id", flat=True)
+ )
+ affc_league_ids = (
+ League.objects.get_active()
+ .filter(conference="AFFC")
+ .values_list("sleeper_id", flat=True)
+ )
+
+ points_cffc = (
+ self.matchups.filter(league_id__in=cffc_league_ids)
+ .aggregate(point_sum=Sum("points_one") + Sum("points_two"))
+ .get("point_sum")
+ )
+ points_affc = (
+ self.matchups.filter(league_id__in=affc_league_ids)
+ .aggregate(point_sum=Sum("points_one") + Sum("points_two"))
+ .get("point_sum")
+ )
context = {
- 'name_one': 'AFFC',
- 'name_two': 'CFFC',
- 'score_one': points_affc,
- 'score_two': points_cffc
+ "name_one": "AFFC",
+ "name_two": "CFFC",
+ "score_one": points_affc,
+ "score_two": points_cffc,
}
return CFFCvsAFFCAward(self.request, context)
def get_buli_leader(self):
- leader = Roster.objects.filter(league__season=Season.get_active(), league__level=1).first()
+ leader = Roster.objects.filter(
+ league__season=Season.get_active(), league__level=1
+ ).first()
context = {
- 'roster': leader,
- 'league': leader.league,
- 'score': float(leader.points)
+ "roster": leader,
+ "league": leader.league,
+ "score": float(leader.points),
}
return BuliLeader(self.request, context)
def get_cffc_leader(self):
- leader = Roster.objects.filter(league__season=Season.get_active(), league__conference='CFFC').first()
+ leader = Roster.objects.filter(
+ league__season=Season.get_active(), league__conference="CFFC"
+ ).first()
if not leader:
return None
context = {
- 'roster': leader,
- 'league': leader.league,
- 'score': float(leader.points)
+ "roster": leader,
+ "league": leader.league,
+ "score": float(leader.points),
}
return CFFCLeader(self.request, context)
def get_affc_leader(self):
- leader = Roster.objects.filter(league__season=Season.get_active(), league__conference='AFFC').first()
+ leader = Roster.objects.filter(
+ league__season=Season.get_active(), league__conference="AFFC"
+ ).first()
if not leader:
return None
context = {
- 'roster': leader,
- 'league': leader.league,
- 'score': float(leader.points)
+ "roster": leader,
+ "league": leader.league,
+ "score": float(leader.points),
}
return AFFCLeader(self.request, context)
def get_most_wanted_waiver(self):
- waiver_pickup = self.waivers.values('player').annotate(target_count=Count('player')).order_by('-target_count').first()
+ waiver_pickup = (
+ self.waivers.values("player")
+ .annotate(target_count=Count("player"))
+ .order_by("-target_count")
+ .first()
+ )
player = Player.objects.get(id=waiver_pickup.get("player"))
context = {
- 'player': player,
- 'bid': "{bids} bids".format(bids=waiver_pickup.get("target_count"))
+ "player": player,
+ "bid": "{bids} bids".format(bids=waiver_pickup.get("target_count")),
}
return WaiverMostWanted(self.request, context)
def get_highest_bid_waiver(self):
- waiver_pickup = self.waivers.filter(status='complete').order_by('-bid').first()
+ waiver_pickup = self.waivers.filter(status="complete").order_by("-bid").first()
context = {
- 'player': waiver_pickup.player,
- 'bid': "{bid}$".format(bid=waiver_pickup.bid)
+ "player": waiver_pickup.player,
+ "bid": "{bid}$".format(bid=waiver_pickup.bid),
}
return WaiverMostSpent(self.request, context)
-class Award():
+class Award:
template_name = ""
must_be_first = False
@@ -260,10 +337,7 @@ def __init__(self, request, context, title=None, icon=None):
self.request = request
- context.update({
- "title": title,
- "icon": icon
- })
+ context.update({"title": title, "icon": icon})
self.context = context
@@ -271,7 +345,9 @@ def __str__(self):
return self.render(self.context)
def render(self, context):
- return render_to_string(self.template_name, context=context, request=self.request)
+ return render_to_string(
+ self.template_name, context=context, request=self.request
+ )
class HighscorerAward(Award):
diff --git a/DSTBundesliga/apps/services/data_services.py b/DSTBundesliga/apps/services/data_services.py
index 131f2cf..811a6ed 100644
--- a/DSTBundesliga/apps/services/data_services.py
+++ b/DSTBundesliga/apps/services/data_services.py
@@ -10,8 +10,21 @@
from sleeper_wrapper import BaseApi
from DSTBundesliga.apps.leagues.config import POSITIONS
-from DSTBundesliga.apps.leagues.models import League, DSTPlayer, Roster, Draft, Pick, Player, Team, Matchup, StatsWeek, \
- PlayoffMatchup, Season, PlayerDraftStats, WaiverPickup
+from DSTBundesliga.apps.leagues.models import (
+ League,
+ DSTPlayer,
+ Roster,
+ Draft,
+ Pick,
+ Player,
+ Team,
+ Matchup,
+ StatsWeek,
+ PlayoffMatchup,
+ Season,
+ PlayerDraftStats,
+ WaiverPickup,
+)
from DSTBundesliga.apps.services.state_service import StateService
@@ -31,23 +44,26 @@ def get_league_data(league_id):
def update_or_create_league(league_setting: LeagueSetting, league_data):
- league, _ = League.objects.update_or_create(sleeper_id=league_setting.id, defaults={
- "total_rosters": league_data.get("total_rosters"),
- "status": league_data.get("status"),
- "sport": league_data.get("sport"),
- "settings": league_data.get("settings"),
- "season_type": league_data.get("season_type"),
- "scoring_settings": league_data.get("scoring_settings"),
- "roster_positions": league_data.get("roster_positions"),
- "previous_league_id": league_data.get("previous_league_id"),
- "sleeper_name": league_data.get("name"),
- "draft_id": league_data.get("draft_id"),
- "avatar_id": league_data.get("avatar"),
- "type": league_setting.type or League.BUNDESLIGA,
- "level": league_setting.level,
- "conference": league_setting.conference,
- "region": league_setting.region
- })
+ league, _ = League.objects.update_or_create(
+ sleeper_id=league_setting.id,
+ defaults={
+ "total_rosters": league_data.get("total_rosters"),
+ "status": league_data.get("status"),
+ "sport": league_data.get("sport"),
+ "settings": league_data.get("settings"),
+ "season_type": league_data.get("season_type"),
+ "scoring_settings": league_data.get("scoring_settings"),
+ "roster_positions": league_data.get("roster_positions"),
+ "previous_league_id": league_data.get("previous_league_id"),
+ "sleeper_name": league_data.get("name"),
+ "draft_id": league_data.get("draft_id"),
+ "avatar_id": league_data.get("avatar"),
+ "type": league_setting.type or League.BUNDESLIGA,
+ "level": league_setting.level,
+ "conference": league_setting.conference,
+ "region": league_setting.region,
+ },
+ )
return league
@@ -70,7 +86,9 @@ def update_league(league: League, league_data):
def delete_old_leagues(league_settings: List[LeagueSetting], dry_run=True):
- leagues_to_delete = League.objects.exclude(sleeper_id__in=[l.id for l in league_settings])
+ leagues_to_delete = League.objects.exclude(
+ sleeper_id__in=[l.id for l in league_settings]
+ )
if dry_run:
print("DRY RUN - Would delete the following Leagues:")
for league in leagues_to_delete:
@@ -83,19 +101,24 @@ def delete_old_leagues(league_settings: List[LeagueSetting], dry_run=True):
def delete_old_drafts(league_id, draft_id):
if draft_id:
- drafts_to_delete = Draft.objects.filter(league__sleeper_id=league_id).exclude(draft_id=draft_id)
+ drafts_to_delete = Draft.objects.filter(league__sleeper_id=league_id).exclude(
+ draft_id=draft_id
+ )
if drafts_to_delete.count() > 0:
- print('Deleting old drafts for league %s' % league_id)
+ print("Deleting old drafts for league %s" % league_id)
for draft in drafts_to_delete:
print(draft.id, draft.start_time)
drafts_to_delete.delete()
def update_or_create_dst_player(league_id, player_data):
- player, _ = DSTPlayer.objects.update_or_create(sleeper_id=player_data.get("user_id"), defaults={
- "display_name": player_data.get("display_name"),
- "avatar_id": player_data.get("avatar")
- })
+ player, _ = DSTPlayer.objects.update_or_create(
+ sleeper_id=player_data.get("user_id"),
+ defaults={
+ "display_name": player_data.get("display_name"),
+ "avatar_id": player_data.get("avatar"),
+ },
+ )
league = League.objects.get(sleeper_id=league_id)
player.leagues.add(league)
@@ -121,28 +144,30 @@ def update_or_create_roster(league_id, roster_data, dst_player_data):
owner_id = roster_data.get("owner_id")
roster_settings = roster_data.get("settings", {})
- roster, _ = Roster.objects.update_or_create(roster_id=roster_data.get("roster_id"),
- league=League.objects.get(sleeper_id=league_id),
- defaults={
- "name": dst_player_data.get(owner_id, {}).get("metadata", {}).get(
- "team_name"),
- "starters": roster_data.get("starters"),
- "wins": roster_settings.get("wins", 0),
- "waiver_position": roster_settings.get("waiver_position", 1),
- "waiver_budget_used": roster_settings.get("waiver_budget_used", 0),
- "total_moves": roster_settings.get("total_moves", 0),
- "ties": roster_settings.get("ties", 0),
- "losses": roster_settings.get("losses", 0),
- "fpts_decimal": roster_settings.get("fpts_decimal", 0),
- "fpts_against_decimal": roster_settings.get("fpts_against_decimal",
- 0),
- "fpts_against": roster_settings.get("fpts_against", 0),
- "fpts": roster_settings.get("fpts", 0),
- "settings": roster_settings,
- "reserve": roster_data.get("reserve"),
- "players": roster_data.get("players"),
- "owner": DSTPlayer.objects.filter(sleeper_id=owner_id).first()
- })
+ roster, _ = Roster.objects.update_or_create(
+ roster_id=roster_data.get("roster_id"),
+ league=League.objects.get(sleeper_id=league_id),
+ defaults={
+ "name": dst_player_data.get(owner_id, {})
+ .get("metadata", {})
+ .get("team_name"),
+ "starters": roster_data.get("starters"),
+ "wins": roster_settings.get("wins", 0),
+ "waiver_position": roster_settings.get("waiver_position", 1),
+ "waiver_budget_used": roster_settings.get("waiver_budget_used", 0),
+ "total_moves": roster_settings.get("total_moves", 0),
+ "ties": roster_settings.get("ties", 0),
+ "losses": roster_settings.get("losses", 0),
+ "fpts_decimal": roster_settings.get("fpts_decimal", 0),
+ "fpts_against_decimal": roster_settings.get("fpts_against_decimal", 0),
+ "fpts_against": roster_settings.get("fpts_against", 0),
+ "fpts": roster_settings.get("fpts", 0),
+ "settings": roster_settings,
+ "reserve": roster_data.get("reserve"),
+ "players": roster_data.get("players"),
+ "owner": DSTPlayer.objects.filter(sleeper_id=owner_id).first(),
+ },
+ )
roster.save()
return roster
@@ -154,11 +179,11 @@ def get_roster_data(league_id):
def update_rosters_for_league(league_id, roster_data, dst_player_data):
rosters = []
- dst_player_data_by_id = {
- pd.get("user_id"): pd for pd in dst_player_data
- }
+ dst_player_data_by_id = {pd.get("user_id"): pd for pd in dst_player_data}
for roster in roster_data:
- rosters.append(update_or_create_roster(league_id, roster, dst_player_data_by_id))
+ rosters.append(
+ update_or_create_roster(league_id, roster, dst_player_data_by_id)
+ )
return rosters
@@ -196,39 +221,47 @@ def guess_level(name):
return 4
elif "RL" in name or "Regionalliga" in name:
return 5
+ elif "KL" in name or "Kreisliga" in name:
+ return 6
else:
return 6
def update_or_create_draft(league_id, draft_data):
- start_time = draft_data.get('start_time')
+ start_time = draft_data.get("start_time")
if start_time:
- start_time = datetime.fromtimestamp(start_time / 1000, tz=timezone('Europe/Berlin'))
+ start_time = datetime.fromtimestamp(
+ start_time / 1000, tz=timezone("Europe/Berlin")
+ )
- last_picked = draft_data.get('last_picked')
+ last_picked = draft_data.get("last_picked")
if last_picked:
- last_picked = datetime.fromtimestamp(last_picked / 1000, tz=timezone('Europe/Berlin'))
+ last_picked = datetime.fromtimestamp(
+ last_picked / 1000, tz=timezone("Europe/Berlin")
+ )
- last_message_time = draft_data.get('last_message_time')
+ last_message_time = draft_data.get("last_message_time")
if last_message_time:
- last_message_time = datetime.fromtimestamp(last_message_time / 1000, tz=timezone('Europe/Berlin'))
+ last_message_time = datetime.fromtimestamp(
+ last_message_time / 1000, tz=timezone("Europe/Berlin")
+ )
draft, _ = Draft.objects.update_or_create(
- draft_id=draft_data.get('draft_id'),
+ draft_id=draft_data.get("draft_id"),
league=League.objects.get(sleeper_id=league_id),
defaults={
- "draft_type": draft_data.get('draft_id', ''),
- "status": draft_data.get('status', ''),
+ "draft_type": draft_data.get("draft_id", ""),
+ "status": draft_data.get("status", ""),
"start_time": start_time,
- "settings": draft_data.get('settings', {}),
- "season_type": draft_data.get('season_type', ''),
- "season": draft_data.get('season', 0),
- "metadata": draft_data.get('metadata', {}),
+ "settings": draft_data.get("settings", {}),
+ "season_type": draft_data.get("season_type", ""),
+ "season": draft_data.get("season", 0),
+ "metadata": draft_data.get("metadata", {}),
"last_picked": last_picked,
"last_message_time": last_message_time,
- "last_message_id": draft_data.get('last_message_id'),
- "draft_order": draft_data.get('draft_order')
- }
+ "last_message_id": draft_data.get("last_message_id"),
+ "draft_order": draft_data.get("draft_order"),
+ },
)
draft.save()
@@ -245,11 +278,10 @@ def get_draft_data(league_id):
return response
-
def update_drafts_for_league(league_id):
drafts_data = get_draft_data(league_id)
- latest_draft_data = max(drafts_data, key=lambda d: d.get('start_time'))
+ latest_draft_data = max(drafts_data, key=lambda d: d.get("start_time"))
draft = update_or_create_draft(league_id, latest_draft_data)
delete_old_drafts(league_id, draft.draft_id)
@@ -261,26 +293,42 @@ def update_or_create_pick(draft_id, pick_data):
draft = Draft.objects.get(draft_id=draft_id)
pick, _ = Pick.objects.update_or_create(
draft=draft,
- pick_no=pick_data.get('pick_no'),
+ pick_no=pick_data.get("pick_no"),
defaults={
- "player": Player.objects.get(sleeper_id=pick_data.get('player_id')),
- "owner": DSTPlayer.objects.get(sleeper_id=pick_data.get('picked_by')),
- "roster": Roster.objects.get(roster_id=pick_data.get('roster_id'),
- owner__sleeper_id=pick_data.get('picked_by'),
- league=draft.league),
- "round": pick_data.get('round', 1),
- "draft_slot": pick_data.get('draft_slot', 1),
- "metadata": pick_data.get('metadata', {})
- }
+ "player": Player.objects.get(sleeper_id=pick_data.get("player_id")),
+ "owner": DSTPlayer.objects.get(sleeper_id=pick_data.get("picked_by")),
+ "roster": Roster.objects.get(
+ roster_id=pick_data.get("roster_id"),
+ owner__sleeper_id=pick_data.get("picked_by"),
+ league=draft.league,
+ ),
+ "round": pick_data.get("round", 1),
+ "draft_slot": pick_data.get("draft_slot", 1),
+ "metadata": pick_data.get("metadata", {}),
+ },
)
pick.save()
return pick
except Roster.DoesNotExist as e:
- print("Draft: ", draft_id, "Roster: ", pick_data.get('roster_id'), "Picked by: ", pick_data.get('picked_by'))
+ print(
+ "Draft: ",
+ draft_id,
+ "Roster: ",
+ pick_data.get("roster_id"),
+ "Picked by: ",
+ pick_data.get("picked_by"),
+ )
except DSTPlayer.DoesNotExist as e:
- print("Draft: ", draft_id, "Roster: ", pick_data.get('roster_id'), "Picked by: ", pick_data.get('picked_by'))
+ print(
+ "Draft: ",
+ draft_id,
+ "Roster: ",
+ pick_data.get("roster_id"),
+ "Picked by: ",
+ pick_data.get("picked_by"),
+ )
def get_pick_data(draft_id):
@@ -301,10 +349,15 @@ def update_picks_for_draft(draft_id, picks_data):
def update_draft_stats():
# Alle Picks mit mindestens 5 Picks je Spieler, sortiert nach Differenz zwischen adp und pick_no
# Relevante Spieler:
- relevant_players = Pick.objects.all().values('player__id').annotate(pick_count=Count('player__id')).filter(
- pick_count__gte=5).values_list('player_id', flat=True)
+ relevant_players = (
+ Pick.objects.all()
+ .values("player__id")
+ .annotate(pick_count=Count("player__id"))
+ .filter(pick_count__gte=5)
+ .values_list("player_id", flat=True)
+ )
relevant_picks = Pick.objects.filter(player__id__in=relevant_players)
- for pick in relevant_picks.annotate(adp=Avg('pick_no')):
+ for pick in relevant_picks.annotate(adp=Avg("pick_no")):
pass
@@ -350,22 +403,25 @@ def update_or_create_player(player_id, player_data):
except ValueError:
type = Player.TEAM
- player, _ = Player.objects.update_or_create(sleeper_id=player_id, defaults={
- "type": type,
- "hashtag": player_data.get("hashtag", ''),
- "depth_chart_position": player_data.get("depth_chart_position"),
- "status": player_data.get("status", ''),
- "fantasy_positions": ','.join(fantasy_positions),
- "number": number,
- "last_name": player_data.get("last_name", ''),
- "first_name": player_data.get("first_name", ''),
- "weight": int(weight),
- "position": player_data.get("position"),
- "height": player_data.get("height"),
- "age": age,
- "espn_id": player_data.get("espn_id"),
- "yahoo_id": player_data.get("yahoo_id"),
- })
+ player, _ = Player.objects.update_or_create(
+ sleeper_id=player_id,
+ defaults={
+ "type": type,
+ "hashtag": player_data.get("hashtag", ""),
+ "depth_chart_position": player_data.get("depth_chart_position"),
+ "status": player_data.get("status", ""),
+ "fantasy_positions": ",".join(fantasy_positions),
+ "number": number,
+ "last_name": player_data.get("last_name", ""),
+ "first_name": player_data.get("first_name", ""),
+ "weight": int(weight),
+ "position": player_data.get("position"),
+ "height": player_data.get("height"),
+ "age": age,
+ "espn_id": player_data.get("espn_id"),
+ "yahoo_id": player_data.get("yahoo_id"),
+ },
+ )
team_abbr = player_data.get("team")
if team_abbr:
@@ -389,14 +445,18 @@ def update_players():
def update_listener_league():
- listener_league_id = League.objects.get_active().get(type=League.LISTENER).sleeper_id
+ listener_league_id = (
+ League.objects.get_active().get(type=League.LISTENER).sleeper_id
+ )
league_data = get_league_data(listener_league_id)
try:
- ls = LeagueSetting(id=listener_league_id,
- name="DST Hörerliga",
- level=99,
- conference=None,
- region=None)
+ ls = LeagueSetting(
+ id=listener_league_id,
+ name="DST Hörerliga",
+ level=99,
+ conference=None,
+ region=None,
+ )
update_or_create_league(ls, league_data)
dst_player_data = get_dst_player_data(listener_league_id)
update_dst_players_for_league(listener_league_id, dst_player_data)
@@ -411,7 +471,9 @@ def update_listener_league():
def update_listener_draft():
- listener_league_id = League.objects.get_active().get(type=League.LISTENER).sleeper_id
+ listener_league_id = (
+ League.objects.get_active().get(type=League.LISTENER).sleeper_id
+ )
draft = update_drafts_for_league(listener_league_id)
picks_data = get_pick_data(draft.draft_id)
@@ -434,13 +496,9 @@ def update_matchup_for_league(league_id, week):
matchup_id = matchup_data.get("matchup_id")
matchup = matchups.get(matchup_id)
if not matchup:
- matchups[matchup_id] = {
- 'one': matchup_data
- }
+ matchups[matchup_id] = {"one": matchup_data}
else:
- matchups[matchup_id].update({
- 'two': matchup_data
- })
+ matchups[matchup_id].update({"two": matchup_data})
for id, data in matchups.items():
Matchup.objects.update_or_create(
league_id=league_id,
@@ -454,8 +512,9 @@ def update_matchup_for_league(league_id, week):
"roster_id_two": data.get("two").get("roster_id"),
"starters_two": ",".join(data.get("two").get("starters") or []),
"players_two": ",".join(data.get("two").get("players") or []),
- "points_two": data.get("two").get("points") or 0
- })
+ "points_two": data.get("two").get("points") or 0,
+ },
+ )
def update_playoffs():
@@ -488,8 +547,8 @@ def create_playoff_matchup(league_id, matchup, bracket):
"roster_id_two": matchup.get("t2"),
"winner": matchup.get("w"),
"loser": matchup.get("l"),
- "rank": matchup.get("p")
- }
+ "rank": matchup.get("p"),
+ },
)
@@ -498,7 +557,11 @@ def get_current_week():
def update_stats_for_position(position, week):
- print("Updating Stats for Position {position} in week {week}".format(position=position, week=week))
+ print(
+ "Updating Stats for Position {position} in week {week}".format(
+ position=position, week=week
+ )
+ )
season_type = "regular"
season = StateService().get_season()
@@ -517,10 +580,7 @@ def update_stats_for_position(position, week):
season_type=season_type,
season=season_object,
player=player,
- defaults={
- "points": points,
- "stats": player_stats
- }
+ defaults={"points": points, "stats": player_stats},
)
if not created:
stats.points = points
@@ -528,18 +588,28 @@ def update_stats_for_position(position, week):
stats.save()
except Player.DoesNotExist:
- print("Could not update Stats for unknown Player {player_id}".format(player_id=player_id))
+ print(
+ "Could not update Stats for unknown Player {player_id}".format(
+ player_id=player_id
+ )
+ )
print("All done!")
def update_projections_for_position(position, week):
- print("Updating Projections for Position {position} in week {week}".format(position=position, week=week))
+ print(
+ "Updating Projections for Position {position} in week {week}".format(
+ position=position, week=week
+ )
+ )
season_type = "regular"
season = StateService().get_season()
stats_service = StatsService()
- position_stats = stats_service.get_week_projections(season_type, season, position, week)
+ position_stats = stats_service.get_week_projections(
+ season_type, season, position, week
+ )
for stats in position_stats:
player_id = stats.get("player_id")
@@ -555,8 +625,8 @@ def update_projections_for_position(position, week):
player=player,
defaults={
"projected_points": projected_points,
- "projected_stats": player_projected_stats
- }
+ "projected_stats": player_projected_stats,
+ },
)
if not created:
stats.projected_points = projected_points
@@ -564,7 +634,11 @@ def update_projections_for_position(position, week):
stats.save()
except Player.DoesNotExist:
- print("Could not update Projections for unknown Player {player_id}".format(player_id=player_id))
+ print(
+ "Could not update Projections for unknown Player {player_id}".format(
+ player_id=player_id
+ )
+ )
print("All done!")
@@ -589,22 +663,29 @@ def update_player_draft_stats_from_picks(season: Season):
player_map = {}
for pick in Pick.objects.filter(roster__league__season=season):
player_stats = player_map.get(pick.player.sleeper_id, {})
- player_stats['name'] = f"{pick.player.first_name} {pick.player.last_name}"
- player_stats['team'] = pick.player.team.abbr if pick.player.team else '-'
- player_stats['position'] = pick.player.position
- player_stats['picked_positions'] = player_stats.get('picked_positions', []) + [pick.pick_no]
+ player_stats["name"] = f"{pick.player.first_name} {pick.player.last_name}"
+ player_stats["team"] = pick.player.team.abbr if pick.player.team else "-"
+ player_stats["position"] = pick.player.position
+ player_stats["picked_positions"] = player_stats.get("picked_positions", []) + [
+ pick.pick_no
+ ]
player_map[pick.player.sleeper_id] = player_stats
for player_id, player_stats in player_map.items():
- PlayerDraftStats.objects.update_or_create(season=season, player_id=player_id, defaults={
- 'player_name': player_stats['name'],
- 'player_team': player_stats['team'],
- 'player_position': player_stats['position'],
- 'pick_count': len(player_stats['picked_positions']),
- 'adp': sum(player_stats['picked_positions']) / len(player_stats['picked_positions']),
- 'highest_pick': min(player_stats['picked_positions']),
- 'lowest_pick': max(player_stats['picked_positions'])
- })
+ PlayerDraftStats.objects.update_or_create(
+ season=season,
+ player_id=player_id,
+ defaults={
+ "player_name": player_stats["name"],
+ "player_team": player_stats["team"],
+ "player_position": player_stats["position"],
+ "pick_count": len(player_stats["picked_positions"]),
+ "adp": sum(player_stats["picked_positions"])
+ / len(player_stats["picked_positions"]),
+ "highest_pick": min(player_stats["picked_positions"]),
+ "lowest_pick": max(player_stats["picked_positions"]),
+ },
+ )
def update_trades(week=None):
@@ -620,43 +701,70 @@ def update_trades_for_league(league_id, week=None):
league_service = sleeper_wrapper.League(league_id)
trades = league_service.get_transactions(week)
for trade in trades:
- if trade.get('type') == 'waiver':
- roster = Roster.objects.get(league__sleeper_id=league_id, roster_id=trade.get('roster_ids')[0])
- status = trade.get('status')
- bid = trade.get('settings', {}).get('waiver_bid', 0)
- player = Player.objects.get(sleeper_id=next(iter(trade.get('adds'))))
- changed_ts = datetime.fromtimestamp(trade.get('status_updated') / 1000, tz=timezone('Europe/Berlin'))
- WaiverPickup.objects.update_or_create(season=Season.get_active(), week=week, roster=roster, player=player, defaults={
- 'status': status,
- 'bid': bid,
- 'changed_ts': changed_ts
- })
+ if trade.get("type") == "waiver":
+ roster = Roster.objects.get(
+ league__sleeper_id=league_id, roster_id=trade.get("roster_ids")[0]
+ )
+ status = trade.get("status")
+ bid = trade.get("settings", {}).get("waiver_bid", 0)
+ player = Player.objects.get(sleeper_id=next(iter(trade.get("adds"))))
+ changed_ts = datetime.fromtimestamp(
+ trade.get("status_updated") / 1000, tz=timezone("Europe/Berlin")
+ )
+ WaiverPickup.objects.update_or_create(
+ season=Season.get_active(),
+ week=week,
+ roster=roster,
+ player=player,
+ defaults={"status": status, "bid": bid, "changed_ts": changed_ts},
+ )
class StatsService(BaseApi):
def __init__(self):
self._base_stats_url = "https://api.sleeper.app/stats/{}".format("nfl")
- self._base_projections_url = "https://api.sleeper.app/projections/{}".format("nfl")
+ self._base_projections_url = "https://api.sleeper.app/projections/{}".format(
+ "nfl"
+ )
def get_all_stats(self, season_type, season, position):
return self._call(
"{base_url}/{season}?season_type={season_type}&position[]={positionorder_by=pts_half_ppr".format(
- base_url=self._base_stats_url, season=season, season_type=season_type, position=position))
+ base_url=self._base_stats_url,
+ season=season,
+ season_type=season_type,
+ position=position,
+ )
+ )
def get_week_stats(self, season_type, season, position, week):
return self._call(
"{base_url}/{season}/{week}?season_type={season_type}&position[]={position}&order_by=pts_half_ppr".format(
- base_url=self._base_stats_url, season=season, season_type=season_type, position=position, week=week))
+ base_url=self._base_stats_url,
+ season=season,
+ season_type=season_type,
+ position=position,
+ week=week,
+ )
+ )
def get_all_projections(self, season_type, season, position):
return self._call(
"{base_url}/{season}?season_type={season_type}&position[]={positionorder_by=pts_half_ppr".format(
- base_url=self._base_projections_url, season=season, season_type=season_type, position=position))
+ base_url=self._base_projections_url,
+ season=season,
+ season_type=season_type,
+ position=position,
+ )
+ )
def get_week_projections(self, season_type, season, position, week):
return self._call(
"{base_url}/{season}/{week}?season_type={season_type}&position[]={position}&order_by=pts_half_ppr".format(
- base_url=self._base_projections_url, season=season, season_type=season_type, position=position,
- week=week))
-
-
+ base_url=self._base_projections_url,
+ season=season,
+ season_type=season_type,
+ position=position,
+ week=week,
+ )
+ )
diff --git a/DSTBundesliga/apps/services/patreon_service.py b/DSTBundesliga/apps/services/patreon_service.py
index 02a7578..b2c8dc1 100644
--- a/DSTBundesliga/apps/services/patreon_service.py
+++ b/DSTBundesliga/apps/services/patreon_service.py
@@ -6,7 +6,7 @@ def read_patreon_file(filepath=None):
with open(filepath) as csv_file:
dialect = csv.Sniffer().sniff(csv_file.readline())
csv_file.seek(0)
- patreon_reader = csv.DictReader(csv_file, dialect=dialect)
+ patreon_reader = csv.DictReader(csv_file, dialect=dialect)
return [row for row in patreon_reader]
@@ -28,7 +28,11 @@ def get_emails(patreon_data):
def get_discord(patreon_data):
- return [row.get("Discord").split("#")[0].strip().upper() for row in patreon_data if '#' in row.get("Discord")]
+ return [
+ row.get("Discord").split("#")[0].strip().upper()
+ for row in patreon_data
+ if "#" in row.get("Discord")
+ ]
def find_missing_users(patreon_filepath, ffbl_filepath):
@@ -53,10 +57,10 @@ def find_missing_users(patreon_filepath, ffbl_filepath):
no_second_run_hit = []
for name in no_direct_hit:
- stripped_name = re.sub(r'\([^)]*\)', '', name).replace(" ", "").strip()
+ stripped_name = re.sub(r"\([^)]*\)", "", name).replace(" ", "").strip()
stripped_email = stripped_name
if "(" in name and ")" in name:
- stripped_email = name[name.find("(")+1:name.find(")")]
+ stripped_email = name[name.find("(") + 1 : name.find(")")]
if stripped_name in second_run_names:
second_run_names.remove(stripped_name)
@@ -88,9 +92,9 @@ def find_missing_users(patreon_filepath, ffbl_filepath):
print("name:", name, "pat_mail:", patreon_email)
no_last_run_hit.remove(name)
- found = set(names_to_find)-set(no_direct_hit)
- likely_found = set(no_direct_hit)-set(no_second_run_hit)
- maybe_found = set(no_second_run_hit)-set(no_last_run_hit)
+ found = set(names_to_find) - set(no_direct_hit)
+ likely_found = set(no_direct_hit) - set(no_second_run_hit)
+ maybe_found = set(no_second_run_hit) - set(no_last_run_hit)
not_found = no_last_run_hit
with open("local/maybe_found.txt", "w") as file:
@@ -102,6 +106,3 @@ def find_missing_users(patreon_filepath, ffbl_filepath):
file.write(name + "\n")
return list(found), list(likely_found), list(maybe_found), not_found
-
-
-
diff --git a/DSTBundesliga/apps/services/rss_service.py b/DSTBundesliga/apps/services/rss_service.py
index 7e90076..5210f34 100644
--- a/DSTBundesliga/apps/services/rss_service.py
+++ b/DSTBundesliga/apps/services/rss_service.py
@@ -23,15 +23,13 @@ def update():
def create_news(entry):
News.objects.create(
- title=entry.title,
- content=get_content(entry),
- image=settings.PODCAST_NEWS_LOGO
+ title=entry.title, content=get_content(entry), image=settings.PODCAST_NEWS_LOGO
)
def get_last_update_ts():
try:
- with open(settings.RSS_TIMESTAMP_FILE, 'r') as ts_file:
+ with open(settings.RSS_TIMESTAMP_FILE, "r") as ts_file:
ts = ts_file.readline().strip()
dt = parse(ts)
except Exception as e:
@@ -42,9 +40,11 @@ def get_last_update_ts():
def set_last_update_ts(dt):
- with open(settings.RSS_TIMESTAMP_FILE, 'w') as ts_file:
+ with open(settings.RSS_TIMESTAMP_FILE, "w") as ts_file:
ts_file.write(str(dt))
def get_content(entry):
- return entry.summary + "Hier geht's zur neuen Folge".format(link=entry.link)
+ return entry.summary + "
Hier geht's zur neuen Folge".format(
+ link=entry.link
+ )
diff --git a/DSTBundesliga/apps/services/season_service.py b/DSTBundesliga/apps/services/season_service.py
index 0fb309e..2b44941 100644
--- a/DSTBundesliga/apps/services/season_service.py
+++ b/DSTBundesliga/apps/services/season_service.py
@@ -2,23 +2,31 @@
from django.conf import settings
-from DSTBundesliga.apps.leagues.models import PlayoffMatchup, Season, League, FinalSeasonStanding, Roster
+from DSTBundesliga.apps.leagues.models import (
+ PlayoffMatchup,
+ Season,
+ League,
+ FinalSeasonStanding,
+ Roster,
+)
def is_registration_open():
- return datetime.date.fromisoformat(settings.REGISTRATION_STARTS) \
- <= datetime.date.today() \
- <= datetime.date.fromisoformat(settings.REGISTRATION_STOPS)
+ return (
+ datetime.date.fromisoformat(settings.REGISTRATION_STARTS)
+ <= datetime.date.today()
+ <= datetime.date.fromisoformat(settings.REGISTRATION_STOPS)
+ )
def calc_final_standings(season: Season):
# Add per league points
- for league in League.objects.filter(season = season, type=League.BUNDESLIGA):
- for rank, roster in enumerate(league.rosters.order_by('-fpts', '-fpts_decimal'), 1):
+ for league in League.objects.filter(season=season, type=League.BUNDESLIGA):
+ for rank, roster in enumerate(
+ league.rosters.order_by("-fpts", "-fpts_decimal"), 1
+ ):
season_ranking, created = FinalSeasonStanding.objects.get_or_create(
- season=season,
- roster=roster,
- league=league
+ season=season, roster=roster, league=league
)
season_ranking.points_ranking_in_league = rank
season_ranking.points = roster.fpts
@@ -27,64 +35,84 @@ def calc_final_standings(season: Season):
season_ranking.save()
# Add per level points
- for level in sorted(list(set(League.objects.filter(type=League.BUNDESLIGA).values_list('level', flat=True)))):
- for rank, roster in enumerate(Roster.objects.filter(league__level=level, league__season=season).order_by('-fpts', '-fpts_decimal'), 1):
+ for level in sorted(
+ list(
+ set(
+ League.objects.filter(type=League.BUNDESLIGA).values_list(
+ "level", flat=True
+ )
+ )
+ )
+ ):
+ for rank, roster in enumerate(
+ Roster.objects.filter(league__level=level, league__season=season).order_by(
+ "-fpts", "-fpts_decimal"
+ ),
+ 1,
+ ):
season_ranking = FinalSeasonStanding.objects.get(
- season=season,
- roster=roster
+ season=season, roster=roster
)
season_ranking.points_ranking_on_level = rank
season_ranking.save()
# Add overall points
- for rank, roster in enumerate(Roster.objects.filter(league__type=League.BUNDESLIGA, league__season=season).order_by('-fpts', '-fpts_decimal'), 1):
- season_ranking = FinalSeasonStanding.objects.get(
- season=season,
- roster=roster
- )
+ for rank, roster in enumerate(
+ Roster.objects.filter(
+ league__type=League.BUNDESLIGA, league__season=season
+ ).order_by("-fpts", "-fpts_decimal"),
+ 1,
+ ):
+ season_ranking = FinalSeasonStanding.objects.get(season=season, roster=roster)
season_ranking.points_ranking_overall = rank
season_ranking.save()
-
# Add ranks per league
- all_bundesliga_league_ids = League.objects.filter(type=League.BUNDESLIGA, season=season).values_list("sleeper_id", flat=True)
- all_mus = PlayoffMatchup.objects.filter(season=season, league_id__in=all_bundesliga_league_ids)
+ all_bundesliga_league_ids = League.objects.filter(
+ type=League.BUNDESLIGA, season=season
+ ).values_list("sleeper_id", flat=True)
+ all_mus = PlayoffMatchup.objects.filter(
+ season=season, league_id__in=all_bundesliga_league_ids
+ )
for rank in [1, 3, 5]:
for mu in all_mus.filter(bracket="Playoffs", rank=rank):
- winner = Roster.objects.get(league__sleeper_id=mu.league_id, roster_id=mu.winner)
+ winner = Roster.objects.get(
+ league__sleeper_id=mu.league_id, roster_id=mu.winner
+ )
season_ranking_winner = FinalSeasonStanding.objects.get(
- season=season,
- roster=winner
+ season=season, roster=winner
)
season_ranking_winner.rank_in_league = rank
season_ranking_winner.save()
- loser = Roster.objects.get(league__sleeper_id=mu.league_id, roster_id=mu.loser)
+ loser = Roster.objects.get(
+ league__sleeper_id=mu.league_id, roster_id=mu.loser
+ )
season_ranking_loser = FinalSeasonStanding.objects.get(
- season=season,
- roster=loser
+ season=season, roster=loser
)
season_ranking_loser.rank_in_league = rank + 1
season_ranking_loser.save()
for rank in [1, 3, 5]:
for mu in all_mus.filter(bracket="Toilet Bowl", rank=rank):
- winner = Roster.objects.get(league__sleeper_id=mu.league_id, roster_id=mu.winner)
+ winner = Roster.objects.get(
+ league__sleeper_id=mu.league_id, roster_id=mu.winner
+ )
season_ranking_winner = FinalSeasonStanding.objects.get(
- season=season,
- roster=winner
+ season=season, roster=winner
)
season_ranking_winner.rank_in_league = 13 - rank
season_ranking_winner.save()
- loser = Roster.objects.get(league__sleeper_id=mu.league_id, roster_id=mu.loser)
+ loser = Roster.objects.get(
+ league__sleeper_id=mu.league_id, roster_id=mu.loser
+ )
season_ranking_loser = FinalSeasonStanding.objects.get(
- season=season,
- roster=loser
+ season=season, roster=loser
)
- season_ranking_loser.rank_in_league = 13 - 1 -rank
+ season_ranking_loser.rank_in_league = 13 - 1 - rank
season_ranking_loser.save()
-
diff --git a/DSTBundesliga/apps/services/state_service.py b/DSTBundesliga/apps/services/state_service.py
index 010c841..163a8e6 100644
--- a/DSTBundesliga/apps/services/state_service.py
+++ b/DSTBundesliga/apps/services/state_service.py
@@ -39,7 +39,7 @@ def get_state(self):
leg=state_data.get("leg"),
league_season=state_data.get("league_season"),
league_create_season=state_data.get("league_create_season"),
- display_week=state_data.get("display_week")
+ display_week=state_data.get("display_week"),
)
def get_season(self):
diff --git a/DSTBundesliga/asgi.py b/DSTBundesliga/asgi.py
index b049a8a..cac8373 100644
--- a/DSTBundesliga/asgi.py
+++ b/DSTBundesliga/asgi.py
@@ -11,6 +11,6 @@
from django.core.asgi import get_asgi_application
-os.environ.setdefault('DJANGO_SETTINGS_MODULE', 'DSTBundesliga.settings')
+os.environ.setdefault("DJANGO_SETTINGS_MODULE", "DSTBundesliga.settings")
application = get_asgi_application()
diff --git a/DSTBundesliga/settings.py b/DSTBundesliga/settings.py
index 5ce086a..f0d6700 100644
--- a/DSTBundesliga/settings.py
+++ b/DSTBundesliga/settings.py
@@ -24,12 +24,12 @@
# See https://docs.djangoproject.com/en/3.0/howto/deployment/checklist/
# SECURITY WARNING: keep the secret key used in production secret!
-SECRET_KEY = os.getenv('SECRET_KEY')
+SECRET_KEY = os.getenv("SECRET_KEY")
# SECURITY WARNING: don't run with debug turned on in production!
DEBUG = False
-ALLOWED_HOSTS = ['dstffbl.uber.space', '.downsettalk.de', '.fantasybundesliga.de']
+ALLOWED_HOSTS = ["dstffbl.uber.space", ".downsettalk.de", ".fantasybundesliga.de"]
SITE_ID = 1
@@ -37,134 +37,133 @@
AUTHENTICATION_BACKENDS = [
# Needed to login by username in Django admin, regardless of `allauth`
- 'django.contrib.auth.backends.ModelBackend',
-
+ "django.contrib.auth.backends.ModelBackend",
# `allauth` specific authentication methods, such as login by e-mail
- 'allauth.account.auth_backends.AuthenticationBackend',
+ "allauth.account.auth_backends.AuthenticationBackend",
]
SOCIALACCOUNT_PROVIDERS = {
- 'patreon': {
- 'VERSION': 'v2',
- 'SCOPE': ['identity', 'identity[email]', 'identity.memberships']
+ "patreon": {
+ "VERSION": "v2",
+ "SCOPE": ["identity", "identity[email]", "identity.memberships"],
}
}
-ACCOUNT_AUTHENTICATION_METHOD = 'email'
+ACCOUNT_AUTHENTICATION_METHOD = "email"
ACCOUNT_EMAIL_REQUIRED = True
-ACCOUNT_USER_MODEL_USERNAME_FIELD = 'username'
+ACCOUNT_USER_MODEL_USERNAME_FIELD = "username"
SOCIALACCOUNT_ADAPTER = "DSTBundesliga.apps.dstffbl.models.CustomSocialAccountAdapter"
SOCIALACCOUNT_AUTO_SIGNUP = True
-SOCIALACCOUNT_EMAIL_VERIFICATION ='none'
-SESSION_COOKIE_SAMESITE = 'Lax'
-CSRF_COOKIE_SAMESITE = 'Lax'
-SESSION_COOKIE_NAME = 'dstffbl_session_id'
+SOCIALACCOUNT_EMAIL_VERIFICATION = "none"
+SESSION_COOKIE_SAMESITE = "Lax"
+CSRF_COOKIE_SAMESITE = "Lax"
+SESSION_COOKIE_NAME = "dstffbl_session_id"
CSRF_USE_SESSIONS = True
INSTALLED_APPS = [
- 'djangocms_admin_style',
- 'django.contrib.admin',
- 'django.contrib.auth',
- 'django.contrib.contenttypes',
- 'django.contrib.sessions',
- 'django.contrib.messages',
- 'django.contrib.staticfiles',
- 'django.contrib.sites',
- 'cms',
- 'menus',
- 'treebeard',
- 'sekizai',
- 'filer',
- 'easy_thumbnails',
- 'mptt',
- 'djangocms_text_ckeditor',
- 'djangocms_link',
- 'djangocms_file',
- 'djangocms_picture',
- 'djangocms_video',
- 'djangocms_googlemap',
- 'djangocms_snippet',
- 'djangocms_style',
- 'django_tables2',
- 'cookielaw',
- 'tinymce',
- 'DSTBundesliga.apps.leagues',
- 'DSTBundesliga.apps.dstffbl',
- 'allauth',
- 'allauth.account',
- 'allauth.socialaccount',
- 'allauth.socialaccount.providers.patreon',
+ "djangocms_admin_style",
+ "django.contrib.admin",
+ "django.contrib.auth",
+ "django.contrib.contenttypes",
+ "django.contrib.sessions",
+ "django.contrib.messages",
+ "django.contrib.staticfiles",
+ "django.contrib.sites",
+ "cms",
+ "menus",
+ "treebeard",
+ "sekizai",
+ "filer",
+ "easy_thumbnails",
+ "mptt",
+ "djangocms_text_ckeditor",
+ "djangocms_link",
+ "djangocms_file",
+ "djangocms_picture",
+ "djangocms_video",
+ "djangocms_googlemap",
+ "djangocms_snippet",
+ "djangocms_style",
+ "django_tables2",
+ "cookielaw",
+ "tinymce",
+ "DSTBundesliga.apps.leagues",
+ "DSTBundesliga.apps.dstffbl",
+ "allauth",
+ "allauth.account",
+ "allauth.socialaccount",
+ "allauth.socialaccount.providers.patreon",
]
MIDDLEWARE = [
- 'django.middleware.security.SecurityMiddleware',
- 'django.contrib.sessions.middleware.SessionMiddleware',
- 'django.middleware.common.CommonMiddleware',
- 'django.middleware.csrf.CsrfViewMiddleware',
- 'django.contrib.auth.middleware.AuthenticationMiddleware',
- 'django.contrib.messages.middleware.MessageMiddleware',
- 'django.middleware.clickjacking.XFrameOptionsMiddleware',
- 'django.middleware.locale.LocaleMiddleware',
- 'cms.middleware.user.CurrentUserMiddleware',
- 'cms.middleware.page.CurrentPageMiddleware',
- 'cms.middleware.toolbar.ToolbarMiddleware',
- 'cms.middleware.language.LanguageCookieMiddleware',
+ "django.middleware.security.SecurityMiddleware",
+ "django.contrib.sessions.middleware.SessionMiddleware",
+ "django.middleware.common.CommonMiddleware",
+ "django.middleware.csrf.CsrfViewMiddleware",
+ "django.contrib.auth.middleware.AuthenticationMiddleware",
+ "django.contrib.messages.middleware.MessageMiddleware",
+ "django.middleware.clickjacking.XFrameOptionsMiddleware",
+ "django.middleware.locale.LocaleMiddleware",
+ "cms.middleware.user.CurrentUserMiddleware",
+ "cms.middleware.page.CurrentPageMiddleware",
+ "cms.middleware.toolbar.ToolbarMiddleware",
+ "cms.middleware.language.LanguageCookieMiddleware",
]
-ROOT_URLCONF = 'DSTBundesliga.urls'
+ROOT_URLCONF = "DSTBundesliga.urls"
TEMPLATES = [
{
- 'BACKEND': 'django.template.backends.django.DjangoTemplates',
- 'DIRS': ['templates'],
- 'APP_DIRS': True,
- 'OPTIONS': {
- 'context_processors': [
- 'django.template.context_processors.debug',
- 'django.template.context_processors.request',
- 'django.contrib.auth.context_processors.auth',
- 'django.contrib.messages.context_processors.messages',
- 'sekizai.context_processors.sekizai',
- 'cms.context_processors.cms_settings',
- 'django.template.context_processors.i18n',
- 'cookielaw.context_processors.cookielaw'
+ "BACKEND": "django.template.backends.django.DjangoTemplates",
+ "DIRS": ["templates"],
+ "APP_DIRS": True,
+ "OPTIONS": {
+ "context_processors": [
+ "django.template.context_processors.debug",
+ "django.template.context_processors.request",
+ "django.contrib.auth.context_processors.auth",
+ "django.contrib.messages.context_processors.messages",
+ "sekizai.context_processors.sekizai",
+ "cms.context_processors.cms_settings",
+ "django.template.context_processors.i18n",
+ "cookielaw.context_processors.cookielaw",
],
},
},
]
-WSGI_APPLICATION = 'DSTBundesliga.wsgi.application'
+WSGI_APPLICATION = "DSTBundesliga.wsgi.application"
# Password validation
# https://docs.djangoproject.com/en/3.0/ref/settings/#auth-password-validators
AUTH_PASSWORD_VALIDATORS = [
{
- 'NAME': 'django.contrib.auth.password_validation.UserAttributeSimilarityValidator',
+ "NAME": "django.contrib.auth.password_validation.UserAttributeSimilarityValidator",
},
{
- 'NAME': 'django.contrib.auth.password_validation.MinimumLengthValidator',
+ "NAME": "django.contrib.auth.password_validation.MinimumLengthValidator",
},
{
- 'NAME': 'django.contrib.auth.password_validation.CommonPasswordValidator',
+ "NAME": "django.contrib.auth.password_validation.CommonPasswordValidator",
},
{
- 'NAME': 'django.contrib.auth.password_validation.NumericPasswordValidator',
+ "NAME": "django.contrib.auth.password_validation.NumericPasswordValidator",
},
]
LANGUAGES = [
- ('en', 'English'),
- ('de', 'German'),
+ ("en", "English"),
+ ("de", "German"),
]
# Internationalization
# https://docs.djangoproject.com/en/3.0/topics/i18n/
-LANGUAGE_CODE = 'de'
+LANGUAGE_CODE = "de"
-TIME_ZONE = 'Europe/Berlin'
+TIME_ZONE = "Europe/Berlin"
USE_I18N = True
@@ -173,7 +172,7 @@
USE_TZ = True
CMS_TEMPLATES = [
- ('home.html', 'Home page template'),
+ ("home.html", "Home page template"),
]
CMS_PERMISSION = True
@@ -181,48 +180,48 @@
MEDIA_URL = "/media/"
MEDIA_ROOT = os.path.expanduser("~/html/media/")
-FILER_CANONICAL_URL = 'files/'
+FILER_CANONICAL_URL = "files/"
THUMBNAIL_HIGH_RESOLUTION = True
THUMBNAIL_PROCESSORS = (
- 'easy_thumbnails.processors.colorspace',
- 'easy_thumbnails.processors.autocrop',
- 'filer.thumbnail_processors.scale_and_crop_with_subject_location',
- 'easy_thumbnails.processors.filters'
+ "easy_thumbnails.processors.colorspace",
+ "easy_thumbnails.processors.autocrop",
+ "filer.thumbnail_processors.scale_and_crop_with_subject_location",
+ "easy_thumbnails.processors.filters",
)
# Static files (CSS, JavaScript, Images)
# https://docs.djangoproject.com/en/3.0/howto/static-files/
-STATIC_URL = '/static/'
+STATIC_URL = "/static/"
STATIC_ROOT = os.path.expanduser("~/html/static/")
-STATICFILES_DIRS = [os.path.join(BASE_DIR, 'staticfiles')]
+STATICFILES_DIRS = [os.path.join(BASE_DIR, "staticfiles")]
ADMIN_MEDIA_PREFIX = "/static/admin/"
-LOGIN_REDIRECT_URL = '/'
-LOGOUT_REDIRECT_URL = '/'
+LOGIN_REDIRECT_URL = "/"
+LOGOUT_REDIRECT_URL = "/"
REGISTRATION_STARTS = "2023-07-31"
REGISTRATION_STOPS = "2023-08-11"
-if os.getenv('DEV', 0) == '1':
+if os.getenv("DEV", 0) == "1":
from local_settings import *
STATIC_ROOT = os.path.join(BASE_DIR, "static/")
MEDIA_ROOT = os.path.join(BASE_DIR, "media")
DATABASES = {
- 'default': {
- 'ENGINE': 'django.db.backends.sqlite3',
- 'NAME': 'mydatabase',
+ "default": {
+ "ENGINE": "django.db.backends.sqlite3",
+ "NAME": "mydatabase",
}
}
CACHES = {
- 'default': {
- 'BACKEND': 'django.core.cache.backends.locmem.LocMemCache',
- 'LOCATION': 'unique-snowflake',
+ "default": {
+ "BACKEND": "django.core.cache.backends.locmem.LocMemCache",
+ "LOCATION": "unique-snowflake",
}
}
else:
@@ -230,10 +229,10 @@
# https://docs.djangoproject.com/en/3.0/ref/settings/#databases
DATABASES = {
- 'default': {
- 'ENGINE': 'django.db.backends.mysql',
- 'OPTIONS': {
- 'read_default_file': os.getenv('DB_OPTIONS_FILE'),
+ "default": {
+ "ENGINE": "django.db.backends.mysql",
+ "OPTIONS": {
+ "read_default_file": os.getenv("DB_OPTIONS_FILE"),
},
}
}
@@ -244,12 +243,14 @@
"LOCATION": "unix:///home/dstffbl/.redis/sock?db=0",
"OPTIONS": {
"CLIENT_CLASS": "django_redis.client.DefaultClient",
- }
+ },
}
}
import hashlib
+
+
def md5(fname):
hash_md5 = hashlib.md5()
with open(fname, "rb") as f:
@@ -260,10 +261,6 @@ def md5(fname):
CSS_VERSION_HASH = md5(os.path.join(BASE_DIR, "staticfiles/css/base.css"))
-MAX_PLAYERS = 1404
-
-DEFAULT_LEAGUE_SETTINGS_PATH = os.path.join(BASE_DIR, "Ligaübersicht.csv")
-
DEFAULT_NEWS_LOGO = "dst_logo_96.png"
RSS_FEED = "https://anchor.fm/s/1ce78cc4/podcast/rss"
@@ -272,26 +269,24 @@ def md5(fname):
LOGGING = {
- 'version': 1,
- 'disable_existing_loggers': False,
- 'handlers': {
- 'console': {
- 'class': 'logging.StreamHandler',
+ "version": 1,
+ "disable_existing_loggers": False,
+ "handlers": {
+ "console": {
+ "class": "logging.StreamHandler",
},
},
- 'root': {
- 'handlers': ['console'],
- 'level': 'WARNING',
+ "root": {
+ "handlers": ["console"],
+ "level": "WARNING",
},
}
-DEFAULT_FROM_EMAIL = 'DSTFanFooBL - Down Set Talk! Fantasy Football Bundesliga '
-EMAIL_HOST = os.getenv('EMAIL_HOST', 'localhost')
-EMAIL_PORT = int(os.getenv('EMAIL_PORT', 25))
-EMAIL_HOST_USER = os.getenv('EMAIL_HOST_USER', '')
-EMAIL_HOST_PASSWORD = os.getenv('EMAIL_HOST_PASSWORD', '')
+DEFAULT_FROM_EMAIL = "DSTFanFooBL - Down Set Talk! Fantasy Football Bundesliga "
+EMAIL_HOST = os.getenv("EMAIL_HOST", "localhost")
+EMAIL_PORT = int(os.getenv("EMAIL_PORT", 25))
+EMAIL_HOST_USER = os.getenv("EMAIL_HOST_USER", "")
+EMAIL_HOST_PASSWORD = os.getenv("EMAIL_HOST_PASSWORD", "")
EMAIL_USE_SSL = True
-DST_PATREON_CAMPAIGN_ID = '2708731'
-
-
+DST_PATREON_CAMPAIGN_ID = "2708731"
diff --git a/DSTBundesliga/urls.py b/DSTBundesliga/urls.py
index fcbd22a..dd2e0e7 100644
--- a/DSTBundesliga/urls.py
+++ b/DSTBundesliga/urls.py
@@ -9,15 +9,17 @@
admin.autodiscover()
urlpatterns = [
- path('', include(('DSTBundesliga.apps.dstffbl.urls', 'dstffbl'), namespace='dstffbl')),
- path('auth/', include('django.contrib.auth.urls')),
- path('accounts/', include('allauth.urls')),
- path('leagues/', include('DSTBundesliga.apps.leagues.urls')),
- path('tinymce/', include('tinymce.urls')),
- path('admin/', admin.site.urls),
- url(r'^shared/', include('filer.urls')),
- path('regelwerk/', views.regelwerk),
- re_path(r'^', include('cms.urls')),
+ path(
+ "", include(("DSTBundesliga.apps.dstffbl.urls", "dstffbl"), namespace="dstffbl")
+ ),
+ path("auth/", include("django.contrib.auth.urls")),
+ path("accounts/", include("allauth.urls")),
+ path("leagues/", include("DSTBundesliga.apps.leagues.urls")),
+ path("tinymce/", include("tinymce.urls")),
+ path("admin/", admin.site.urls),
+ url(r"^shared/", include("filer.urls")),
+ path("regelwerk/", views.regelwerk),
+ re_path(r"^", include("cms.urls")),
]
if settings.DEBUG:
diff --git a/DSTBundesliga/wsgi.py b/DSTBundesliga/wsgi.py
index c29a95e..67441df 100644
--- a/DSTBundesliga/wsgi.py
+++ b/DSTBundesliga/wsgi.py
@@ -11,6 +11,6 @@
from django.core.wsgi import get_wsgi_application
-os.environ.setdefault('DJANGO_SETTINGS_MODULE', 'DSTBundesliga.settings')
+os.environ.setdefault("DJANGO_SETTINGS_MODULE", "DSTBundesliga.settings")
application = get_wsgi_application()
diff --git a/local_settings_example.py b/local_settings_example.py
index 652ff5b..7da9612 100644
--- a/local_settings_example.py
+++ b/local_settings_example.py
@@ -1,11 +1,11 @@
DATABASES = {
- 'default': {
- 'ENGINE': 'django.db.backends.sqlite3',
- 'NAME': 'mydatabase',
+ "default": {
+ "ENGINE": "django.db.backends.sqlite3",
+ "NAME": "mydatabase",
}
}
-ALLOWED_HOSTS = ['localhost', '127.0.0.1']
+ALLOWED_HOSTS = ["localhost", "127.0.0.1"]
X_FRAME_OPTIONS = "ALLOWALL"
XS_SHARING_ALLOWED_METHODS = ["POST", "GET", "OPTIONS", "PUT", "DELETE"]
diff --git a/manage.py b/manage.py
index 6ff8b43..b4629fc 100755
--- a/manage.py
+++ b/manage.py
@@ -5,7 +5,7 @@
def main():
- os.environ.setdefault('DJANGO_SETTINGS_MODULE', 'DSTBundesliga.settings')
+ os.environ.setdefault("DJANGO_SETTINGS_MODULE", "DSTBundesliga.settings")
try:
from django.core.management import execute_from_command_line
except ImportError as exc:
@@ -17,5 +17,5 @@ def main():
execute_from_command_line(sys.argv)
-if __name__ == '__main__':
+if __name__ == "__main__":
main()
diff --git a/poetry.lock b/poetry.lock
index 7513ad9..e1da4b2 100644
--- a/poetry.lock
+++ b/poetry.lock
@@ -73,6 +73,29 @@ category = "main"
optional = false
python-versions = "*"
+[[package]]
+name = "black"
+version = "23.7.0"
+description = "The uncompromising code formatter."
+category = "main"
+optional = false
+python-versions = ">=3.8"
+
+[package.dependencies]
+click = ">=8.0.0"
+mypy-extensions = ">=0.4.3"
+packaging = ">=22.0"
+pathspec = ">=0.9.0"
+platformdirs = ">=2"
+tomli = {version = ">=1.1.0", markers = "python_version < \"3.11\""}
+typing-extensions = {version = ">=3.10.0.0", markers = "python_version < \"3.10\""}
+
+[package.extras]
+colorama = ["colorama (>=0.4.3)"]
+d = ["aiohttp (>=3.7.4)"]
+jupyter = ["ipython (>=7.8.0)", "tokenize-rt (>=3.2.0)"]
+uvloop = ["uvloop (>=0.15.2)"]
+
[[package]]
name = "certifi"
version = "2023.7.22"
@@ -100,6 +123,17 @@ category = "main"
optional = false
python-versions = "*"
+[[package]]
+name = "click"
+version = "8.1.6"
+description = "Composable command line interface toolkit"
+category = "main"
+optional = false
+python-versions = ">=3.7"
+
+[package.dependencies]
+colorama = {version = "*", markers = "platform_system == \"Windows\""}
+
[[package]]
name = "colorama"
version = "0.4.6"
@@ -523,6 +557,35 @@ python-versions = ">=3.6"
[package.dependencies]
sgmllib3k = "*"
+[[package]]
+name = "flake8"
+version = "6.1.0"
+description = "the modular source code checker: pep8 pyflakes and co"
+category = "main"
+optional = false
+python-versions = ">=3.8.1"
+
+[package.dependencies]
+mccabe = ">=0.7.0,<0.8.0"
+pycodestyle = ">=2.11.0,<2.12.0"
+pyflakes = ">=3.1.0,<3.2.0"
+
+[[package]]
+name = "flake8-black"
+version = "0.3.6"
+description = "flake8 plugin to call black as a code style validator"
+category = "dev"
+optional = false
+python-versions = ">=3.7"
+
+[package.dependencies]
+black = ">=22.1.0"
+flake8 = ">=3"
+tomli = {version = "*", markers = "python_version < \"3.11\""}
+
+[package.extras]
+develop = ["build", "twine"]
+
[[package]]
name = "html5lib"
version = "1.1"
@@ -668,6 +731,14 @@ python-versions = ">=3.5"
[package.dependencies]
traitlets = "*"
+[[package]]
+name = "mccabe"
+version = "0.7.0"
+description = "McCabe checker, plugin for flake8"
+category = "main"
+optional = false
+python-versions = ">=3.6"
+
[[package]]
name = "more-itertools"
version = "9.1.0"
@@ -676,6 +747,14 @@ category = "main"
optional = false
python-versions = ">=3.7"
+[[package]]
+name = "mypy-extensions"
+version = "1.0.0"
+description = "Type system extensions for programs checked with the mypy type checker."
+category = "main"
+optional = false
+python-versions = ">=3.5"
+
[[package]]
name = "oauthlib"
version = "3.2.2"
@@ -709,6 +788,14 @@ python-versions = ">=3.6"
qa = ["flake8 (==3.8.3)", "mypy (==0.782)"]
testing = ["docopt", "pytest (<6.0.0)"]
+[[package]]
+name = "pathspec"
+version = "0.11.2"
+description = "Utility library for gitignore style pattern matching of file paths."
+category = "main"
+optional = false
+python-versions = ">=3.7"
+
[[package]]
name = "patreon"
version = "0.5.0"
@@ -751,6 +838,18 @@ python-versions = ">=3.8"
docs = ["furo", "olefile", "sphinx (>=2.4)", "sphinx-copybutton", "sphinx-inline-tabs", "sphinx-removed-in", "sphinxext-opengraph"]
tests = ["check-manifest", "coverage", "defusedxml", "markdown2", "olefile", "packaging", "pyroma", "pytest", "pytest-cov", "pytest-timeout"]
+[[package]]
+name = "platformdirs"
+version = "3.10.0"
+description = "A small Python package for determining appropriate platform-specific dirs, e.g. a \"user data dir\"."
+category = "main"
+optional = false
+python-versions = ">=3.7"
+
+[package.extras]
+docs = ["furo (>=2023.7.26)", "proselint (>=0.13)", "sphinx-autodoc-typehints (>=1.24)", "sphinx (>=7.1.1)"]
+test = ["appdirs (==1.4.4)", "covdefaults (>=2.3)", "pytest-cov (>=4.1)", "pytest-mock (>=3.11.1)", "pytest (>=7.4)"]
+
[[package]]
name = "pluggy"
version = "0.13.1"
@@ -800,6 +899,14 @@ category = "main"
optional = false
python-versions = ">=2.7, !=3.0.*, !=3.1.*, !=3.2.*, !=3.3.*, !=3.4.*"
+[[package]]
+name = "pycodestyle"
+version = "2.11.0"
+description = "Python style guide checker"
+category = "main"
+optional = false
+python-versions = ">=3.8"
+
[[package]]
name = "pycparser"
version = "2.21"
@@ -808,6 +915,14 @@ category = "main"
optional = false
python-versions = ">=2.7, !=3.0.*, !=3.1.*, !=3.2.*, !=3.3.*"
+[[package]]
+name = "pyflakes"
+version = "3.1.0"
+description = "passive checker of Python programs"
+category = "main"
+optional = false
+python-versions = ">=3.8"
+
[[package]]
name = "pygments"
version = "2.15.1"
@@ -1054,6 +1169,14 @@ webencodings = ">=0.4"
doc = ["sphinx", "sphinx-rtd-theme"]
test = ["pytest", "isort", "flake8"]
+[[package]]
+name = "tomli"
+version = "2.0.1"
+description = "A lil' TOML parser"
+category = "main"
+optional = false
+python-versions = ">=3.7"
+
[[package]]
name = "traitlets"
version = "5.9.0"
@@ -1137,7 +1260,7 @@ testing = ["pytest (>=6)", "pytest-checkdocs (>=2.4)", "pytest-cov", "pytest-ena
[metadata]
lock-version = "1.1"
python-versions = "^3.9"
-content-hash = "12d6e19a097b0cfa480e7d601793f513a6ddd29cc0547b266a0db9da7068cf59"
+content-hash = "459f6c0a61b1119b9172f7540bda1c253ed83e3a2f1cf22627f32caa39e4c8cd"
[metadata.files]
appnope = [
@@ -1156,12 +1279,14 @@ backcall = [
{file = "backcall-0.2.0-py2.py3-none-any.whl", hash = "sha256:fbbce6a29f263178a1f7915c1940bde0ec2b2a967566fe1c65c1dfb7422bd255"},
{file = "backcall-0.2.0.tar.gz", hash = "sha256:5cbdbf27be5e7cfadb448baf0aa95508f91f2bbc6c6437cd9cd06e2a4c215e1e"},
]
+black = []
certifi = []
cffi = []
chardet = [
{file = "chardet-3.0.4-py2.py3-none-any.whl", hash = "sha256:fc323ffcaeaed0e0a02bf4d117757b98aed530d9ed4531e3e15460124c106691"},
{file = "chardet-3.0.4.tar.gz", hash = "sha256:84ab92ed1c4d4f16916e05906b6b75a6c0fb5db821cc65e70cbd64a3e2a5eaae"},
]
+click = []
colorama = []
cryptography = []
cssselect2 = []
@@ -1242,6 +1367,8 @@ feedparser = [
{file = "feedparser-6.0.10-py3-none-any.whl", hash = "sha256:79c257d526d13b944e965f6095700587f27388e50ea16fd245babe4dfae7024f"},
{file = "feedparser-6.0.10.tar.gz", hash = "sha256:27da485f4637ce7163cdeab13a80312b93b7d0c1b775bef4a47629a3110bca51"},
]
+flake8 = []
+flake8-black = []
html5lib = [
{file = "html5lib-1.1-py2.py3-none-any.whl", hash = "sha256:0d78f8fde1c230e99fe37986a60526d7049ed4bf8a9fadbad5f00e22e58e041d"},
{file = "html5lib-1.1.tar.gz", hash = "sha256:b2e5b40261e20f354d198eae92afc10d750afb487ed5e50f9c4eaf07c184146f"},
@@ -1263,13 +1390,16 @@ loguru = [
]
lxml = []
matplotlib-inline = []
+mccabe = []
more-itertools = []
+mypy-extensions = []
oauthlib = []
packaging = []
parso = [
{file = "parso-0.8.3-py2.py3-none-any.whl", hash = "sha256:c001d4636cd3aecdaf33cbb40aebb59b094be2a74c556778ef5576c175e19e75"},
{file = "parso-0.8.3.tar.gz", hash = "sha256:8c07be290bb59f03588915921e29e8a50002acaf2cdc5fa0e0114f91709fafa0"},
]
+pathspec = []
patreon = [
{file = "patreon-0.5.0.tar.gz", hash = "sha256:04ad0360e7acc38a85beafa8d44eeeafd3c31d136488aa4de707526163682ca4"},
]
@@ -1282,6 +1412,7 @@ pickleshare = [
{file = "pickleshare-0.7.5.tar.gz", hash = "sha256:87683d47965c1da65cdacaf31c8441d12b8044cdec9aca500cd78fc2c683afca"},
]
pillow = []
+platformdirs = []
pluggy = [
{file = "pluggy-0.13.1-py2.py3-none-any.whl", hash = "sha256:966c145cd83c96502c3c3868f50408687b38434af77734af1e9ca461a4081d2d"},
{file = "pluggy-0.13.1.tar.gz", hash = "sha256:15b2acde666561e1298d71b523007ed7364de07029219b604cf808bfa1c765b0"},
@@ -1299,10 +1430,12 @@ py = [
{file = "py-1.11.0-py2.py3-none-any.whl", hash = "sha256:607c53218732647dff4acdfcd50cb62615cedf612e72d1724fb1a0cc6405b378"},
{file = "py-1.11.0.tar.gz", hash = "sha256:51c75c4126074b472f746a24399ad32f6053d1b34b68d2fa41e558e6f4a98719"},
]
+pycodestyle = []
pycparser = [
{file = "pycparser-2.21-py2.py3-none-any.whl", hash = "sha256:8ee45429555515e1f6b185e78100aea234072576aa43ab53aefcae078162fca9"},
{file = "pycparser-2.21.tar.gz", hash = "sha256:e644fdec12f7872f86c58ff790da456218b10f863970249516d60a5eaca77206"},
]
+pyflakes = []
pygments = []
pyjwt = []
pytest = [
@@ -1347,6 +1480,10 @@ sqlparse = []
stack-data = []
svglib = []
tinycss2 = []
+tomli = [
+ {file = "tomli-2.0.1-py3-none-any.whl", hash = "sha256:939de3e7a6161af0c887ef91b7d41a53e7c5a1ca976325f429cb46ea9bc30ecc"},
+ {file = "tomli-2.0.1.tar.gz", hash = "sha256:de526c12914f0c550d15924c62d72abc48d6fe7364aa87328337a31007fe8a4f"},
+]
traitlets = []
typing-extensions = []
unidecode = [
diff --git a/pyproject.toml b/pyproject.toml
index c935ab9..b9daa39 100644
--- a/pyproject.toml
+++ b/pyproject.toml
@@ -32,8 +32,12 @@ patreon = "^0.5.0"
loguru = "^0.6.0"
ipython = "^8.3.0"
django-redis = "^5.2.0"
+black = "^23.7.0"
+flake8 = "^6.1.0"
[tool.poetry.dev-dependencies]
+flake8 = "^6.1.0"
+flake8-black = "^0.3.6"
[build-system]
requires = ["poetry-core>=1.0.0"]