Merge pull request 'Adds proper error return to stuff involving upload links' (#39) from mk/add-error-return-to-upload-links into master

Reviewed-on: #39
Reviewed-by: loewy <loewymalkov@gmail.com>

src/index.tsx

@@ -122,6 +122,7 @@ export type DeployedConfigGql = {
   devMode: Scalars["Boolean"]["output"];
   environment: Scalars["String"]["output"];
   firebase: Scalars["Boolean"]["output"];
+  minimumAllowedAppVersion: Scalars["String"]["output"];
 };
 
 export enum DeviceTypeEnum {
@@ -961,7 +962,7 @@ export type FilterInput =
       orFilters?: never;
       shotDirection?: never;
       spinType?: never;
-      tableSize: Scalars["Float"]["input"];
+      tableSize: RangeFilter;
       tags?: never;
       targetPocketDistance?: never;
       userId?: never;
@@ -1101,11 +1102,15 @@ export type GetShotsPagination = {
   startFrameAfter: Scalars["Int"]["input"];
 };
 
+export type GetUploadLinkErrors = {
+  __typename?: "GetUploadLinkErrors";
+  error: MustHaveSetForUploadLinkErrSegmentAlreadyUploadedErrProcessingFailedErrNoInitForChunkedUploadErrTooManyProfileImageUploadsErr;
+};
+
 export type GetUploadLinkReturn = {
   __typename?: "GetUploadLinkReturn";
-  headers: Array<Maybe<Header>>;
-  uploadCompletionCursor?: Maybe<Scalars["Int"]["output"]>;
-  uploadUrl: Scalars["String"]["output"];
+  stream?: Maybe<UploadStreamGql>;
+  value: UploadLinkGetUploadLinkErrors;
 };
 
 export type HlsPlaylistGql = {
@@ -1148,6 +1153,20 @@ export type MakePercentageIntervalGql = {
   makePercentage: Scalars["Float"]["output"];
 };
 
+export type MustHaveSetForUploadLinkErr = {
+  __typename?: "MustHaveSetForUploadLinkErr";
+  framesPerSecond?: Maybe<Scalars["Boolean"]["output"]>;
+  resolution?: Maybe<Scalars["Boolean"]["output"]>;
+};
+
+export type MustHaveSetForUploadLinkErrSegmentAlreadyUploadedErrProcessingFailedErrNoInitForChunkedUploadErrTooManyProfileImageUploadsErr =
+
+    | MustHaveSetForUploadLinkErr
+    | NoInitForChunkedUploadErr
+    | ProcessingFailedErr
+    | SegmentAlreadyUploadedErr
+    | TooManyProfileImageUploadsErr;
+
 export type Mutation = {
   __typename?: "Mutation";
   addAnnotationToShot: Scalars["Boolean"]["output"];
@@ -1213,6 +1232,11 @@ export type MutationSetSegmentDurationArgs = {
   videoId: Scalars["Int"]["input"];
 };
 
+export type NoInitForChunkedUploadErr = {
+  __typename?: "NoInitForChunkedUploadErr";
+  segmentType: StreamSegmentTypeEnum;
+};
+
 export type PageInfoGql = {
   __typename?: "PageInfoGQL";
   endCursor?: Maybe<Scalars["String"]["output"]>;
@@ -1242,6 +1266,11 @@ export type PocketingIntentionFeaturesGql = {
   targetPocketDistance?: Maybe<Scalars["Float"]["output"]>;
 };
 
+export type ProcessingFailedErr = {
+  __typename?: "ProcessingFailedErr";
+  processing: VideoProcessingGql;
+};
+
 export enum ProcessingStatusEnum {
   Created = "CREATED",
   Failed = "FAILED",
@@ -1326,9 +1355,17 @@ export type QueryWaitForArgs = {
 };
 
 export type RangeFilter = {
+  greaterThan?: InputMaybe<Scalars["Float"]["input"]>;
   greaterThanEqualTo?: InputMaybe<Scalars["Float"]["input"]>;
+  greaterThanInclusive?: Scalars["Boolean"]["input"];
   includeOnNone?: Scalars["Boolean"]["input"];
   lessThan?: InputMaybe<Scalars["Float"]["input"]>;
+  lessThanInclusive?: Scalars["Boolean"]["input"];
+};
+
+export type SegmentAlreadyUploadedErr = {
+  __typename?: "SegmentAlreadyUploadedErr";
+  segmentId: Scalars["Int"]["output"];
 };
 
 export type SerializedShotPathsGql = {
@@ -1404,6 +1441,19 @@ export type TargetMetricsGql = {
   makePercentage?: Maybe<Scalars["Float"]["output"]>;
 };
 
+export type TooManyProfileImageUploadsErr = {
+  __typename?: "TooManyProfileImageUploadsErr";
+  linksRequested: Scalars["Int"]["output"];
+};
+
+export type UploadLink = {
+  __typename?: "UploadLink";
+  headers: Array<Maybe<Header>>;
+  uploadUrl: Scalars["String"]["output"];
+};
+
+export type UploadLinkGetUploadLinkErrors = GetUploadLinkErrors | UploadLink;
+
 export type UploadSegmentGql = {
   __typename?: "UploadSegmentGQL";
   durationInSeconds?: Maybe<Scalars["Float"]["output"]>;
@@ -1487,6 +1537,7 @@ export type VideoGql = {
   shots: Array<ShotGql>;
   startTime?: Maybe<Scalars["DateTime"]["output"]>;
   stream?: Maybe<UploadStreamGql>;
+  tableSize: Scalars["Float"]["output"];
   tags: Array<VideoTag>;
   totalShots: Scalars["Int"]["output"];
   totalShotsMade: Scalars["Int"]["output"];
@@ -1603,6 +1654,7 @@ export type GetDeployedConfigQuery = {
     devMode: boolean;
     environment: string;
     firebase: boolean;
+    minimumAllowedAppVersion: string;
   };
 };
 
@@ -1629,6 +1681,7 @@ export type GetFeedQuery = {
       startTime?: any | null;
       endTime?: any | null;
       elapsedTime?: number | null;
+      tableSize: number;
       owner?: { __typename?: "UserGQL"; username: string } | null;
       stream?: { __typename?: "UploadStreamGQL"; isCompleted: boolean } | null;
       tags: Array<{
@@ -1725,12 +1778,28 @@ export type GetProfileImageUploadLinkMutation = {
   __typename?: "Mutation";
   getProfileImageUploadLink: {
     __typename?: "GetUploadLinkReturn";
-    uploadUrl: string;
-    headers: Array<{
-      __typename?: "Header";
-      key: string;
-      value: string;
-    } | null>;
+    value:
+      | {
+          __typename?: "GetUploadLinkErrors";
+          error:
+            | { __typename?: "MustHaveSetForUploadLinkErr" }
+            | { __typename?: "NoInitForChunkedUploadErr" }
+            | { __typename?: "ProcessingFailedErr" }
+            | { __typename?: "SegmentAlreadyUploadedErr" }
+            | {
+                __typename?: "TooManyProfileImageUploadsErr";
+                linksRequested: number;
+              };
+        }
+      | {
+          __typename?: "UploadLink";
+          uploadUrl: string;
+          headers: Array<{
+            __typename?: "Header";
+            key: string;
+            value: string;
+          } | null>;
+        };
   };
 };
 
@@ -1862,6 +1931,7 @@ export type GetVideoUpdatePageDetailsQuery = {
     totalShots: number;
     makePercentage: number;
     elapsedTime?: number | null;
+    tableSize: number;
     tags: Array<{
       __typename?: "VideoTag";
       name: string;
@@ -1900,6 +1970,7 @@ export type GetVideoDetailsQuery = {
     totalShotsMade: number;
     createdAt?: any | null;
     updatedAt?: any | null;
+    tableSize: number;
     owner?: {
       __typename?: "UserGQL";
       id: number;
@@ -2087,12 +2158,43 @@ export type GetUploadLinkMutation = {
   __typename?: "Mutation";
   getUploadLink: {
     __typename?: "GetUploadLinkReturn";
-    uploadUrl: string;
-    headers: Array<{
-      __typename?: "Header";
-      key: string;
-      value: string;
-    } | null>;
+    value:
+      | {
+          __typename?: "GetUploadLinkErrors";
+          error:
+            | {
+                __typename?: "MustHaveSetForUploadLinkErr";
+                resolution?: boolean | null;
+                framesPerSecond?: boolean | null;
+              }
+            | { __typename?: "NoInitForChunkedUploadErr" }
+            | {
+                __typename?: "ProcessingFailedErr";
+                processing: {
+                  __typename?: "VideoProcessingGQL";
+                  status: ProcessingStatusEnum;
+                  errors: Array<{
+                    __typename?: "VideoProcessingErrorGQL";
+                    message: string;
+                  }>;
+                };
+              }
+            | { __typename?: "SegmentAlreadyUploadedErr"; segmentId: number }
+            | { __typename?: "TooManyProfileImageUploadsErr" };
+        }
+      | {
+          __typename?: "UploadLink";
+          uploadUrl: string;
+          headers: Array<{
+            __typename?: "Header";
+            key: string;
+            value: string;
+          } | null>;
+        };
+    stream?: {
+      __typename?: "UploadStreamGQL";
+      uploadCompletionCursor: number;
+    } | null;
   };
 };
 
@@ -2104,12 +2206,28 @@ export type GetHlsInitUploadLinkMutation = {
   __typename?: "Mutation";
   getHlsInitUploadLink: {
     __typename?: "GetUploadLinkReturn";
-    uploadUrl: string;
-    headers: Array<{
-      __typename?: "Header";
-      key: string;
-      value: string;
-    } | null>;
+    value:
+      | {
+          __typename?: "GetUploadLinkErrors";
+          error:
+            | { __typename?: "MustHaveSetForUploadLinkErr" }
+            | {
+                __typename?: "NoInitForChunkedUploadErr";
+                segmentType: StreamSegmentTypeEnum;
+              }
+            | { __typename?: "ProcessingFailedErr" }
+            | { __typename?: "SegmentAlreadyUploadedErr" }
+            | { __typename?: "TooManyProfileImageUploadsErr" };
+        }
+      | {
+          __typename?: "UploadLink";
+          uploadUrl: string;
+          headers: Array<{
+            __typename?: "Header";
+            key: string;
+            value: string;
+          } | null>;
+        };
   };
 };
 
@@ -2271,6 +2389,7 @@ export const GetDeployedConfigDocument = gql`
       devMode
       environment
       firebase
+      minimumAllowedAppVersion
     }
   }
 `;
@@ -2365,6 +2484,7 @@ export const GetFeedDocument = gql`
         stream {
           isCompleted
         }
+        tableSize
         tags {
           tagClasses {
             name
@@ -2718,10 +2838,21 @@ export type GetShotAnnotationTypesQueryResult = Apollo.QueryResult<
 export const GetProfileImageUploadLinkDocument = gql`
   mutation getProfileImageUploadLink($fileExt: String = ".png") {
     getProfileImageUploadLink(fileExt: $fileExt) {
-      uploadUrl
-      headers {
-        key
-        value
+      value {
+        ... on UploadLink {
+          uploadUrl
+          headers {
+            key
+            value
+          }
+        }
+        ... on GetUploadLinkErrors {
+          error {
+            ... on TooManyProfileImageUploadsErr {
+              linksRequested
+            }
+          }
+        }
       }
     }
   }
@@ -3195,6 +3326,7 @@ export const GetVideoUpdatePageDetailsDocument = gql`
       totalShots
       makePercentage
       elapsedTime
+      tableSize
       tags {
         tagClasses {
           name
@@ -3334,6 +3466,7 @@ export const GetVideoDetailsDocument = gql`
       totalShotsMade
       createdAt
       updatedAt
+      tableSize
       owner {
         id
         firebaseUid
@@ -3983,10 +4116,36 @@ export type CreateUploadStreamMutationOptions = Apollo.BaseMutationOptions<
 export const GetUploadLinkDocument = gql`
   mutation GetUploadLink($videoId: Int!, $segmentIndex: Int!) {
     getUploadLink(videoId: $videoId, segmentIndex: $segmentIndex) {
-      uploadUrl
-      headers {
-        key
-        value
+      value {
+        ... on UploadLink {
+          uploadUrl
+          headers {
+            key
+            value
+          }
+        }
+        ... on GetUploadLinkErrors {
+          error {
+            ... on MustHaveSetForUploadLinkErr {
+              resolution
+              framesPerSecond
+            }
+            ... on SegmentAlreadyUploadedErr {
+              segmentId
+            }
+            ... on ProcessingFailedErr {
+              processing {
+                status
+                errors {
+                  message
+                }
+              }
+            }
+          }
+        }
+      }
+      stream {
+        uploadCompletionCursor
       }
     }
   }
@@ -4038,10 +4197,21 @@ export type GetUploadLinkMutationOptions = Apollo.BaseMutationOptions<
 export const GetHlsInitUploadLinkDocument = gql`
   mutation GetHlsInitUploadLink($videoId: Int!) {
     getHlsInitUploadLink(videoId: $videoId) {
-      uploadUrl
-      headers {
-        key
-        value
+      value {
+        ... on UploadLink {
+          uploadUrl
+          headers {
+            key
+            value
+          }
+        }
+        ... on GetUploadLinkErrors {
+          error {
+            ... on NoInitForChunkedUploadErr {
+              segmentType
+            }
+          }
+        }
       }
     }
   }

src/operations/config.gql

@@ -4,5 +4,6 @@ query getDeployedConfig {
     devMode
     environment
     firebase
+    minimumAllowedAppVersion
   }
 }

src/operations/feed.gql

@@ -23,6 +23,7 @@ query GetFeed(
       stream {
         isCompleted
       }
+      tableSize
       tags {
         tagClasses {
           name

src/operations/user.gql

@@ -1,9 +1,20 @@
 mutation getProfileImageUploadLink($fileExt: String = ".png") {
   getProfileImageUploadLink(fileExt: $fileExt) {
-    uploadUrl
-    headers {
-      key
-      value
+    value {
+      ... on UploadLink {
+        uploadUrl
+        headers {
+          key
+          value
+        }
+      }
+      ... on GetUploadLinkErrors {
+        error {
+          ... on TooManyProfileImageUploadsErr {
+            linksRequested
+          }
+        }
+      }
     }
   }
 }

src/operations/video.gql

@@ -70,6 +70,7 @@ query GetVideoUpdatePageDetails($videoId: Int!) {
     totalShots
     makePercentage
     elapsedTime
+    tableSize
     tags {
       tagClasses {
         name
@@ -98,6 +99,7 @@ query GetVideoDetails($videoId: Int!) {
     totalShotsMade
     createdAt
     updatedAt
+    tableSize
     owner {
       id
       firebaseUid

src/operations/video_upload.gql

@@ -6,20 +6,57 @@ mutation CreateUploadStream($videoMetadataInput: VideoMetadataInput!) {
 
 mutation GetUploadLink($videoId: Int!, $segmentIndex: Int!) {
   getUploadLink(videoId: $videoId, segmentIndex: $segmentIndex) {
-    uploadUrl
-    headers {
-      key
-      value
+    value {
+      ... on UploadLink {
+        uploadUrl
+        headers {
+          key
+          value
+        }
+      }
+      ... on GetUploadLinkErrors {
+        error {
+          ... on MustHaveSetForUploadLinkErr {
+            resolution
+            framesPerSecond
+          }
+          ... on SegmentAlreadyUploadedErr {
+            segmentId
+          }
+          ... on ProcessingFailedErr {
+            processing {
+              status
+              errors {
+                message
+              }
+            }
+          }
+        }
+      }
+    }
+    stream {
+      uploadCompletionCursor
     }
   }
 }
 
 mutation GetHlsInitUploadLink($videoId: Int!) {
   getHlsInitUploadLink(videoId: $videoId) {
-    uploadUrl
-    headers {
-      key
-      value
+    value {
+      ... on UploadLink {
+        uploadUrl
+        headers {
+          key
+          value
+        }
+      }
+      ... on GetUploadLinkErrors {
+        error {
+          ... on NoInitForChunkedUploadErr {
+            segmentType
+          }
+        }
+      }
     }
   }
 }

src/schema.gql

@@ -96,7 +96,7 @@ input FilterInput @oneOf {
   isLeftMiss: [Boolean!]
   isRightMiss: [Boolean!]
   isDirect: [Boolean!]
-  tableSize: Float
+  tableSize: RangeFilter
   bankAngle: RangeFilter
   bankDistance: RangeFilter
   kickAngle: RangeFilter
@@ -110,7 +110,10 @@ input FilterInput @oneOf {
 input RangeFilter {
   lessThan: Float = null
   greaterThanEqualTo: Float = null
+  greaterThan: Float = null
   includeOnNone: Boolean! = false
+  lessThanInclusive: Boolean! = false
+  greaterThanInclusive: Boolean! = true
 }
 
 enum PocketEnum {
@@ -153,6 +156,7 @@ type DeployedConfigGQL {
   firebase: Boolean!
   devMode: Boolean!
   environment: String!
+  minimumAllowedAppVersion: String!
 }
 
 type MakePercentageIntervalGQL {
@@ -253,6 +257,7 @@ type VideoGQL {
   endTime: DateTime
   elapsedTime: Float
   framesPerSecond: Float!
+  tableSize: Float!
   stream: UploadStreamGQL
   playlist: HLSPlaylistGQL
   tags: [VideoTag!]!
@@ -453,9 +458,15 @@ input CreateBucketSetInput {
 }
 
 type GetUploadLinkReturn {
+  value: UploadLinkGetUploadLinkErrors!
+  stream: UploadStreamGQL
+}
+
+union UploadLinkGetUploadLinkErrors = UploadLink | GetUploadLinkErrors
+
+type UploadLink {
   uploadUrl: String!
   headers: [Header]!
-  uploadCompletionCursor: Int
 }
 
 type Header {
@@ -463,6 +474,38 @@ type Header {
   value: String!
 }
 
+type GetUploadLinkErrors {
+  error: MustHaveSetForUploadLinkErrSegmentAlreadyUploadedErrProcessingFailedErrNoInitForChunkedUploadErrTooManyProfileImageUploadsErr!
+}
+
+union MustHaveSetForUploadLinkErrSegmentAlreadyUploadedErrProcessingFailedErrNoInitForChunkedUploadErrTooManyProfileImageUploadsErr =
+    MustHaveSetForUploadLinkErr
+  | SegmentAlreadyUploadedErr
+  | ProcessingFailedErr
+  | NoInitForChunkedUploadErr
+  | TooManyProfileImageUploadsErr
+
+type MustHaveSetForUploadLinkErr {
+  resolution: Boolean
+  framesPerSecond: Boolean
+}
+
+type SegmentAlreadyUploadedErr {
+  segmentId: Int!
+}
+
+type ProcessingFailedErr {
+  processing: VideoProcessingGQL!
+}
+
+type NoInitForChunkedUploadErr {
+  segmentType: StreamSegmentTypeEnum!
+}
+
+type TooManyProfileImageUploadsErr {
+  linksRequested: Int!
+}
+
 type CreateUploadStreamReturn {
   videoId: Int!
 }