Merge pull request 'Create gql feed' (#4) from kat/update-video-gql into master

Reviewed-on: #4

.gitignore

@@ -0,0 +1,3 @@
+node_modules
+dist
+.direnv

bin/assert-no-changes-wrapper.sh

@@ -0,0 +1,6 @@
+#!/usr/bin/env bash
+GQL_DIR=$(dirname $(dirname "$(realpath "$BASH_SOURCE")"))
+
+cd $GQL_DIR
+
+nix develop --impure --command bash "$GQL_DIR/bin/assert-no-changes.sh"

bin/assert-no-changes.sh

@@ -0,0 +1,10 @@
+#!/usr/bin/env bash
+git ls-files | xargs md5sum > before.txt
+
+yarn install
+yarn graphql-codegen
+
+git ls-files | xargs md5sum > after.txt
+
+
+diff before.txt after.txt

src/index.tsx

@@ -115,9 +115,7 @@ export type FilterInput = {
 
 export type GetUploadLinkReturn = {
   __typename?: 'GetUploadLinkReturn';
-  linksRequested: Scalars['Int']['output'];
   uploadUrl: Scalars['String']['output'];
-  uploadsCompleted: Scalars['Int']['output'];
 };
 
 export type IntendedPocketTypeInput = {
@@ -129,7 +127,6 @@ export type Mutation = {
   createBucketSet: BucketSetGql;
   createUploadStream: CreateUploadStreamReturn;
   getUploadLink: GetUploadLinkReturn;
-  processVideoSource: ProcessVideoSourceReturn;
   terminateUploadStream: Scalars['Boolean']['output'];
 };
 
@@ -146,24 +143,28 @@ export type MutationCreateUploadStreamArgs = {
 
 
 export type MutationGetUploadLinkArgs = {
-  chunkIndex: Scalars['Int']['input'];
+  segmentIndex: Scalars['Int']['input'];
   videoId: Scalars['Int']['input'];
 };
 
 
-export type MutationProcessVideoSourceArgs = {
-  input: ProcessVideoSourceInput;
-};
-
-
 export type MutationTerminateUploadStreamArgs = {
+  gameType?: InputMaybe<Scalars['String']['input']>;
+  tableSize?: InputMaybe<Scalars['String']['input']>;
   videoId: Scalars['Int']['input'];
+  videoName?: InputMaybe<Scalars['String']['input']>;
 };
 
 export type OrFilter = {
   filters: Array<FilterInput>;
 };
 
+export type PageInfoGql = {
+  __typename?: 'PageInfoGQL';
+  endCursor?: Maybe<Scalars['String']['output']>;
+  hasNextPage: Scalars['Boolean']['output'];
+};
+
 export enum PocketEnum {
   Corner = 'CORNER',
   Side = 'SIDE'
@@ -176,22 +177,15 @@ export type PocketingIntentionFeaturesGql = {
   targetPocketDistance?: Maybe<Scalars['Float']['output']>;
 };
 
-export type ProcessVideoSourceInput = {
-  val: Scalars['Int']['input'];
-};
-
-export type ProcessVideoSourceReturn = {
-  __typename?: 'ProcessVideoSourceReturn';
-  val: Scalars['Int']['output'];
-};
-
 export type Query = {
   __typename?: 'Query';
   getAggregateShots: Array<AggregateResultGql>;
   getBucketSet?: Maybe<BucketSetGql>;
+  getLoggedInUser?: Maybe<UserGql>;
   getShots: Array<ShotGql>;
   getUser?: Maybe<UserGql>;
   getVideo: VideoGql;
+  getVideoFeedForUser: VideoFeedGql;
 };
 
 
@@ -219,6 +213,12 @@ export type QueryGetVideoArgs = {
   videoId: Scalars['Int']['input'];
 };
 
+
+export type QueryGetVideoFeedForUserArgs = {
+  after?: InputMaybe<Scalars['String']['input']>;
+  first?: Scalars['Int']['input'];
+};
+
 export type RangeFilter = {
   greaterThanEqualTo?: InputMaybe<Scalars['Float']['input']>;
   lessThan?: InputMaybe<Scalars['Float']['input']>;
@@ -315,6 +315,7 @@ export type UploadStreamMetadata = {
 export type UserGql = {
   __typename?: 'UserGQL';
   createdAt?: Maybe<Scalars['DateTime']['output']>;
+  firebaseUid: Scalars['String']['output'];
   id: Scalars['Int']['output'];
   statistics: UserStatisticsGql;
   updatedAt?: Maybe<Scalars['DateTime']['output']>;
@@ -331,20 +332,26 @@ export type UserStatisticsGql = {
   totalShotsMade: Scalars['Int']['output'];
 };
 
+export type VideoFeedGql = {
+  __typename?: 'VideoFeedGQL';
+  pageInfo: PageInfoGql;
+  videos: Array<VideoGql>;
+};
+
 export type VideoGql = {
   __typename?: 'VideoGQL';
-  averageTimeBetweenShots?: Maybe<Scalars['Decimal']['output']>;
+  averageTimeBetweenShots?: Maybe<Scalars['Float']['output']>;
   createdAt: Scalars['DateTime']['output'];
-  elapsedTime: Scalars['Decimal']['output'];
+  elapsedTime?: Maybe<Scalars['Float']['output']>;
   endTime: Scalars['DateTime']['output'];
   framesPerSecond: Scalars['Int']['output'];
   id: Scalars['Int']['output'];
-  makePercentage: Scalars['Decimal']['output'];
+  makePercentage: Scalars['Float']['output'];
-  medianRun: Scalars['Decimal']['output'];
+  medianRun?: Maybe<Scalars['Float']['output']>;
+  name: Scalars['String']['output'];
   shots: Array<ShotGql>;
   startTime: Scalars['DateTime']['output'];
   stream?: Maybe<UploadStreamGql>;
-  totalFrames: Scalars['Int']['output'];
   totalShots: Scalars['Int']['output'];
   totalShotsMade: Scalars['Int']['output'];
   updatedAt: Scalars['DateTime']['output'];
@@ -362,6 +369,21 @@ export type GetAggregateShotsQueryVariables = Exact<{
 
 export type GetAggregateShotsQuery = { __typename?: 'Query', getAggregateShots: Array<{ __typename?: 'AggregateResultGQL', featureBuckets: Array<{ __typename?: 'BucketGQL', rangeKey: string, lowerBound: number }>, targetMetrics: Array<{ __typename?: 'TargetMetricGQL', count?: number | null, makePercentage?: number | null, floatFeature?: { __typename?: 'TargetFloatFeatureGQL', featureName: string, average?: number | null, median?: number | null } | null }> }> };
 
+export type GetFeedQueryVariables = Exact<{
+  first?: Scalars['Int']['input'];
+  after?: InputMaybe<Scalars['String']['input']>;
+  includeTotalShotsMade?: Scalars['Boolean']['input'];
+  includeMakePercentage?: Scalars['Boolean']['input'];
+  includeMedianRun?: Scalars['Boolean']['input'];
+  includeAverageTimeBetweenShots?: Scalars['Boolean']['input'];
+  includeElapsedTime?: Scalars['Boolean']['input'];
+  includeFramesPerSecond?: Scalars['Boolean']['input'];
+  includeStream?: Scalars['Boolean']['input'];
+}>;
+
+
+export type GetFeedQuery = { __typename?: 'Query', getVideoFeedForUser: { __typename?: 'VideoFeedGQL', videos: Array<{ __typename?: 'VideoGQL', id: number, name: string, totalShotsMade?: number, totalShots: number, makePercentage?: number, medianRun?: number | null, averageTimeBetweenShots?: number | null, createdAt: any, updatedAt: any, startTime: any, endTime: any, elapsedTime?: number | null, shots: Array<{ __typename?: 'ShotGQL', id?: number | null, videoId?: number | null, startFrame?: number | null, endFrame?: number | null, createdAt?: any | null, updatedAt?: any | null }>, stream?: { __typename?: 'UploadStreamGQL', id: string, linksRequested: number, uploadsCompleted: number, isCompleted: boolean, createdAt: any, updatedAt: any } | null }>, pageInfo: { __typename?: 'PageInfoGQL', hasNextPage: boolean, endCursor?: string | null } } };
+
 export type GetShotsQueryVariables = Exact<{
   filterInput?: InputMaybe<FilterInput>;
   includeCueObjectDistance?: Scalars['Boolean']['input'];
@@ -394,14 +416,17 @@ export type CreateUploadStreamMutation = { __typename?: 'Mutation', createUpload
 
 export type GetUploadLinkMutationVariables = Exact<{
   videoId: Scalars['Int']['input'];
-  chunkIndex: Scalars['Int']['input'];
+  segmentIndex: Scalars['Int']['input'];
 }>;
 
 
-export type GetUploadLinkMutation = { __typename?: 'Mutation', getUploadLink: { __typename?: 'GetUploadLinkReturn', uploadUrl: string, linksRequested: number } };
+export type GetUploadLinkMutation = { __typename?: 'Mutation', getUploadLink: { __typename?: 'GetUploadLinkReturn', uploadUrl: string } };
 
 export type TerminateUploadStreamMutationVariables = Exact<{
   videoId: Scalars['Int']['input'];
+  videoName?: InputMaybe<Scalars['String']['input']>;
+  gameType?: InputMaybe<Scalars['String']['input']>;
+  tableSize?: InputMaybe<Scalars['String']['input']>;
 }>;
 
 
@@ -460,6 +485,87 @@ export type GetAggregateShotsQueryHookResult = ReturnType<typeof useGetAggregate
 export type GetAggregateShotsLazyQueryHookResult = ReturnType<typeof useGetAggregateShotsLazyQuery>;
 export type GetAggregateShotsSuspenseQueryHookResult = ReturnType<typeof useGetAggregateShotsSuspenseQuery>;
 export type GetAggregateShotsQueryResult = Apollo.QueryResult<GetAggregateShotsQuery, GetAggregateShotsQueryVariables>;
+export const GetFeedDocument = gql`
+    query GetFeed($first: Int! = 5, $after: String = null, $includeTotalShotsMade: Boolean! = false, $includeMakePercentage: Boolean! = false, $includeMedianRun: Boolean! = false, $includeAverageTimeBetweenShots: Boolean! = false, $includeElapsedTime: Boolean! = false, $includeFramesPerSecond: Boolean! = false, $includeStream: Boolean! = false) {
+  getVideoFeedForUser(first: $first, after: $after) {
+    videos {
+      id
+      name
+      totalShotsMade @include(if: $includeTotalShotsMade)
+      totalShots
+      makePercentage @include(if: $includeMakePercentage)
+      medianRun @include(if: $includeMedianRun)
+      averageTimeBetweenShots @include(if: $includeAverageTimeBetweenShots)
+      createdAt
+      updatedAt
+      shots {
+        id
+        videoId
+        startFrame
+        endFrame
+        createdAt
+        updatedAt
+      }
+      startTime
+      endTime
+      elapsedTime @include(if: $includeElapsedTime)
+      stream @include(if: $includeStream) {
+        id
+        linksRequested
+        uploadsCompleted
+        isCompleted
+        createdAt
+        updatedAt
+      }
+    }
+    pageInfo {
+      hasNextPage
+      endCursor
+    }
+  }
+}
+    `;
+
+/**
+ * __useGetFeedQuery__
+ *
+ * To run a query within a React component, call `useGetFeedQuery` and pass it any options that fit your needs.
+ * When your component renders, `useGetFeedQuery` returns an object from Apollo Client that contains loading, error, and data properties
+ * you can use to render your UI.
+ *
+ * @param baseOptions options that will be passed into the query, supported options are listed on: https://www.apollographql.com/docs/react/api/react-hooks/#options;
+ *
+ * @example
+ * const { data, loading, error } = useGetFeedQuery({
+ *   variables: {
+ *      first: // value for 'first'
+ *      after: // value for 'after'
+ *      includeTotalShotsMade: // value for 'includeTotalShotsMade'
+ *      includeMakePercentage: // value for 'includeMakePercentage'
+ *      includeMedianRun: // value for 'includeMedianRun'
+ *      includeAverageTimeBetweenShots: // value for 'includeAverageTimeBetweenShots'
+ *      includeElapsedTime: // value for 'includeElapsedTime'
+ *      includeFramesPerSecond: // value for 'includeFramesPerSecond'
+ *      includeStream: // value for 'includeStream'
+ *   },
+ * });
+ */
+export function useGetFeedQuery(baseOptions?: Apollo.QueryHookOptions<GetFeedQuery, GetFeedQueryVariables>) {
+        const options = {...defaultOptions, ...baseOptions}
+        return Apollo.useQuery<GetFeedQuery, GetFeedQueryVariables>(GetFeedDocument, options);
+      }
+export function useGetFeedLazyQuery(baseOptions?: Apollo.LazyQueryHookOptions<GetFeedQuery, GetFeedQueryVariables>) {
+          const options = {...defaultOptions, ...baseOptions}
+          return Apollo.useLazyQuery<GetFeedQuery, GetFeedQueryVariables>(GetFeedDocument, options);
+        }
+export function useGetFeedSuspenseQuery(baseOptions?: Apollo.SuspenseQueryHookOptions<GetFeedQuery, GetFeedQueryVariables>) {
+          const options = {...defaultOptions, ...baseOptions}
+          return Apollo.useSuspenseQuery<GetFeedQuery, GetFeedQueryVariables>(GetFeedDocument, options);
+        }
+export type GetFeedQueryHookResult = ReturnType<typeof useGetFeedQuery>;
+export type GetFeedLazyQueryHookResult = ReturnType<typeof useGetFeedLazyQuery>;
+export type GetFeedSuspenseQueryHookResult = ReturnType<typeof useGetFeedSuspenseQuery>;
+export type GetFeedQueryResult = Apollo.QueryResult<GetFeedQuery, GetFeedQueryVariables>;
 export const GetShotsDocument = gql`
     query GetShots($filterInput: FilterInput, $includeCueObjectDistance: Boolean! = false, $includeCueObjectAngle: Boolean! = false, $includeCueBallSpeed: Boolean! = false, $includeShotDirection: Boolean! = false, $includeTargetPocketDistance: Boolean! = false, $includeMake: Boolean! = false, $includeIntendedPocketType: Boolean! = false) {
   getShots(filterInput: $filterInput) {
@@ -569,10 +675,9 @@ export type CreateUploadStreamMutationHookResult = ReturnType<typeof useCreateUp
 export type CreateUploadStreamMutationResult = Apollo.MutationResult<CreateUploadStreamMutation>;
 export type CreateUploadStreamMutationOptions = Apollo.BaseMutationOptions<CreateUploadStreamMutation, CreateUploadStreamMutationVariables>;
 export const GetUploadLinkDocument = gql`
-    mutation GetUploadLink($videoId: Int!, $chunkIndex: Int!) {
+    mutation GetUploadLink($videoId: Int!, $segmentIndex: Int!) {
-  getUploadLink(videoId: $videoId, chunkIndex: $chunkIndex) {
+  getUploadLink(videoId: $videoId, segmentIndex: $segmentIndex) {
     uploadUrl
-    linksRequested
   }
 }
     `;
@@ -592,7 +697,7 @@ export type GetUploadLinkMutationFn = Apollo.MutationFunction<GetUploadLinkMutat
  * const [getUploadLinkMutation, { data, loading, error }] = useGetUploadLinkMutation({
  *   variables: {
  *      videoId: // value for 'videoId'
- *      chunkIndex: // value for 'chunkIndex'
+ *      segmentIndex: // value for 'segmentIndex'
  *   },
  * });
  */
@@ -604,8 +709,13 @@ export type GetUploadLinkMutationHookResult = ReturnType<typeof useGetUploadLink
 export type GetUploadLinkMutationResult = Apollo.MutationResult<GetUploadLinkMutation>;
 export type GetUploadLinkMutationOptions = Apollo.BaseMutationOptions<GetUploadLinkMutation, GetUploadLinkMutationVariables>;
 export const TerminateUploadStreamDocument = gql`
-    mutation TerminateUploadStream($videoId: Int!) {
+    mutation TerminateUploadStream($videoId: Int!, $videoName: String, $gameType: String, $tableSize: String) {
-  terminateUploadStream(videoId: $videoId)
+  terminateUploadStream(
+    videoId: $videoId
+    videoName: $videoName
+    gameType: $gameType
+    tableSize: $tableSize
+  )
 }
     `;
 export type TerminateUploadStreamMutationFn = Apollo.MutationFunction<TerminateUploadStreamMutation, TerminateUploadStreamMutationVariables>;
@@ -624,6 +734,9 @@ export type TerminateUploadStreamMutationFn = Apollo.MutationFunction<TerminateU
  * const [terminateUploadStreamMutation, { data, loading, error }] = useTerminateUploadStreamMutation({
  *   variables: {
  *      videoId: // value for 'videoId'
+ *      videoName: // value for 'videoName'
+ *      gameType: // value for 'gameType'
+ *      tableSize: // value for 'tableSize'
  *   },
  * });
  */

src/operations/feed.gql

@@ -0,0 +1,48 @@
+query GetFeed(
+  $first: Int! = 5,
+  $after: String = null,
+  $includeTotalShotsMade: Boolean! = false,
+  $includeMakePercentage: Boolean! = false,
+  $includeMedianRun: Boolean! = false,
+  $includeAverageTimeBetweenShots: Boolean! = false,
+  $includeElapsedTime: Boolean! = false,
+  $includeFramesPerSecond: Boolean! = false,
+  $includeStream: Boolean! = false
+) {
+  getVideoFeedForUser(first: $first, after: $after) {
+    videos {
+      id
+      name
+      totalShotsMade @include(if: $includeTotalShotsMade)
+      totalShots
+      makePercentage @include(if: $includeMakePercentage)
+      medianRun @include(if: $includeMedianRun)
+      averageTimeBetweenShots @include(if: $includeAverageTimeBetweenShots)
+      createdAt
+      updatedAt
+      shots {
+        id
+        videoId
+        startFrame
+        endFrame
+        createdAt
+        updatedAt
+      }
+      startTime
+      endTime
+      elapsedTime @include(if: $includeElapsedTime)
+      stream @include(if: $includeStream) {
+        id
+        linksRequested
+        uploadsCompleted
+        isCompleted
+        createdAt
+        updatedAt
+      }
+    }
+    pageInfo {
+      hasNextPage
+      endCursor
+    }
+  }
+}

src/operations/video_upload.gql

@@ -1,13 +1,13 @@
 mutation CreateUploadStream(
-  $videoName: String!,
+  $videoName: String!
-  $deviceType: DeviceTypeEnum,
+  $deviceType: DeviceTypeEnum
-  $osVersion: String,
+  $osVersion: String
-  $appVersion: String,
+  $appVersion: String
-  $browserName: String,
+  $browserName: String
-  $browserVersion: String,
+  $browserVersion: String
-  $locale: String,
+  $locale: String
-  $timezone: String,
+  $timezone: String
-  $networkType: String,
+  $networkType: String
   $ipAddress: String
 ) {
   createUploadStream(
@@ -28,13 +28,22 @@ mutation CreateUploadStream(
   }
 }
 
-mutation GetUploadLink($videoId: Int!, $chunkIndex: Int!) {
+mutation GetUploadLink($videoId: Int!, $segmentIndex: Int!) {
-  getUploadLink(videoId: $videoId, chunkIndex: $chunkIndex) {
+  getUploadLink(videoId: $videoId, segmentIndex: $segmentIndex) {
     uploadUrl
-    linksRequested
   }
 }
 
-mutation TerminateUploadStream($videoId: Int!) {
+mutation TerminateUploadStream(
-  terminateUploadStream(videoId: $videoId) 
+  $videoId: Int!
+  $videoName: String
+  $gameType: String
+  $tableSize: String
+) {
+  terminateUploadStream(
+    videoId: $videoId
+    videoName: $videoName
+    gameType: $gameType
+    tableSize: $tableSize
+  )
 }

src/schema.gql

@@ -1,9 +1,11 @@
 type Query {
   getAggregateShots(bucketSets: [BucketSetInputGQL!]!): [AggregateResultGQL!]!
   getUser(userId: Int!): UserGQL
+  getLoggedInUser: UserGQL
   getVideo(videoId: Int!): VideoGQL!
   getShots(filterInput: FilterInput = null): [ShotGQL!]!
   getBucketSet(keyName: String!): BucketSetGQL
+  getVideoFeedForUser(first: Int! = 5, after: String = null): VideoFeedGQL!
 }
 
 type AggregateResultGQL {
@@ -40,6 +42,7 @@ input BucketInputGQL {
 
 type UserGQL {
   id: Int!
+  firebaseUid: String!
   username: String!
   createdAt: DateTime
   updatedAt: DateTime
@@ -63,19 +66,19 @@ scalar Decimal
 
 type VideoGQL {
   id: Int!
+  name: String!
   totalShotsMade: Int!
   totalShots: Int!
-  makePercentage: Decimal!
+  makePercentage: Float!
-  medianRun: Decimal!
+  medianRun: Float
-  averageTimeBetweenShots: Decimal
+  averageTimeBetweenShots: Float
   createdAt: DateTime!
   updatedAt: DateTime!
   shots: [ShotGQL!]!
   startTime: DateTime!
   endTime: DateTime!
-  elapsedTime: Decimal!
+  elapsedTime: Float
   framesPerSecond: Int!
-  totalFrames: Int!
   stream: UploadStreamGQL
 }
 
@@ -222,12 +225,21 @@ type BucketSetGQL {
   buckets: [BucketGQL!]!
 }
 
+type VideoFeedGQL {
+  videos: [VideoGQL!]!
+  pageInfo: PageInfoGQL!
+}
+
+type PageInfoGQL {
+  hasNextPage: Boolean!
+  endCursor: String
+}
+
 type Mutation {
   createBucketSet(params: CreateBucketSetInput!): BucketSetGQL!
-  processVideoSource(input: ProcessVideoSourceInput!): ProcessVideoSourceReturn!
   createUploadStream(uploadMetadata: UploadMetadataInput, videoName: String = null): CreateUploadStreamReturn!
-  getUploadLink(videoId: Int!, chunkIndex: Int!): GetUploadLinkReturn!
+  getUploadLink(videoId: Int!, segmentIndex: Int!): GetUploadLinkReturn!
-  terminateUploadStream(videoId: Int!): Boolean!
+  terminateUploadStream(videoId: Int!, videoName: String = null, gameType: String = null, tableSize: String = null): Boolean!
 }
 
 input CreateBucketSetInput {
@@ -236,14 +248,6 @@ input CreateBucketSetInput {
   buckets: [BucketInputGQL!]!
 }
 
-type ProcessVideoSourceReturn {
-  val: Int!
-}
-
-input ProcessVideoSourceInput {
-  val: Int!
-}
-
 type CreateUploadStreamReturn {
   videoId: Int!
 }
@@ -262,6 +266,4 @@ input UploadMetadataInput {
 
 type GetUploadLinkReturn {
   uploadUrl: String!
-  linksRequested: Int!
-  uploadsCompleted: Int!
 }