Merge pull request 'Added user tags' (#23) from micah/get-user-tags into master

Reviewed-on: #23
Reviewed-by: Ivan Malison <ivanmalison@gmail.com>

src/index.tsx

@@ -134,9 +134,11 @@ export type FilterInput =
       annotations?: never;
       bankAngle?: never;
       bankDistance?: never;
+      cueAngleAfterObject?: never;
       cueBallSpeed?: never;
       cueObjectAngle?: never;
       cueObjectDistance?: never;
+      cueSpeedAfterObject?: never;
       difficulty?: never;
       intendedPocketType?: never;
       isDirect?: never;
@@ -151,6 +153,7 @@ export type FilterInput =
       notFilter?: never;
       orFilters?: never;
       shotDirection?: never;
+      spinType?: never;
       tags?: never;
       targetPocketDistance?: never;
       userId?: never;
@@ -161,9 +164,11 @@ export type FilterInput =
       annotations: Array<ShotAnnotationInput>;
       bankAngle?: never;
       bankDistance?: never;
+      cueAngleAfterObject?: never;
       cueBallSpeed?: never;
       cueObjectAngle?: never;
       cueObjectDistance?: never;
+      cueSpeedAfterObject?: never;
       difficulty?: never;
       intendedPocketType?: never;
       isDirect?: never;
@@ -178,6 +183,7 @@ export type FilterInput =
       notFilter?: never;
       orFilters?: never;
       shotDirection?: never;
+      spinType?: never;
       tags?: never;
       targetPocketDistance?: never;
       userId?: never;
@@ -188,9 +194,11 @@ export type FilterInput =
       annotations?: never;
       bankAngle: RangeFilter;
       bankDistance?: never;
+      cueAngleAfterObject?: never;
       cueBallSpeed?: never;
       cueObjectAngle?: never;
       cueObjectDistance?: never;
+      cueSpeedAfterObject?: never;
       difficulty?: never;
       intendedPocketType?: never;
       isDirect?: never;
@@ -205,6 +213,7 @@ export type FilterInput =
       notFilter?: never;
       orFilters?: never;
       shotDirection?: never;
+      spinType?: never;
       tags?: never;
       targetPocketDistance?: never;
       userId?: never;
@@ -215,9 +224,11 @@ export type FilterInput =
       annotations?: never;
       bankAngle?: never;
       bankDistance: RangeFilter;
+      cueAngleAfterObject?: never;
       cueBallSpeed?: never;
       cueObjectAngle?: never;
       cueObjectDistance?: never;
+      cueSpeedAfterObject?: never;
       difficulty?: never;
       intendedPocketType?: never;
       isDirect?: never;
@@ -232,6 +243,7 @@ export type FilterInput =
       notFilter?: never;
       orFilters?: never;
       shotDirection?: never;
+      spinType?: never;
       tags?: never;
       targetPocketDistance?: never;
       userId?: never;
@@ -242,9 +254,41 @@ export type FilterInput =
       annotations?: never;
       bankAngle?: never;
       bankDistance?: never;
+      cueAngleAfterObject: RangeFilter;
+      cueBallSpeed?: never;
+      cueObjectAngle?: never;
+      cueObjectDistance?: never;
+      cueSpeedAfterObject?: never;
+      difficulty?: never;
+      intendedPocketType?: never;
+      isDirect?: never;
+      isLeft?: never;
+      isLeftMiss?: never;
+      isRight?: never;
+      isRightMiss?: never;
+      isStraight?: never;
+      kickAngle?: never;
+      kickDistance?: never;
+      make?: never;
+      notFilter?: never;
+      orFilters?: never;
+      shotDirection?: never;
+      spinType?: never;
+      tags?: never;
+      targetPocketDistance?: never;
+      userId?: never;
+      videoId?: never;
+    }
+  | {
+      andFilters?: never;
+      annotations?: never;
+      bankAngle?: never;
+      bankDistance?: never;
+      cueAngleAfterObject?: never;
       cueBallSpeed: RangeFilter;
       cueObjectAngle?: never;
       cueObjectDistance?: never;
+      cueSpeedAfterObject?: never;
       difficulty?: never;
       intendedPocketType?: never;
       isDirect?: never;
@@ -259,6 +303,7 @@ export type FilterInput =
       notFilter?: never;
       orFilters?: never;
       shotDirection?: never;
+      spinType?: never;
       tags?: never;
       targetPocketDistance?: never;
       userId?: never;
@@ -269,9 +314,11 @@ export type FilterInput =
       annotations?: never;
       bankAngle?: never;
       bankDistance?: never;
+      cueAngleAfterObject?: never;
       cueBallSpeed?: never;
       cueObjectAngle: RangeFilter;
       cueObjectDistance?: never;
+      cueSpeedAfterObject?: never;
       difficulty?: never;
       intendedPocketType?: never;
       isDirect?: never;
@@ -286,6 +333,7 @@ export type FilterInput =
       notFilter?: never;
       orFilters?: never;
       shotDirection?: never;
+      spinType?: never;
       tags?: never;
       targetPocketDistance?: never;
       userId?: never;
@@ -296,9 +344,11 @@ export type FilterInput =
       annotations?: never;
       bankAngle?: never;
       bankDistance?: never;
+      cueAngleAfterObject?: never;
       cueBallSpeed?: never;
       cueObjectAngle?: never;
       cueObjectDistance: RangeFilter;
+      cueSpeedAfterObject?: never;
       difficulty?: never;
       intendedPocketType?: never;
       isDirect?: never;
@@ -313,6 +363,7 @@ export type FilterInput =
       notFilter?: never;
       orFilters?: never;
       shotDirection?: never;
+      spinType?: never;
       tags?: never;
       targetPocketDistance?: never;
       userId?: never;
@@ -323,9 +374,41 @@ export type FilterInput =
       annotations?: never;
       bankAngle?: never;
       bankDistance?: never;
+      cueAngleAfterObject?: never;
       cueBallSpeed?: never;
       cueObjectAngle?: never;
       cueObjectDistance?: never;
+      cueSpeedAfterObject: RangeFilter;
+      difficulty?: never;
+      intendedPocketType?: never;
+      isDirect?: never;
+      isLeft?: never;
+      isLeftMiss?: never;
+      isRight?: never;
+      isRightMiss?: never;
+      isStraight?: never;
+      kickAngle?: never;
+      kickDistance?: never;
+      make?: never;
+      notFilter?: never;
+      orFilters?: never;
+      shotDirection?: never;
+      spinType?: never;
+      tags?: never;
+      targetPocketDistance?: never;
+      userId?: never;
+      videoId?: never;
+    }
+  | {
+      andFilters?: never;
+      annotations?: never;
+      bankAngle?: never;
+      bankDistance?: never;
+      cueAngleAfterObject?: never;
+      cueBallSpeed?: never;
+      cueObjectAngle?: never;
+      cueObjectDistance?: never;
+      cueSpeedAfterObject?: never;
       difficulty: RangeFilter;
       intendedPocketType?: never;
       isDirect?: never;
@@ -340,6 +423,7 @@ export type FilterInput =
       notFilter?: never;
       orFilters?: never;
       shotDirection?: never;
+      spinType?: never;
       tags?: never;
       targetPocketDistance?: never;
       userId?: never;
@@ -350,9 +434,11 @@ export type FilterInput =
       annotations?: never;
       bankAngle?: never;
       bankDistance?: never;
+      cueAngleAfterObject?: never;
       cueBallSpeed?: never;
       cueObjectAngle?: never;
       cueObjectDistance?: never;
+      cueSpeedAfterObject?: never;
       difficulty?: never;
       intendedPocketType: Array<PocketEnum>;
       isDirect?: never;
@@ -367,6 +453,7 @@ export type FilterInput =
       notFilter?: never;
       orFilters?: never;
       shotDirection?: never;
+      spinType?: never;
       tags?: never;
       targetPocketDistance?: never;
       userId?: never;
@@ -377,9 +464,11 @@ export type FilterInput =
       annotations?: never;
       bankAngle?: never;
       bankDistance?: never;
+      cueAngleAfterObject?: never;
       cueBallSpeed?: never;
       cueObjectAngle?: never;
       cueObjectDistance?: never;
+      cueSpeedAfterObject?: never;
       difficulty?: never;
       intendedPocketType?: never;
       isDirect: Array<Scalars["Boolean"]["input"]>;
@@ -394,6 +483,7 @@ export type FilterInput =
       notFilter?: never;
       orFilters?: never;
       shotDirection?: never;
+      spinType?: never;
       tags?: never;
       targetPocketDistance?: never;
       userId?: never;
@@ -404,9 +494,11 @@ export type FilterInput =
       annotations?: never;
       bankAngle?: never;
       bankDistance?: never;
+      cueAngleAfterObject?: never;
       cueBallSpeed?: never;
       cueObjectAngle?: never;
       cueObjectDistance?: never;
+      cueSpeedAfterObject?: never;
       difficulty?: never;
       intendedPocketType?: never;
       isDirect?: never;
@@ -421,6 +513,7 @@ export type FilterInput =
       notFilter?: never;
       orFilters?: never;
       shotDirection?: never;
+      spinType?: never;
       tags?: never;
       targetPocketDistance?: never;
       userId?: never;
@@ -431,9 +524,11 @@ export type FilterInput =
       annotations?: never;
       bankAngle?: never;
       bankDistance?: never;
+      cueAngleAfterObject?: never;
       cueBallSpeed?: never;
       cueObjectAngle?: never;
       cueObjectDistance?: never;
+      cueSpeedAfterObject?: never;
       difficulty?: never;
       intendedPocketType?: never;
       isDirect?: never;
@@ -448,6 +543,7 @@ export type FilterInput =
       notFilter?: never;
       orFilters?: never;
       shotDirection?: never;
+      spinType?: never;
       tags?: never;
       targetPocketDistance?: never;
       userId?: never;
@@ -458,9 +554,11 @@ export type FilterInput =
       annotations?: never;
       bankAngle?: never;
       bankDistance?: never;
+      cueAngleAfterObject?: never;
       cueBallSpeed?: never;
       cueObjectAngle?: never;
       cueObjectDistance?: never;
+      cueSpeedAfterObject?: never;
       difficulty?: never;
       intendedPocketType?: never;
       isDirect?: never;
@@ -475,6 +573,7 @@ export type FilterInput =
       notFilter?: never;
       orFilters?: never;
       shotDirection?: never;
+      spinType?: never;
       tags?: never;
       targetPocketDistance?: never;
       userId?: never;
@@ -485,9 +584,11 @@ export type FilterInput =
       annotations?: never;
       bankAngle?: never;
       bankDistance?: never;
+      cueAngleAfterObject?: never;
       cueBallSpeed?: never;
       cueObjectAngle?: never;
       cueObjectDistance?: never;
+      cueSpeedAfterObject?: never;
       difficulty?: never;
       intendedPocketType?: never;
       isDirect?: never;
@@ -502,6 +603,7 @@ export type FilterInput =
       notFilter?: never;
       orFilters?: never;
       shotDirection?: never;
+      spinType?: never;
       tags?: never;
       targetPocketDistance?: never;
       userId?: never;
@@ -512,9 +614,11 @@ export type FilterInput =
       annotations?: never;
       bankAngle?: never;
       bankDistance?: never;
+      cueAngleAfterObject?: never;
       cueBallSpeed?: never;
       cueObjectAngle?: never;
       cueObjectDistance?: never;
+      cueSpeedAfterObject?: never;
       difficulty?: never;
       intendedPocketType?: never;
       isDirect?: never;
@@ -529,6 +633,7 @@ export type FilterInput =
       notFilter?: never;
       orFilters?: never;
       shotDirection?: never;
+      spinType?: never;
       tags?: never;
       targetPocketDistance?: never;
       userId?: never;
@@ -539,9 +644,11 @@ export type FilterInput =
       annotations?: never;
       bankAngle?: never;
       bankDistance?: never;
+      cueAngleAfterObject?: never;
       cueBallSpeed?: never;
       cueObjectAngle?: never;
       cueObjectDistance?: never;
+      cueSpeedAfterObject?: never;
       difficulty?: never;
       intendedPocketType?: never;
       isDirect?: never;
@@ -556,6 +663,7 @@ export type FilterInput =
       notFilter?: never;
       orFilters?: never;
       shotDirection?: never;
+      spinType?: never;
       tags?: never;
       targetPocketDistance?: never;
       userId?: never;
@@ -566,9 +674,11 @@ export type FilterInput =
       annotations?: never;
       bankAngle?: never;
       bankDistance?: never;
+      cueAngleAfterObject?: never;
       cueBallSpeed?: never;
       cueObjectAngle?: never;
       cueObjectDistance?: never;
+      cueSpeedAfterObject?: never;
       difficulty?: never;
       intendedPocketType?: never;
       isDirect?: never;
@@ -583,6 +693,7 @@ export type FilterInput =
       notFilter?: never;
       orFilters?: never;
       shotDirection?: never;
+      spinType?: never;
       tags?: never;
       targetPocketDistance?: never;
       userId?: never;
@@ -593,9 +704,11 @@ export type FilterInput =
       annotations?: never;
       bankAngle?: never;
       bankDistance?: never;
+      cueAngleAfterObject?: never;
       cueBallSpeed?: never;
       cueObjectAngle?: never;
       cueObjectDistance?: never;
+      cueSpeedAfterObject?: never;
       difficulty?: never;
       intendedPocketType?: never;
       isDirect?: never;
@@ -610,6 +723,7 @@ export type FilterInput =
       notFilter?: never;
       orFilters?: never;
       shotDirection?: never;
+      spinType?: never;
       tags?: never;
       targetPocketDistance?: never;
       userId?: never;
@@ -620,9 +734,11 @@ export type FilterInput =
       annotations?: never;
       bankAngle?: never;
       bankDistance?: never;
+      cueAngleAfterObject?: never;
       cueBallSpeed?: never;
       cueObjectAngle?: never;
       cueObjectDistance?: never;
+      cueSpeedAfterObject?: never;
       difficulty?: never;
       intendedPocketType?: never;
       isDirect?: never;
@@ -637,6 +753,7 @@ export type FilterInput =
       notFilter: FilterInput;
       orFilters?: never;
       shotDirection?: never;
+      spinType?: never;
       tags?: never;
       targetPocketDistance?: never;
       userId?: never;
@@ -647,9 +764,11 @@ export type FilterInput =
       annotations?: never;
       bankAngle?: never;
       bankDistance?: never;
+      cueAngleAfterObject?: never;
       cueBallSpeed?: never;
       cueObjectAngle?: never;
       cueObjectDistance?: never;
+      cueSpeedAfterObject?: never;
       difficulty?: never;
       intendedPocketType?: never;
       isDirect?: never;
@@ -664,6 +783,7 @@ export type FilterInput =
       notFilter?: never;
       orFilters: Array<FilterInput>;
       shotDirection?: never;
+      spinType?: never;
       tags?: never;
       targetPocketDistance?: never;
       userId?: never;
@@ -674,9 +794,11 @@ export type FilterInput =
       annotations?: never;
       bankAngle?: never;
       bankDistance?: never;
+      cueAngleAfterObject?: never;
       cueBallSpeed?: never;
       cueObjectAngle?: never;
       cueObjectDistance?: never;
+      cueSpeedAfterObject?: never;
       difficulty?: never;
       intendedPocketType?: never;
       isDirect?: never;
@@ -691,6 +813,7 @@ export type FilterInput =
       notFilter?: never;
       orFilters?: never;
       shotDirection: Array<ShotDirectionEnum>;
+      spinType?: never;
       tags?: never;
       targetPocketDistance?: never;
       userId?: never;
@@ -701,9 +824,11 @@ export type FilterInput =
       annotations?: never;
       bankAngle?: never;
       bankDistance?: never;
+      cueAngleAfterObject?: never;
       cueBallSpeed?: never;
       cueObjectAngle?: never;
       cueObjectDistance?: never;
+      cueSpeedAfterObject?: never;
       difficulty?: never;
       intendedPocketType?: never;
       isDirect?: never;
@@ -718,6 +843,37 @@ export type FilterInput =
       notFilter?: never;
       orFilters?: never;
       shotDirection?: never;
+      spinType: Array<Scalars["String"]["input"]>;
+      tags?: never;
+      targetPocketDistance?: never;
+      userId?: never;
+      videoId?: never;
+    }
+  | {
+      andFilters?: never;
+      annotations?: never;
+      bankAngle?: never;
+      bankDistance?: never;
+      cueAngleAfterObject?: never;
+      cueBallSpeed?: never;
+      cueObjectAngle?: never;
+      cueObjectDistance?: never;
+      cueSpeedAfterObject?: never;
+      difficulty?: never;
+      intendedPocketType?: never;
+      isDirect?: never;
+      isLeft?: never;
+      isLeftMiss?: never;
+      isRight?: never;
+      isRightMiss?: never;
+      isStraight?: never;
+      kickAngle?: never;
+      kickDistance?: never;
+      make?: never;
+      notFilter?: never;
+      orFilters?: never;
+      shotDirection?: never;
+      spinType?: never;
       tags: Array<VideoTagInput>;
       targetPocketDistance?: never;
       userId?: never;
@@ -728,9 +884,11 @@ export type FilterInput =
       annotations?: never;
       bankAngle?: never;
       bankDistance?: never;
+      cueAngleAfterObject?: never;
       cueBallSpeed?: never;
       cueObjectAngle?: never;
       cueObjectDistance?: never;
+      cueSpeedAfterObject?: never;
       difficulty?: never;
       intendedPocketType?: never;
       isDirect?: never;
@@ -745,6 +903,7 @@ export type FilterInput =
       notFilter?: never;
       orFilters?: never;
       shotDirection?: never;
+      spinType?: never;
       tags?: never;
       targetPocketDistance: RangeFilter;
       userId?: never;
@@ -755,9 +914,11 @@ export type FilterInput =
       annotations?: never;
       bankAngle?: never;
       bankDistance?: never;
+      cueAngleAfterObject?: never;
       cueBallSpeed?: never;
       cueObjectAngle?: never;
       cueObjectDistance?: never;
+      cueSpeedAfterObject?: never;
       difficulty?: never;
       intendedPocketType?: never;
       isDirect?: never;
@@ -772,6 +933,7 @@ export type FilterInput =
       notFilter?: never;
       orFilters?: never;
       shotDirection?: never;
+      spinType?: never;
       tags?: never;
       targetPocketDistance?: never;
       userId: Array<Scalars["Int"]["input"]>;
@@ -782,9 +944,11 @@ export type FilterInput =
       annotations?: never;
       bankAngle?: never;
       bankDistance?: never;
+      cueAngleAfterObject?: never;
       cueBallSpeed?: never;
       cueObjectAngle?: never;
       cueObjectDistance?: never;
+      cueSpeedAfterObject?: never;
       difficulty?: never;
       intendedPocketType?: never;
       isDirect?: never;
@@ -799,6 +963,7 @@ export type FilterInput =
       notFilter?: never;
       orFilters?: never;
       shotDirection?: never;
+      spinType?: never;
       tags?: never;
       targetPocketDistance?: never;
       userId?: never;
@@ -949,6 +1114,7 @@ export type Query = {
   getShotAnnotationTypes: Array<ShotAnnotationTypeGql>;
   getShots: Array<ShotGql>;
   getUser?: Maybe<UserGql>;
+  getUserTags: Array<TagGql>;
   getUserVideos: VideoHistoryGql;
   getUsernames: Array<Scalars["String"]["output"]>;
   getVideo: VideoGql;
@@ -976,6 +1142,10 @@ export type QueryGetUserArgs = {
   userId: Scalars["Int"]["input"];
 };
 
+export type QueryGetUserTagsArgs = {
+  userId: Scalars["Int"]["input"];
+};
+
 export type QueryGetUserVideosArgs = {
   after?: InputMaybe<Scalars["String"]["input"]>;
   filters?: InputMaybe<VideoFilterInput>;
@@ -1064,6 +1234,13 @@ export enum StreamSegmentTypeEnum {
   RbChunkedMp4 = "RB_CHUNKED_MP4",
 }
 
+export type TagGql = {
+  __typename?: "TagGQL";
+  group?: Maybe<Scalars["String"]["output"]>;
+  id: Scalars["Int"]["output"];
+  name: Scalars["String"]["output"];
+};
+
 export type TargetMetricsGql = {
   __typename?: "TargetMetricsGQL";
   averageDifficulty?: Maybe<Scalars["Float"]["output"]>;
@@ -1170,7 +1347,7 @@ export type VideoMetadataInput = {
   framesPerSecond?: InputMaybe<Scalars["Float"]["input"]>;
   gameType?: InputMaybe<Scalars["String"]["input"]>;
   lastIntendedSegmentBound?: InputMaybe<Scalars["Int"]["input"]>;
-  resolution: VideoResolution;
+  resolution?: InputMaybe<VideoResolution>;
   startTime?: InputMaybe<Scalars["DateTime"]["input"]>;
   streamSegmentType?: InputMaybe<StreamSegmentTypeEnum>;
   tableSize?: InputMaybe<Scalars["String"]["input"]>;

src/schema.gql

@@ -24,6 +24,7 @@ type Query {
     after: String = null
     filters: VideoFilterInput = null
   ): VideoHistoryGQL!
+  getUserTags(userId: Int!): [TagGQL!]!
   getVideo(videoId: Int!): VideoGQL!
   getVideos(videoIds: [Int!]!): [VideoGQL!]!
 }
@@ -94,6 +95,9 @@ input FilterInput @oneOf {
   bankDistance: RangeFilter
   kickAngle: RangeFilter
   kickDistance: RangeFilter
+  cueAngleAfterObject: RangeFilter
+  cueSpeedAfterObject: RangeFilter
+  spinType: [String!]
 }
 
 input RangeFilter {
@@ -355,6 +359,12 @@ input VideoFilterInput {
   requireCursorCompletion: Boolean! = true
 }
 
+type TagGQL {
+  name: String!
+  id: Int!
+  group: String
+}
+
 type Mutation {
   createBucketSet(params: CreateBucketSetInput!): BucketSetGQL!
   setLoggerLevel(path: String!, level: String!): Boolean!
@@ -395,7 +405,6 @@ type CreateUploadStreamReturn {
 }
 
 input VideoMetadataInput {
-  resolution: VideoResolution!
   videoName: String = null
   startTime: DateTime = null
   endTime: DateTime = null
@@ -405,14 +414,10 @@ input VideoMetadataInput {
   lastIntendedSegmentBound: Int = null
   streamSegmentType: StreamSegmentTypeEnum = null
   endStream: Boolean! = false
+  resolution: VideoResolution = null
   framesPerSecond: Float = null
 }
 
-input VideoResolution {
-  width: Int!
-  height: Int!
-}
-
 input UploadStreamMetadataInput {
   deviceType: DeviceTypeEnum = null
   osVersion: String = null
@@ -435,3 +440,8 @@ enum StreamSegmentTypeEnum {
   FRAGMENTED_MP4
   RB_CHUNKED_MP4
 }
+
+input VideoResolution {
+  width: Int!
+  height: Int!
+}