Add AttackDefTeam #69
Open
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
KreativeThinker
requested changes
Feb 20, 2025
Comment on lines
+86
to
+93
| @router.get("/round2/list") | ||
| async def ctf_list(jwt: RequireJwt): | ||
| team_id = jwt["team_id"] | ||
| attack_def_team = await AttackDefTeam.get(team_id=team_id) | ||
| if (attack_def_team is None): | ||
| return {"msg_code": config.msg_codes["attack_def_team_not_found"]} | ||
| problems = await Problem_Pydantic.from_queryset(Problem.filter(attackdefproblem__attack_def_team__id=attack_def_team.id)) | ||
| return await calculate_problem_points(problems, team_id) |
There was a problem hiding this comment.
This does not fetch the CTFs for all teams. It only fetches the CTFs assigned to the team calling this endpoint.
There was a problem hiding this comment.
Added a separate path /round2/list_all to return all problems. From this endpoint, we do not calculate actual points based on hints used.
Is this what you wanted?
src/pwncore/config.py
Outdated
Comment on lines
82
to
98
| powerups={ | ||
| PowerUpType.UPGRADE: { | ||
| "cost": 100, | ||
| }, | ||
| PowerUpType.SHIELD: { | ||
| "duration": timedelta(seconds=10), | ||
| "cost": 200, | ||
| }, | ||
| PowerUpType.POINT_SIPHON: { | ||
| "duration": timedelta(seconds=15), | ||
| "cost": 150, | ||
| }, | ||
| PowerUpType.SABOTAGE: { | ||
| "duration": timedelta(seconds=5), | ||
| "cost": 500, | ||
| }, | ||
| } |
There was a problem hiding this comment.
Convert to a dataclass and have add field count as max number of uses. Validate to ensure maximum uses is not exceeded when consuming the powerup
There was a problem hiding this comment.
Converted to dataclass, however I did not write logic for using power-ups yet.
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Added new model with two new routes under '/ctf/round2/list' and '/team/round2/powerups' to list a team's ctfs and used powerups respectively.
Also added test rows in admin init for new models.
Fixes: #52