reformat everything using ruff

This commit is contained in:
2026-02-19 18:32:01 +01:00
parent 5b48167c66
commit 10d3254dda
10 changed files with 464 additions and 291 deletions
+94 -72
View File
@@ -46,16 +46,14 @@ def payback(user, day, month, amount, note):
def consumption(day: int, for_free: bool, drink_dict: Dict[User, List[Tuple[int, Drink]]]):
for user, drink_list in drink_dict.items():
for amount, drink in drink_list:
Consumption.objects.create(
user=user, drink=drink, amount=amount, day=day, for_free=for_free)
Consumption.objects.create(user=user, drink=drink, amount=amount, day=day, for_free=for_free)
class Command(BaseCommand):
@transaction.atomic()
def handle(self, *args, **options):
if any(model.objects.exists() for model in [Donation, Payment, Drink, Consumption]):
raise CommandError(
"clear all donation, payment, drink and consumption objects before running this command")
raise CommandError("clear all donation, payment, drink and consumption objects before running this command")
# --------------- PEOPLE ---------------
@@ -224,82 +222,106 @@ class Command(BaseCommand):
# --------------- THURSDAY ---------------
consumption(day=1, for_free=False, drink_dict={
robert: [(2, mate), (2, radler), (1, wasser)],
thure: [(4, sterni), (1, krosti), (2, radler)],
tobi: [(7, sterni), (2, krosti)],
herald: [(1, radler), (2, wasser), (4, wein)],
annemarie: [(1, sterni), (1, wasser), (2, wein)],
cathi_clemens: [(1, sterni), (2, radler)],
flo: [(6, sterni), (1, wasser)],
josi: [(4, sterni)],
aimee: [(5, sterni)],
lutz: [(1, sterni), (1, wasser)],
lasse: [(2, sterni), (1, wasser)],
domi: [(1, sterni), (1, radler)],
})
consumption(day=1, for_free=True, drink_dict={
seth_family: [(1, krosti), (1, radler)],
})
consumption(
day=1,
for_free=False,
drink_dict={
robert: [(2, mate), (2, radler), (1, wasser)],
thure: [(4, sterni), (1, krosti), (2, radler)],
tobi: [(7, sterni), (2, krosti)],
herald: [(1, radler), (2, wasser), (4, wein)],
annemarie: [(1, sterni), (1, wasser), (2, wein)],
cathi_clemens: [(1, sterni), (2, radler)],
flo: [(6, sterni), (1, wasser)],
josi: [(4, sterni)],
aimee: [(5, sterni)],
lutz: [(1, sterni), (1, wasser)],
lasse: [(2, sterni), (1, wasser)],
domi: [(1, sterni), (1, radler)],
},
)
consumption(
day=1,
for_free=True,
drink_dict={
seth_family: [(1, krosti), (1, radler)],
},
)
# --------------- FRIDAY ---------------
consumption(day=2, for_free=False, drink_dict={
robert: [(2, mate), (1, radler)],
thure: [(8, sterni), (2, krosti), (1, wasser)],
tobi: [(2, mate), (5, sterni), (5, krosti), (3, radler), (1, cola)],
herald: [(1, mate), (1, sterni), (2, radler), (1, cola), (4, wasser), (7, wein)],
annemarie: [(2, mate), (9, sterni), (1, krosti), (2, radler), (3, wasser)],
cathi_clemens: [(3, sterni), (3, radler)],
flo: [(1, mate), (6, sterni), (3, wasser)],
josi: [(8, sterni), (1, krosti), (2, radler)],
andrew: [(4, sterni)],
peter: [(7, sterni), (1, krosti), (2, wasser)],
fiddi_melli: [(6, sterni), (3, radler), (1, wasser)],
suse: [(1, krosti), (1, radler)],
lilly_simon: [(1, mate), (7, sterni), (3, wasser)]
})
consumption(
day=2,
for_free=False,
drink_dict={
robert: [(2, mate), (1, radler)],
thure: [(8, sterni), (2, krosti), (1, wasser)],
tobi: [(2, mate), (5, sterni), (5, krosti), (3, radler), (1, cola)],
herald: [(1, mate), (1, sterni), (2, radler), (1, cola), (4, wasser), (7, wein)],
annemarie: [(2, mate), (9, sterni), (1, krosti), (2, radler), (3, wasser)],
cathi_clemens: [(3, sterni), (3, radler)],
flo: [(1, mate), (6, sterni), (3, wasser)],
josi: [(8, sterni), (1, krosti), (2, radler)],
andrew: [(4, sterni)],
peter: [(7, sterni), (1, krosti), (2, wasser)],
fiddi_melli: [(6, sterni), (3, radler), (1, wasser)],
suse: [(1, krosti), (1, radler)],
lilly_simon: [(1, mate), (7, sterni), (3, wasser)],
},
)
consumption(day=2, for_free=True, drink_dict={
seth_family: [(1, mate), (6, sterni), (3, wasser)],
aimee: [(1, mate), (9, sterni), (3, wasser)],
lutz: [(1, mate), (9, sterni), (3, wasser)],
lasse: [(7, sterni), (1, wasser)],
domi: [(1, mate), (4, sterni), (1, wasser)],
hans_welle: [(3, mate), (7, sterni), (7, krosti), (1, cola), (2, wasser)],
})
consumption(
day=2,
for_free=True,
drink_dict={
seth_family: [(1, mate), (6, sterni), (3, wasser)],
aimee: [(1, mate), (9, sterni), (3, wasser)],
lutz: [(1, mate), (9, sterni), (3, wasser)],
lasse: [(7, sterni), (1, wasser)],
domi: [(1, mate), (4, sterni), (1, wasser)],
hans_welle: [(3, mate), (7, sterni), (7, krosti), (1, cola), (2, wasser)],
},
)
# --------------- SATURDAY ---------------
consumption(day=3, for_free=False, drink_dict={
robert: [(4, mate), (1, cola), (4, wasser)],
tobi: [(9, sterni), (1, krosti), (2, radler), (1, cola)],
herald: [(2, mate), (2, radler), (3, wasser), (5, wein)],
annemarie: [(2, mate), (6, sterni), (3, radler), (1, cola), (1, wasser)],
cathi_clemens: [(4, sterni), (8, radler), (1, wasser)],
flo: [(2, mate), (8, sterni), (1, radler), (3, wasser)],
josi: [(9, sterni), (2, radler), (2, wasser)],
aimee: [(10, sterni), (2, radler)],
lutz: [(1, krosti), (1, wasser)],
lasse: [(1, mate), (8, sterni)],
domi: [(6, sterni), (2, radler), (1, wasser)],
peter: [(3, sterni), (3, krosti), (2, radler)],
fiddi_melli: [(1, mate), (1, wasser)],
suse: [(1, mate), (1, sterni), (2, krosti), (4, radler)],
lilly_simon: [(1, mate), (2, radler), (7, wasser)],
kevin: [(1, mate), (1, radler)],
rebecca: [(1, radler)],
resi_simon: [(8, sterni), (1, radler), (1, wasser)],
})
consumption(
day=3,
for_free=False,
drink_dict={
robert: [(4, mate), (1, cola), (4, wasser)],
tobi: [(9, sterni), (1, krosti), (2, radler), (1, cola)],
herald: [(2, mate), (2, radler), (3, wasser), (5, wein)],
annemarie: [(2, mate), (6, sterni), (3, radler), (1, cola), (1, wasser)],
cathi_clemens: [(4, sterni), (8, radler), (1, wasser)],
flo: [(2, mate), (8, sterni), (1, radler), (3, wasser)],
josi: [(9, sterni), (2, radler), (2, wasser)],
aimee: [(10, sterni), (2, radler)],
lutz: [(1, krosti), (1, wasser)],
lasse: [(1, mate), (8, sterni)],
domi: [(6, sterni), (2, radler), (1, wasser)],
peter: [(3, sterni), (3, krosti), (2, radler)],
fiddi_melli: [(1, mate), (1, wasser)],
suse: [(1, mate), (1, sterni), (2, krosti), (4, radler)],
lilly_simon: [(1, mate), (2, radler), (7, wasser)],
kevin: [(1, mate), (1, radler)],
rebecca: [(1, radler)],
resi_simon: [(8, sterni), (1, radler), (1, wasser)],
},
)
consumption(day=3, for_free=True, drink_dict={
thure: [(1, mate), (4, sterni), (5, radler), (3, wasser)],
seth_family: [(1, mate), (2, sterni), (12, krosti), (1, wasser)],
andrew: [(3, sterni), (2, krosti), (3, radler), (1, wasser)],
robin: [(1, mate), (4, krosti), (2, radler)],
melokomplott: [(5, mate), (13, sterni), (1, krosti), (1, radler)],
residudes: [(2, mate), (1, sterni), (15, krosti), (7, radler), (1, wasser)],
})
consumption(
day=3,
for_free=True,
drink_dict={
thure: [(1, mate), (4, sterni), (5, radler), (3, wasser)],
seth_family: [(1, mate), (2, sterni), (12, krosti), (1, wasser)],
andrew: [(3, sterni), (2, krosti), (3, radler), (1, wasser)],
robin: [(1, mate), (4, krosti), (2, radler)],
melokomplott: [(5, mate), (13, sterni), (1, krosti), (1, radler)],
residudes: [(2, mate), (1, sterni), (15, krosti), (7, radler), (1, wasser)],
},
)
# --------------- ADMIN STUFF ---------------
+94 -76
View File
@@ -35,16 +35,14 @@ def payment(purpose, day, month, amount):
def consumption(day: int, for_free: bool, drink_dict: Dict[User, List[Tuple[int, Drink]]]):
for user, drink_list in drink_dict.items():
for amount, drink in drink_list:
Consumption.objects.create(
user=user, drink=drink, amount=amount, day=day, for_free=for_free)
Consumption.objects.create(user=user, drink=drink, amount=amount, day=day, for_free=for_free)
class Command(BaseCommand):
@transaction.atomic()
def handle(self, *args, **options):
if any(model.objects.exists() for model in [Donation, Payment, Drink, Consumption]):
raise CommandError(
"clear all donation, payment, drink and consumption objects before running this command")
raise CommandError("clear all donation, payment, drink and consumption objects before running this command")
# --------------- PEOPLE ---------------
@@ -232,86 +230,106 @@ class Command(BaseCommand):
# --------------- THURSDAY ---------------
consumption(day=1, for_free=False, drink_dict={
enni: [(2, wasser), (9, sterni)],
robert: [(2, wasser), (2, freiberger), (1, spezi), (2, mate)],
josi: [(5, sterni), (1, radler)],
tobi: [(5, sterni), (1, freiberger), (2, mate)],
annemarie: [(1, wasser), (4, sterni), (1, radler)],
sandra: [(1, wasser), (3, sterni), (1, spezi), (1, mate)],
flo: [(2, wasser), (5, sterni), (1, mate), (1, helles)],
})
consumption(
day=1,
for_free=False,
drink_dict={
enni: [(2, wasser), (9, sterni)],
robert: [(2, wasser), (2, freiberger), (1, spezi), (2, mate)],
josi: [(5, sterni), (1, radler)],
tobi: [(5, sterni), (1, freiberger), (2, mate)],
annemarie: [(1, wasser), (4, sterni), (1, radler)],
sandra: [(1, wasser), (3, sterni), (1, spezi), (1, mate)],
flo: [(2, wasser), (5, sterni), (1, mate), (1, helles)],
},
)
# --------------- FRIDAY ---------------
consumption(day=2, for_free=False, drink_dict={
tobi: [(2, wasser), (9, sterni), (2, freiberger)],
annemarie: [(1, wasser), (5, sterni), (2, mate), (2, radler), (2, buddi), (3, sekt)],
sandra: [(1, freiberger), (1, buddi), (1, spezi), (2, mate), (1, radler), (2, sekt)],
robert: [(2, wasser), (1, freiberger), (1, buddi), (1, spezi)],
josi: [(2, wasser), (6, sterni), (1, freiberger), (2, radler)],
enni: [(2, wasser), (10, sterni), (1, spezi)],
steven: [(1, sterni), (1, krosti), (1, radler), (5, helles)],
marten: [(9, krosti)],
thure: [(4, sterni)],
jona: [(2, freiberger), (10, krosti)],
benni: [(5, krosti), (1, helles)],
katha: [(1, krosti), (1, mate)],
diana: [(5, sterni), (1, radler)],
katz: [(3, krosti), (1, buddi)],
alexius: [(8, sterni)],
pauline: [(5, sterni), (1, radler)],
herald: [(1, wasser), (2, sterni), (1, freiberger)],
arthur: [(6, sterni), (1, radler)],
matze: [(1, sterni), (1, freiberger)],
dennis: [(1, sterni), (2, krosti)],
marvin: [(3, sterni), (1, krosti), (1, mate)],
simon: [(1, sterni)],
})
consumption(
day=2,
for_free=False,
drink_dict={
tobi: [(2, wasser), (9, sterni), (2, freiberger)],
annemarie: [(1, wasser), (5, sterni), (2, mate), (2, radler), (2, buddi), (3, sekt)],
sandra: [(1, freiberger), (1, buddi), (1, spezi), (2, mate), (1, radler), (2, sekt)],
robert: [(2, wasser), (1, freiberger), (1, buddi), (1, spezi)],
josi: [(2, wasser), (6, sterni), (1, freiberger), (2, radler)],
enni: [(2, wasser), (10, sterni), (1, spezi)],
steven: [(1, sterni), (1, krosti), (1, radler), (5, helles)],
marten: [(9, krosti)],
thure: [(4, sterni)],
jona: [(2, freiberger), (10, krosti)],
benni: [(5, krosti), (1, helles)],
katha: [(1, krosti), (1, mate)],
diana: [(5, sterni), (1, radler)],
katz: [(3, krosti), (1, buddi)],
alexius: [(8, sterni)],
pauline: [(5, sterni), (1, radler)],
herald: [(1, wasser), (2, sterni), (1, freiberger)],
arthur: [(6, sterni), (1, radler)],
matze: [(1, sterni), (1, freiberger)],
dennis: [(1, sterni), (2, krosti)],
marvin: [(3, sterni), (1, krosti), (1, mate)],
simon: [(1, sterni)],
},
)
consumption(day=2, for_free=True, drink_dict={
flo: [(2, wasser), (3, sterni), (1, freiberger), (3, helles)],
casi: [(6, sterni)],
sepp: [(6, sterni)],
ohli: [(4, sterni)],
marius: [(1, radler)],
anonym: [(10, sterni), (10, krosti), (2, radler), (4, helles), (1, sekt)]
})
consumption(
day=2,
for_free=True,
drink_dict={
flo: [(2, wasser), (3, sterni), (1, freiberger), (3, helles)],
casi: [(6, sterni)],
sepp: [(6, sterni)],
ohli: [(4, sterni)],
marius: [(1, radler)],
anonym: [(10, sterni), (10, krosti), (2, radler), (4, helles), (1, sekt)],
},
)
# --------------- SATURDAY ---------------
consumption(day=3, for_free=False, drink_dict={
herald: [(1, sterni), (2, freiberger), (2, radler), (1, buddi), (5, spezi), (2, wasser)],
thure: [(6, sterni), (1, krosti), (1, radler), (2, spezi)],
sandra: [(6, sterni), (1, freiberger), (2, radler), (1, mate), (1, cola), (1, sekt)],
marvin: [(1, sterni), (1, mate)],
simon: [(10, sterni), (1, radler), (1, mate)],
jona: [(6, sterni), (4, krosti)],
robert: [(1, sterni), (1, freiberger), (1, buddi), (2, mate), (2, spezi), (3, wasser)],
steven: [(5, helles), (1, sterni), (2, radler), (1, mate)],
flo: [(4, helles), (1, freiberger), (1, buddi), (2, mate)],
matze: [(4, sterni), (2, radler), (3, buddi), (7, spezi)],
alexius: [(2, helles), (3, sterni), (1, radler), (1, cola)],
josi: [(5, sterni), (1, radler), (2, mate), (2, wasser), (1, sekt)],
benni: [(1, helles), (2, krosti), (2, radler), (1, wasser)],
ohli: [(1, helles), (3, sterni), (2, krosti), (1, radler), (1, buddi), (1, mate)],
arthur: [(3, sterni), (1, krosti), (1, radler), (1, mate), (3, spezi), (2, sekt)],
pauline: [(2, sterni), (2, radler), (1, mate), (1, cola)],
enni: [(9, sterni), (1, spezi), (2, wasser), (1, sekt)],
annemarie: [(5, sterni), (4, radler), (2, buddi), (1, mate), (1, wasser), (2, sekt)],
tobi: [(3, sterni), (1, radler), (1, mate), (1, wasser)],
marten: [(4, helles), (1, krosti)],
lukas: [(4, sterni), (1, spezi)],
lilly: [(5, sterni), (1, mate)],
andrea: [(1, buddi)],
lena: [(1, sterni)],
anonym: [(2, helles), (3, sterni), (5, krosti), (2, radler), (1, cola), (2, sekt)]
})
consumption(
day=3,
for_free=False,
drink_dict={
herald: [(1, sterni), (2, freiberger), (2, radler), (1, buddi), (5, spezi), (2, wasser)],
thure: [(6, sterni), (1, krosti), (1, radler), (2, spezi)],
sandra: [(6, sterni), (1, freiberger), (2, radler), (1, mate), (1, cola), (1, sekt)],
marvin: [(1, sterni), (1, mate)],
simon: [(10, sterni), (1, radler), (1, mate)],
jona: [(6, sterni), (4, krosti)],
robert: [(1, sterni), (1, freiberger), (1, buddi), (2, mate), (2, spezi), (3, wasser)],
steven: [(5, helles), (1, sterni), (2, radler), (1, mate)],
flo: [(4, helles), (1, freiberger), (1, buddi), (2, mate)],
matze: [(4, sterni), (2, radler), (3, buddi), (7, spezi)],
alexius: [(2, helles), (3, sterni), (1, radler), (1, cola)],
josi: [(5, sterni), (1, radler), (2, mate), (2, wasser), (1, sekt)],
benni: [(1, helles), (2, krosti), (2, radler), (1, wasser)],
ohli: [(1, helles), (3, sterni), (2, krosti), (1, radler), (1, buddi), (1, mate)],
arthur: [(3, sterni), (1, krosti), (1, radler), (1, mate), (3, spezi), (2, sekt)],
pauline: [(2, sterni), (2, radler), (1, mate), (1, cola)],
enni: [(9, sterni), (1, spezi), (2, wasser), (1, sekt)],
annemarie: [(5, sterni), (4, radler), (2, buddi), (1, mate), (1, wasser), (2, sekt)],
tobi: [(3, sterni), (1, radler), (1, mate), (1, wasser)],
marten: [(4, helles), (1, krosti)],
lukas: [(4, sterni), (1, spezi)],
lilly: [(5, sterni), (1, mate)],
andrea: [(1, buddi)],
lena: [(1, sterni)],
anonym: [(2, helles), (3, sterni), (5, krosti), (2, radler), (1, cola), (2, sekt)],
},
)
consumption(day=3, for_free=True, drink_dict={
rockbert: [(8, krosti), (1, radler), (1, mate)],
anonym: [(8, sterni), (2, krosti), (2, mate), (1, cola)]
})
consumption(
day=3,
for_free=True,
drink_dict={
rockbert: [(8, krosti), (1, radler), (1, mate)],
anonym: [(8, sterni), (2, krosti), (2, mate), (1, cola)],
},
)
# --------------- ADMIN STUFF ---------------
+1 -1
View File
@@ -20,4 +20,4 @@ class Command(BaseCommand):
name = id_to_name[drink_dict["drink_id"]]
amount = drink_dict["amount"]
drink_list.append(f"{amount}x {name}")
print(f"{user.username.capitalize()}: {euro(to_pay)} ({", ".join(drink_list)})")
print(f"{user.username.capitalize()}: {euro(to_pay)} ({', '.join(drink_list)})")