staxriver
/
padelclub_backend
2
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge branch 'main' of https://gitea.staxriver.com/staxriver/padelclub_backend into main

Browse Source
bracket-feature
laurent 11 months ago
parent 3bb78f4077 45e97d28c8
commit af9618492d
6 changed files with 92310 additions and 0 deletions
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Show Stats Download Patch File Download Diff File
  1. 5
      tournaments/models/tournament.py
  2. 12195
      tournaments/static/rankings/CLASSEMENT-PADEL-DAMES-12-2024.csv
  3. 80000
      tournaments/static/rankings/CLASSEMENT-PADEL-MESSIEURS-12-2024.csv
  4. 16
      tournaments/templates/tournaments/admin/tournament_cleaner.html
  5. 1
      tournaments/urls.py
  6. 93
      tournaments/views.py

5
tournaments/models/tournament.py
Unescape View File

@ -606,6 +606,7 @@ class Tournament(models.Model):
matches.extend(first_round.get_matches_recursive(True)) matches.extend(first_round.get_matches_recursive(True))
else: else:
current_round = self.round_to_show() current_round = self.round_to_show()
print(f'current_round = {current_round.index}')
if current_round: if current_round:
all_upper_matches_are_over = current_round.all_matches_are_over() all_upper_matches_are_over = current_round.all_matches_are_over()
if all_upper_matches_are_over is False: if all_upper_matches_are_over is False:
@ -614,16 +615,20 @@ class Tournament(models.Model):
# Add full matches from the next rounds # Add full matches from the next rounds
next_round = self.round_for_index(current_round.index - 1) next_round = self.round_for_index(current_round.index - 1)
if next_round: if next_round:
print('next round')
matches.extend(next_round.get_matches_recursive(True)) matches.extend(next_round.get_matches_recursive(True))
if all_upper_matches_are_over is True: if all_upper_matches_are_over is True:
print('all_upper_matches_are_over')
matches.extend(current_round.get_matches_recursive(True)) matches.extend(current_round.get_matches_recursive(True))
# Add matches from the previous round or group_stages # Add matches from the previous round or group_stages
previous_round = self.round_for_index(current_round.index + 1) previous_round = self.round_for_index(current_round.index + 1)
if previous_round: if previous_round:
print('previous_round')
matches.extend(previous_round.get_matches_recursive(True)) matches.extend(previous_round.get_matches_recursive(True))
else: else:
print('group_stages')
group_stages = [gs.live_group_stages() for gs in self.last_group_stage_step()] group_stages = [gs.live_group_stages() for gs in self.last_group_stage_step()]
return matches, group_stages return matches, group_stages

12195
tournaments/static/rankings/CLASSEMENT-PADEL-DAMES-12-2024.csv
View File

File diff suppressed because it is too large Load Diff

80000
tournaments/static/rankings/CLASSEMENT-PADEL-MESSIEURS-12-2024.csv
View File

File diff suppressed because it is too large Load Diff

16
tournaments/templates/tournaments/admin/tournament_cleaner.html
Unescape View File

@ -0,0 +1,16 @@
<!-- templates/admin_import.html -->
<!DOCTYPE html>
<html>
<head>
<title>Tournament Import</title>
</head>
<body>
<form method="POST" enctype="multipart/form-data">
{% csrf_token %}
<div class="upload-zone">
<input type="file" name="tournament_zip" accept=".zip">
</div>
<button type="submit">Process Import</button>
</form>
</body>
</html>

1
tournaments/urls.py
Unescape View File

@ -38,4 +38,5 @@ urlpatterns = [
path('terms-of-use/', views.terms_of_use, name='terms-of-use'), path('terms-of-use/', views.terms_of_use, name='terms-of-use'),
path('utils/xls-to-csv/', views.xls_to_csv, name='xls-to-csv'), path('utils/xls-to-csv/', views.xls_to_csv, name='xls-to-csv'),
path('mail-test/', views.simple_form_view, name='mail-test'), path('mail-test/', views.simple_form_view, name='mail-test'),
path('admin/tournament-import/', views.tournament_import_view, name='tournament_import'),
] ]

