Skip to content

Creating Dump Issues #848

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
Didayolo merged 4 commits into from
May 11, 2023
Merged

Creating Dump Issues #848

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
7fa7333
dump creation date fixed
May 8, 2023
55950bb
by default files will be downloaded instead of just keys used in yaml…
May 11, 2023
7c7916d
date-time converted to readbale format
May 11, 2023
a649e98
console log removed
May 11, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 5 additions & 1 deletion src/apps/api/views/competitions.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -358,7 +358,11 @@ def create_dump(self, request, pk=None):
competition = self.get_object()
if not competition.user_has_admin_permission(request.user):
raise PermissionDenied("You don't have access")
create_competition_dump.delay(pk)

# arg 1: pk: competition primary key
# arg 2: False: keys_instead_of_files (if false: files will be dowloaded in dumps, if true: only keys)
create_competition_dump.delay(pk, False)

serializer = CompetitionCreationTaskStatusSerializer({"status": "Success. Competition dump is being created."})
return Response(serializer.data, status=201)

Expand Down
10 changes: 6 additions & 4 deletions src/apps/competitions/tasks.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,8 @@
import re
import traceback
import zipfile
from datetime import timedelta
from datetime import timedelta, datetime

from io import BytesIO
from tempfile import TemporaryDirectory, NamedTemporaryFile

Expand Down Expand Up @@ -423,15 +424,16 @@ def _get_error_string(error_dict):


@app.task(queue='site-worker', soft_time_limit=60 * 10)
def create_competition_dump(competition_pk, keys_instead_of_files=True):
def create_competition_dump(competition_pk, keys_instead_of_files=False):
yaml_data = {"version": "2"}
try:
# -------- SetUp -------

logger.info(f"Finding competition {competition_pk}")
comp = Competition.objects.get(pk=competition_pk)
zip_buffer = BytesIO()
zip_name = f"{comp.title}-{comp.created_when.isoformat()}.zip"
current_date_time = datetime.today().strftime('%Y-%m-%d %H:%M:%S')
zip_name = f"{comp.title}-{current_date_time}.zip"
zip_file = zipfile.ZipFile(zip_buffer, "w")

# -------- Main Competition Details -------
Expand Down Expand Up @@ -626,7 +628,7 @@ def create_competition_dump(competition_pk, keys_instead_of_files=True):
bundle_count = CompetitionDump.objects.count() + 1
temp_dataset_bundle = Data.objects.create(
created_by=comp.created_by,
name=f"{comp.title} Dump #{bundle_count} Created {comp.created_when.date()}",
name=f"{comp.title} Dump #{bundle_count} Created {current_date_time}",
type='competition_bundle',
description='Automatically created competition dump',
# 'data_file'=,
Expand Down