fix nits!

working team avatar uploads

backend/siarnaq/api/teams/views.py

@@ -159,7 +159,17 @@ def join(self, request, pk=None, *, episode_id):
         logger.debug("team_join", message="User has joined team.", team=team.pk)
         return Response(None, status=status.HTTP_204_NO_CONTENT)
 
-    @extend_schema(responses={status.HTTP_204_NO_CONTENT: None})
+    @extend_schema(
+        responses={status.HTTP_204_NO_CONTENT: None},
+        request={
+            "multipart/form-data": {
+                "type": "object",
+                "properties": {
+                    "avatar": {"type": "string", "format": "binary"},
+                },
+            }
+        },
+    )
     @action(
         detail=False,
         methods=["post"],

frontend2/schema.yml

@@ -158,7 +158,7 @@ paths:
           type: array
           items:
             type: integer
-        description: A list of teams to filter for. Defaults to just your own team.
+        description: A list of teams to filter for. Defaults to your own team.
       tags:
       - compete
       security:
@@ -1290,16 +1290,13 @@ paths:
       - team
       requestBody:
         content:
-          application/json:
-            schema:
-              $ref: '#/components/schemas/TeamAvatarRequest'
-          application/x-www-form-urlencoded:
-            schema:
-              $ref: '#/components/schemas/TeamAvatarRequest'
           multipart/form-data:
             schema:
-              $ref: '#/components/schemas/TeamAvatarRequest'
-        required: true
+              type: object
+              properties:
+                avatar:
+                  type: string
+                  format: binary
       security:
       - jwtAuth: []
       responses:
@@ -2749,15 +2746,6 @@ components:
           type: boolean
       required:
       - invocation
-    TeamAvatarRequest:
-      type: object
-      properties:
-        avatar:
-          type: string
-          format: binary
-          writeOnly: true
-      required:
-      - avatar
     TeamCreate:
       type: object
       properties:

frontend2/src/api/_autogen/.openapi-generator/FILES

@@ -48,7 +48,6 @@ models/StyleEnum.ts
 models/Submission.ts
 models/SubmissionDownload.ts
 models/SubmissionReportRequest.ts
-models/TeamAvatarRequest.ts
 models/TeamCreate.ts
 models/TeamCreateRequest.ts
 models/TeamJoinRequest.ts

frontend2/src/api/_autogen/apis/TeamApi.ts

@@ -19,7 +19,6 @@ import type {
   PaginatedClassRequirementList,
   PaginatedTeamPublicList,
   PatchedTeamPrivateRequest,
-  TeamAvatarRequest,
   TeamCreate,
   TeamCreateRequest,
   TeamJoinRequest,
@@ -38,8 +37,6 @@ import {
     PaginatedTeamPublicListToJSON,
     PatchedTeamPrivateRequestFromJSON,
     PatchedTeamPrivateRequestToJSON,
-    TeamAvatarRequestFromJSON,
-    TeamAvatarRequestToJSON,
     TeamCreateFromJSON,
     TeamCreateToJSON,
     TeamCreateRequestFromJSON,
@@ -89,7 +86,7 @@ export interface TeamRequirementRetrieveRequest {
 
 export interface TeamTAvatarCreateRequest {
     episodeId: string;
-    teamAvatarRequest: TeamAvatarRequest;
+    avatar?: Blob;
 }
 
 export interface TeamTCreateRequest {
@@ -394,16 +391,10 @@ export class TeamApi extends runtime.BaseAPI {
             throw new runtime.RequiredError('episodeId','Required parameter requestParameters.episodeId was null or undefined when calling teamTAvatarCreate.');
         }
 
-        if (requestParameters.teamAvatarRequest === null || requestParameters.teamAvatarRequest === undefined) {
-            throw new runtime.RequiredError('teamAvatarRequest','Required parameter requestParameters.teamAvatarRequest was null or undefined when calling teamTAvatarCreate.');
-        }
-
         const queryParameters: any = {};
 
         const headerParameters: runtime.HTTPHeaders = {};
 
-        headerParameters['Content-Type'] = 'application/json';
-
         if (this.configuration && this.configuration.accessToken) {
             const token = this.configuration.accessToken;
             const tokenString = await token("jwtAuth", []);
@@ -412,12 +403,32 @@ export class TeamApi extends runtime.BaseAPI {
                 headerParameters["Authorization"] = `Bearer ${tokenString}`;
             }
         }
+        const consumes: runtime.Consume[] = [
+            { contentType: 'multipart/form-data' },
+        ];
+        // @ts-ignore: canConsumeForm may be unused
+        const canConsumeForm = runtime.canConsumeForm(consumes);
+
+        let formParams: { append(param: string, value: any): any };
+        let useForm = false;
+        // use FormData to transmit files using content-type "multipart/form-data"
+        useForm = canConsumeForm;
+        if (useForm) {
+            formParams = new FormData();
+        } else {
+            formParams = new URLSearchParams();
+        }
+
+        if (requestParameters.avatar !== undefined) {
+            formParams.append('avatar', requestParameters.avatar as any);
+        }
+
         const response = await this.request({
             path: `/api/team/{episode_id}/t/avatar/`.replace(`{${"episode_id"}}`, encodeURIComponent(String(requestParameters.episodeId))),
             method: 'POST',
             headers: headerParameters,
             query: queryParameters,
-            body: TeamAvatarRequestToJSON(requestParameters.teamAvatarRequest),
+            body: formParams,
         }, initOverrides);
 
         return new runtime.VoidApiResponse(response);

frontend2/src/api/_autogen/models/UserProfilePrivateRequest.ts

@@ -90,7 +90,7 @@ export function UserProfilePrivateRequestFromJSONTyped(json: any, ignoreDiscrimi
         return json;
     }
     return {
-
+        
         'gender': GenderEnumFromJSON(json['gender']),
         'gender_details': !exists(json, 'gender_details') ? undefined : json['gender_details'],
         'school': !exists(json, 'school') ? undefined : json['school'],
@@ -108,7 +108,7 @@ export function UserProfilePrivateRequestToJSON(value?: UserProfilePrivateReques
         return null;
     }
     return {
-
+        
         'gender': GenderEnumToJSON(value.gender),
         'gender_details': value.gender_details,
         'school': value.school,

frontend2/src/api/_autogen/models/index.ts

@@ -41,7 +41,6 @@ export * from './StyleEnum';
 export * from './Submission';
 export * from './SubmissionDownload';
 export * from './SubmissionReportRequest';
-export * from './TeamAvatarRequest';
 export * from './TeamCreate';
 export * from './TeamCreateRequest';
 export * from './TeamJoinRequest';

frontend2/src/api/compete/competeKeys.ts

@@ -147,6 +147,9 @@ export const competeMutationKeys = {
   uploadSub: ({ episodeId }: { episodeId: string }) =>
     ["compete", episodeId, "submit"] as const,
 
+  downloadSub: ({ episodeId }: { episodeId: string }) =>
+    ["compete", episodeId, "submit", "download"] as const,
+
   // --- SCRIMMAGES --- //
   requestScrim: ({ episodeId }: { episodeId: string }) =>
     ["compete", episodeId, "scrimmage", "request"] as const,

frontend2/src/api/compete/useCompete.ts

@@ -541,11 +541,18 @@ export const useCancelScrimmage = (
 /**
  * For downloading a submission.
  */
-export const useDownloadSubmission = (
-  { episodeId }: { episodeId: string },
-): UseMutationResult<void, Error, CompeteSubmissionDownloadRetrieveRequest, unknown> =>
+export const useDownloadSubmission = ({
+  episodeId,
+}: {
+  episodeId: string;
+}): UseMutationResult<
+  void,
+  Error,
+  CompeteSubmissionDownloadRetrieveRequest,
+  unknown
+> =>
   useMutation({
-    mutationKey: competeMutationKeys.acceptScrim({ episodeId }),
+    mutationKey: competeMutationKeys.downloadSub({ episodeId }),
     mutationFn: async ({
       episodeId,
       id,

frontend2/src/api/team/teamApi.ts

@@ -151,13 +151,10 @@ export const searchTeams = async ({
 /**
  * Upload a new avatar for the currently logged in user's team.
  * @param episodeId The current episode's ID.
- * @param avatar The avatar file.
+ * @param teamAvatarRequest The avatar file.
  */
-export const teamAvatarUpload = async ({
-  episodeId,
-  teamAvatarRequest,
-}: TeamTAvatarCreateRequest): Promise<void> => {
-  await API.teamTAvatarCreate({ episodeId, teamAvatarRequest });
+export const teamAvatarUpload = async (teamAvatarRequest: TeamTAvatarCreateRequest): Promise<void> => {
+  await API.teamTAvatarCreate(teamAvatarRequest);
 };
 
 /**

frontend2/src/api/team/teamKeys.ts

@@ -59,7 +59,7 @@ export const teamMutationKeys = {
   update: ({ episodeId }: { episodeId: string }) =>
     ["team", "update", episodeId] as const,
 
-  avatar: ({ episodeId }: { episodeId: string }) =>
+  avatarUpload: ({ episodeId }: { episodeId: string }) =>
     ["team", "avatar", episodeId] as const,
 
   report: ({ episodeId }: { episodeId: string }) =>

frontend2/src/api/team/useTeam.ts

@@ -8,7 +8,7 @@ import {
 import type {
   PaginatedTeamPublicList,
   PatchedTeamPrivateRequest,
-  TeamAvatarRequest,
+  TeamTAvatarCreateRequest,
   TeamCreate,
   TeamJoinRequest,
   TeamPrivate,
@@ -198,11 +198,12 @@ export const useUpdateTeamAvatar = (
     episodeId: string;
   },
   queryClient: QueryClient,
-): UseMutationResult<void, Error, TeamAvatarRequest, unknown> =>
+): UseMutationResult<void, Error, Blob, unknown> =>
   useMutation({
-    mutationKey: teamMutationKeys.avatar({ episodeId }),
-    mutationFn: async (teamAvatarRequest: TeamAvatarRequest) => {
-      await toast.promise(teamAvatarUpload({ episodeId, teamAvatarRequest }), {
+    mutationKey: teamMutationKeys.avatarUpload({ episodeId }),
+    // We pass in a Blob because we already have the episodeId
+    mutationFn: async (avatar: Blob) => {
+      await toast.promise(teamAvatarUpload({ episodeId, avatar }), {
         loading: "Uploading team avatar...",
         success: "Uploaded team avatar!",
         error: "Error uploading team avatar.",

frontend2/src/api/user/useUser.ts

@@ -19,12 +19,12 @@ import type {
 } from "../_autogen";
 import { userMutationKeys, userQueryKeys } from "./userKeys";
 import {
-  avatarUpload,
   createUser,
   doResetPassword,
   resumeUpload,
   updateCurrentUser,
-  downloadResume
+  downloadResume,
+  userAvatarUpload,
 } from "./userApi";
 import { toast } from "react-hot-toast";
 import { login } from "../auth/authApi";
@@ -185,14 +185,14 @@ export const useResetPassword = ({
 /**
  * For uploading a new avatar for the currently logged in user.
  */
-export const useAvatarUpload = (
+export const useUpdateUserAvatar = (
   { episodeId }: { episodeId: string },
   queryClient: QueryClient,
 ): UseMutationResult<void, Error, UserUAvatarCreateRequest, unknown> =>
   useMutation({
     mutationKey: userMutationKeys.avatarUpload({ episodeId }),
     mutationFn: async (userAvatarRequest: UserUAvatarCreateRequest) => {
-      await toast.promise(avatarUpload(userAvatarRequest), {
+      await toast.promise(userAvatarUpload(userAvatarRequest), {
         loading: "Uploading new avatar...",
         success: "Uploaded new avatar!",
         error: "Error uploading new avatar.",
@@ -233,9 +233,11 @@ export const useResumeUpload = (
 /**
  * For downloading the resume of the currently logged in user.
  */
-export const useDownloadResume = (
-  { episodeId }: { episodeId: string },
-): UseMutationResult<void, Error, UserURetrieveRequest, unknown> =>
+export const useDownloadResume = ({
+  episodeId,
+}: {
+  episodeId: string;
+}): UseMutationResult<void, Error, UserURetrieveRequest, unknown> =>
   useMutation({
     mutationKey: userMutationKeys.resumeDownload({ episodeId }),
     mutationFn: async () => {

frontend2/src/api/user/userApi.ts

@@ -87,7 +87,7 @@ export const updateCurrentUser = async ({
  * Upload a new avatar for the currently logged in user.
  * @param userAvatarRequest The avatar file.
  */
-export const avatarUpload = async (
+export const userAvatarUpload = async (
   userAvatarRequest: UserUAvatarCreateRequest,
 ): Promise<void> => {
   await API.userUAvatarCreate(userAvatarRequest);

frontend2/src/components/tables/scrimmaging/TeamsTable.tsx

@@ -122,7 +122,7 @@ const TeamsTable: React.FC<TeamsTableProps> = ({
             header: "Team",
             key: "team",
             value: (team) => (
-              <NavLink to={`/team/${team.id}`} className="hover:underline">
+              <NavLink to={`/${episodeId}/team/${team.id}`} className="hover:underline">
                 {trimString(team.name, 13)}
               </NavLink>
             ),