93
tournaments/views.py
Unescape View File

@ -5,6 +5,7 @@ from django.utils.http import urlsafe_base64_encode, urlsafe_base64_decode
from django.urls import reverse from django.urls import reverse
from django.views.decorators.csrf import csrf_exempt from django.views.decorators.csrf import csrf_exempt
from django.contrib.admin.views.decorators import staff_member_required
from django.core.files.storage import default_storage from django.core.files.storage import default_storage
from django.core.files.base import ContentFile from django.core.files.base import ContentFile
@ -22,6 +23,7 @@ from django.db.models import Q
import json import json
import asyncio import asyncio
import csv import csv
import zipfile
from api.tokens import account_activation_token from api.tokens import account_activation_token
@ -483,3 +485,94 @@ def send_email(mail, name):
email = EmailMessage(subject, body, to=[mail]) email = EmailMessage(subject, body, to=[mail])
email.send() email.send()
from api.serializers import GroupStageSerializer, MatchSerializer, PlayerRegistrationSerializer, RoundSerializer, TeamRegistrationSerializer, TeamScoreSerializer
@staff_member_required
def tournament_import_view(request):
if request.method == 'POST':
zip_file = request.FILES.get('tournament_zip')
if zip_file:
try:
tournament_id = os.path.splitext(zip_file.name)[0]
tournament = Tournament.objects.get(id=tournament_id)
# Delete existing relationships
tournament.round_set.all().delete()
tournament.groupstage_set.all().delete()
tournament.teamregistration_set.all().delete()
with zipfile.ZipFile(zip_file) as z:
# First, process rounds
rounds_data = get_file_data(z, f"{tournament_id}/rounds.json")
if rounds_data:
# First pass: Create rounds without parent relationships
rounds_without_parent = []
for item in rounds_data:
item['tournament'] = tournament.id
# Temporarily remove parent field
parent = item.pop('parent', None)
rounds_without_parent.append({'data': item, 'parent': parent})
serializer = RoundSerializer(data=[item['data'] for item in rounds_without_parent], many=True)
serializer.is_valid(raise_exception=True)
created_rounds = serializer.save()
# Create a mapping of round IDs
round_mapping = {round_obj.id: round_obj for round_obj in created_rounds}
# Second pass: Update parent relationships
for round_obj, original_data in zip(created_rounds, rounds_without_parent):
if original_data['parent']:
round_obj.parent = round_mapping.get(original_data['parent'])
round_obj.save()
# Then process all other files
serializer_mapping = {
'group-stages.json': GroupStageSerializer,
'team-registrations.json': TeamRegistrationSerializer,
'matches.json': MatchSerializer,
'player-registrations.json': PlayerRegistrationSerializer,
'team-scores.json': TeamScoreSerializer
}
# Process each remaining file
for filename, serializer_class in serializer_mapping.items():
process_file(z, filename, tournament_id, tournament, serializer_class)
return JsonResponse({'status': 'success'})
except Exception as e:
return JsonResponse({'status': 'error', 'message': str(e)})
else:
return render(request, 'tournaments/admin/tournament_cleaner.html')
def process_file(zip_file, filename, tournament_id, tournament, serializer_class):
"""Helper function to process individual files"""
try:
file_path = f"{tournament_id}/{filename}"
json_data = get_file_data(zip_file, file_path)
if json_data:
# Add tournament to each item
for item in json_data:
item['tournament'] = tournament.id
serializer = serializer_class(data=json_data, many=True)
serializer.is_valid(raise_exception=True)
serializer.save()
except Exception as e:
print(f"Error processing {filename}: {str(e)}")
def get_file_data(zip_file, file_path):
"""Helper function to read and parse JSON data from zip file"""
try:
file_content = zip_file.read(file_path)
return json.loads(file_content)
except KeyError:
print(f"File not found: {file_path}")
return None
except json.JSONDecodeError as e:
print(f"JSON Error for {file_path}: {str(e)}")
raise Exception(f"Invalid JSON in file {file_path}")

Write Preview
Loading…
Cancel
Save