Skip to content
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.

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

ENH make event approval more robust to concurrent approval #593

Open
wants to merge 2 commits into
base: master
Choose a base branch
from
Open
Changes from all commits
Commits
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
25 changes: 16 additions & 9 deletions ramp-database/ramp_database/tools/team.py
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,7 @@
from ..model import EventTeam

from .submission import add_submission
from .submission import DuplicateSubmissionError

from ._query import select_event_by_name
from ._query import select_event_team_by_name
Expand Down Expand Up @@ -64,16 +65,22 @@
path_sandbox_submission = os.path.join(
event.problem.path_ramp_kit, "submissions", event.ramp_sandbox_name
)
submission_name = event.ramp_sandbox_name
submission = add_submission(
session,
event_name,
team_name,
submission_name,
path_sandbox_submission,
)
sandbox_name = event.ramp_sandbox_name
try:
sanbox = add_submission(
session,
event_name,
team_name,
sandbox_name,
path_sandbox_submission,
)
except DuplicateSubmissionError:
logger.info(

Check warning on line 78 in ramp-database/ramp_database/tools/team.py

View check run for this annotation

Codecov / codecov/patch

ramp-database/ramp_database/tools/team.py#L77-L78

Added lines #L77 - L78 were not covered by tests
"Sanbox submission already exists. "
"This probably due to concurrent approval, skipping."
)
logger.info("Copying the submission files into the deployment folder")
logger.info("Adding {}".format(submission))
logger.info("Adding {}".format(sanbox))
event_team.approved = True
session.commit()

Expand Down
Loading