Allow uploadId to be skipped if file is provided

Author: CarsonF

src/components/file/dto/upload.dto.ts

@@ -23,9 +23,13 @@ export abstract class RequestUploadOutput {
 @InputType()
 export abstract class CreateDefinedFileVersionInput {
   @IdField({
-    description: 'The ID returned from the `requestFileUpload` mutation',
+    description: stripIndent`
+      The ID returned from the \`requestFileUpload\` mutation.
+      This _can_ be skipped if \`file\` is provided.
+    `,
+    nullable: true,
   })
-  readonly uploadId: ID;
+  readonly uploadId?: ID;
 
   @Field(() => UploadScalar, {
     description: stripIndent`

src/components/file/file.service.ts

@@ -262,10 +262,15 @@ export class FileService {
     const {
       parentId,
       file: uploadingFile,
-      uploadId,
+      uploadId: uploadIdInput,
       mimeType: mimeTypeOverride,
       media,
     } = input;
+    if (!uploadIdInput && !uploadingFile) {
+      throw new InputException('Upload ID is required', 'uploadId');
+    }
+
+    const uploadId = uploadIdInput ?? (await generateId());
 
     const parentType = await this.validateParentNode(
       parentId,
@@ -274,12 +279,14 @@ export class FileService {
     );
 
     if (uploadingFile) {
-      const prevExists = await this.bucket.headObject(uploadId).catch((e) => {
-        if (e instanceof NotFoundException) {
-          return false;
-        }
-        throw e;
-      });
+      const prevExists = uploadIdInput
+        ? await this.bucket.headObject(uploadId).catch((e) => {
+            if (e instanceof NotFoundException) {
+              return false;
+            }
+            throw e;
+          })
+        : false;
       if (prevExists) {
         throw new InputException(
           'A file with this ID already exists. Request an new upload ID.',