From 5599e25fc9771feb7e4a1ed9dd6e65b7da6d22f9 Mon Sep 17 00:00:00 2001 From: Kevin Chung Date: Mon, 22 Nov 2021 23:28:58 -0500 Subject: [PATCH] Add nested UserSchema and TeamSchema to SubmissionSchema (#2030) * Add nested UserSchema and TeamSchema to SubmissionSchema to allow easier access to a user/team name without issuing another query/API call * Closes #2005 --- CTFd/schemas/submissions.py | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/CTFd/schemas/submissions.py b/CTFd/schemas/submissions.py index 22b3dad3..8b439f04 100644 --- a/CTFd/schemas/submissions.py +++ b/CTFd/schemas/submissions.py @@ -2,11 +2,15 @@ from marshmallow import fields from CTFd.models import Submissions, ma from CTFd.schemas.challenges import ChallengeSchema +from CTFd.schemas.teams import TeamSchema +from CTFd.schemas.users import UserSchema from CTFd.utils import string_types class SubmissionSchema(ma.ModelSchema): - challenge = fields.Nested(ChallengeSchema, only=["name", "category", "value"]) + challenge = fields.Nested(ChallengeSchema, only=["id", "name", "category", "value"]) + user = fields.Nested(UserSchema, only=["id", "name"]) + team = fields.Nested(TeamSchema, only=["id", "name"]) class Meta: model = Submissions