Merge branch 'master' into mk/video-reaction

Reviewed-on: #166

src/client-schema.gql

@@ -1,9 +1,16 @@
 # see: https://www.apollographql.com/docs/react/local-state/managing-state-with-field-policies/
 directive @client on FIELD
 
+type SegmentInfo {
+  index: Int!
+  time: Float!
+}
+
 extend type ShotGQL {
   startTime: Float!
   endTime: Float!
+  startSegment: SegmentInfo!
+  endSegment: SegmentInfo!
 }
 
 extend type UploadStreamGQL {

src/index.tsx

@@ -2153,6 +2153,7 @@ export type Mutation = {
   getHlsInitUploadLink: GetUploadLinkReturn;
   getProfileImageUploadLink: GetProfileUploadLinkReturn;
   getUploadLink: GetUploadLinkReturn;
+  reactToVideo: Scalars["Boolean"]["output"];
   setLoggerLevel: Scalars["Boolean"]["output"];
   setSegmentDuration: Scalars["Boolean"]["output"];
   unfollowUser: UserGql;
@@ -2217,6 +2218,11 @@ export type MutationGetUploadLinkArgs = {
   videoId: Scalars["Int"]["input"];
 };
 
+export type MutationReactToVideoArgs = {
+  reaction: ReactionEnum;
+  videoId: Scalars["Int"]["input"];
+};
+
 export type MutationSetLoggerLevelArgs = {
   level: Scalars["String"]["input"];
   path: Scalars["String"]["input"];
@@ -2465,6 +2471,23 @@ export type QueryWaitForArgs = {
   duration: Scalars["Float"]["input"];
 };
 
+export enum ReactionEnum {
+  Bullseye = "BULLSEYE",
+  Heart = "HEART",
+  Hundred = "HUNDRED",
+  Like = "LIKE",
+  None = "NONE",
+}
+
+export type ReactionGql = {
+  __typename?: "ReactionGQL";
+  createdAt?: Maybe<Scalars["DateTime"]["output"]>;
+  reaction: ReactionEnum;
+  updatedAt?: Maybe<Scalars["DateTime"]["output"]>;
+  user: UserGql;
+  videoId: Scalars["Int"]["output"];
+};
+
 export type RequestedMedalsGql = {
   __typename?: "RequestedMedalsGQL";
   dailyMakes50?: Maybe<MedalGql>;
@@ -2556,6 +2579,12 @@ export type SegmentEndFramesGql = {
   segmentEndFrames: Array<Scalars["Int"]["output"]>;
 };
 
+export type SegmentInfo = {
+  __typename?: "SegmentInfo";
+  index: Scalars["Int"]["output"];
+  time: Scalars["Float"]["output"];
+};
+
 export type SegmentStartTimesGql = {
   __typename?: "SegmentStartTimesGQL";
   id: Scalars["Int"]["output"];
@@ -2608,6 +2637,7 @@ export type ShotGql = {
   createdAt?: Maybe<Scalars["DateTime"]["output"]>;
   cueObjectFeatures?: Maybe<CueObjectFeaturesGql>;
   endFrame: Scalars["Int"]["output"];
+  endSegment: SegmentInfo;
   endTime: Scalars["Float"]["output"];
   falsePositiveScore?: Maybe<Scalars["Float"]["output"]>;
   id: Scalars["Int"]["output"];
@@ -2617,6 +2647,7 @@ export type ShotGql = {
   runFeatures?: Maybe<RunFeaturesGql>;
   serializedShotPaths?: Maybe<SerializedShotPathsGql>;
   startFrame: Scalars["Int"]["output"];
+  startSegment: SegmentInfo;
   startTime: Scalars["Float"]["output"];
   updatedAt?: Maybe<Scalars["DateTime"]["output"]>;
   user?: Maybe<UserGql>;
@@ -2708,13 +2739,19 @@ export type SuccessfulAddAddShotAnnotationErrors =
   | AddShotAnnotationErrors
   | SuccessfulAdd;
 
-export type TagGql = {
+export type TagClassGql = {
-  __typename?: "TagGQL";
+  __typename?: "TagClassGQL";
-  group?: Maybe<Scalars["String"]["output"]>;
   id: Scalars["Int"]["output"];
   name: Scalars["String"]["output"];
 };
 
+export type TagGql = {
+  __typename?: "TagGQL";
+  id: Scalars["Int"]["output"];
+  name: Scalars["String"]["output"];
+  tagClasses?: Maybe<Array<TagClassGql>>;
+};
+
 export type TargetMetricsGql = {
   __typename?: "TargetMetricsGQL";
   averageDifficulty?: Maybe<Scalars["Float"]["output"]>;
@@ -2869,6 +2906,7 @@ export type VideoFilterInput = {
 
 export type VideoGql = {
   __typename?: "VideoGQL";
+  averageDifficulty?: Maybe<Scalars["Float"]["output"]>;
   averageTimeBetweenShots?: Maybe<Scalars["Float"]["output"]>;
   createdAt?: Maybe<Scalars["DateTime"]["output"]>;
   currentHomography?: Maybe<HomographyInfoGql>;
@@ -2884,6 +2922,7 @@ export type VideoGql = {
   owner?: Maybe<UserGql>;
   playlist?: Maybe<HlsPlaylistGql>;
   private: Scalars["Boolean"]["output"];
+  reactions: Array<ReactionGql>;
   screenshotUri?: Maybe<Scalars["String"]["output"]>;
   shots: Array<ShotGql>;
   startTime?: Maybe<Scalars["DateTime"]["output"]>;
@@ -2906,6 +2945,7 @@ export type VideoMetadataInput = {
   endStream?: Scalars["Boolean"]["input"];
   endTime?: InputMaybe<Scalars["DateTime"]["input"]>;
   framesPerSecond?: InputMaybe<Scalars["Float"]["input"]>;
+  /** @deprecated `game_type` is deprecated. Use `tags` instead. */
   gameType?: InputMaybe<Scalars["String"]["input"]>;
   lastIntendedSegmentBound?: InputMaybe<Scalars["Int"]["input"]>;
   private?: InputMaybe<Scalars["Boolean"]["input"]>;
@@ -2913,6 +2953,8 @@ export type VideoMetadataInput = {
   startTime?: InputMaybe<Scalars["DateTime"]["input"]>;
   streamSegmentType?: InputMaybe<StreamSegmentTypeEnum>;
   tableSize?: InputMaybe<Scalars["Float"]["input"]>;
+  /** A list of tags associated with the video. Replace `game_type` */
+  tags?: InputMaybe<Array<VideoTagInput>>;
   videoName?: InputMaybe<Scalars["String"]["input"]>;
 };
 
@@ -3029,6 +3071,8 @@ export type GetFeedQuery = {
       totalShotsMade: number;
       totalShots: number;
       makePercentage: number;
+      averageTimeBetweenShots?: number | null;
+      averageDifficulty?: number | null;
       createdAt?: any | null;
       updatedAt?: any | null;
       startTime?: any | null;
@@ -3083,6 +3127,8 @@ export type VideoCardFieldsFragment = {
   totalShotsMade: number;
   totalShots: number;
   makePercentage: number;
+  averageTimeBetweenShots?: number | null;
+  averageDifficulty?: number | null;
   createdAt?: any | null;
   updatedAt?: any | null;
   startTime?: any | null;
@@ -3140,6 +3186,8 @@ export type GetVideoFeedQuery = {
       totalShotsMade: number;
       totalShots: number;
       makePercentage: number;
+      averageTimeBetweenShots?: number | null;
+      averageDifficulty?: number | null;
       createdAt?: any | null;
       updatedAt?: any | null;
       startTime?: any | null;
@@ -3380,6 +3428,29 @@ export type GetMedalsQuery = {
   };
 };
 
+export type GetRunsForHighlightsQueryVariables = Exact<{
+  filterInput: RunFilterInput;
+  runIds?: InputMaybe<Array<Scalars["Int"]["input"]> | Scalars["Int"]["input"]>;
+  runsOrdering?: InputMaybe<GetRunsOrdering>;
+}>;
+
+export type GetRunsForHighlightsQuery = {
+  __typename?: "Query";
+  getRuns: {
+    __typename?: "GetRunsResult";
+    count?: number | null;
+    runIds: Array<number>;
+    runs: Array<{
+      __typename?: "RunGQL";
+      id: number;
+      runLength: number;
+      userId: number;
+      videoId: number;
+      shots: Array<{ __typename?: "ShotGQL"; videoId: number; id: number }>;
+    }>;
+  };
+};
+
 export type GetSerializedShotPathsQueryVariables = Exact<{
   filterInput: FilterInput;
 }>;
@@ -3507,6 +3578,8 @@ export type GetShotsWithMetadataFilterResultQuery = {
       falsePositiveScore?: number | null;
       createdAt?: any | null;
       updatedAt?: any | null;
+      startSegment: { __typename?: "SegmentInfo"; index: number; time: number };
+      endSegment: { __typename?: "SegmentInfo"; index: number; time: number };
       user?: { __typename?: "UserGQL"; id: number } | null;
       cueObjectFeatures?: {
         __typename?: "CueObjectFeaturesGQL";
@@ -3574,6 +3647,8 @@ export type GetShotsWithMetadataQuery = {
       falsePositiveScore?: number | null;
       createdAt?: any | null;
       updatedAt?: any | null;
+      startSegment: { __typename?: "SegmentInfo"; index: number; time: number };
+      endSegment: { __typename?: "SegmentInfo"; index: number; time: number };
       user?: { __typename?: "UserGQL"; id: number } | null;
       cueObjectFeatures?: {
         __typename?: "CueObjectFeaturesGQL";
@@ -3634,6 +3709,8 @@ export type GetShotsByIdsQuery = {
     falsePositiveScore?: number | null;
     createdAt?: any | null;
     updatedAt?: any | null;
+    startSegment: { __typename?: "SegmentInfo"; index: number; time: number };
+    endSegment: { __typename?: "SegmentInfo"; index: number; time: number };
     user?: { __typename?: "UserGQL"; id: number } | null;
     cueObjectFeatures?: {
       __typename?: "CueObjectFeaturesGQL";
@@ -3683,6 +3760,8 @@ export type ShotWithAllFeaturesFragment = {
   falsePositiveScore?: number | null;
   createdAt?: any | null;
   updatedAt?: any | null;
+  startSegment: { __typename?: "SegmentInfo"; index: number; time: number };
+  endSegment: { __typename?: "SegmentInfo"; index: number; time: number };
   user?: { __typename?: "UserGQL"; id: number } | null;
   cueObjectFeatures?: {
     __typename?: "CueObjectFeaturesGQL";
@@ -3745,6 +3824,8 @@ export type EditShotMutation = {
       falsePositiveScore?: number | null;
       createdAt?: any | null;
       updatedAt?: any | null;
+      startSegment: { __typename?: "SegmentInfo"; index: number; time: number };
+      endSegment: { __typename?: "SegmentInfo"; index: number; time: number };
       user?: { __typename?: "UserGQL"; id: number } | null;
       cueObjectFeatures?: {
         __typename?: "CueObjectFeaturesGQL";
@@ -3927,7 +4008,16 @@ export type GetUserTagsQueryVariables = Exact<{ [key: string]: never }>;
 
 export type GetUserTagsQuery = {
   __typename?: "Query";
-  getUserTags: Array<{ __typename?: "TagGQL"; id: number; name: string }>;
+  getUserTags: Array<{
+    __typename?: "TagGQL";
+    id: number;
+    name: string;
+    tagClasses?: Array<{
+      __typename?: "TagClassGQL";
+      id: number;
+      name: string;
+    }> | null;
+  }>;
 };
 
 export type FollowUserMutationVariables = Exact<{
@@ -4766,6 +4856,8 @@ export const VideoCardFieldsFragmentDoc = gql`
     totalShotsMade
     totalShots
     makePercentage
+    averageTimeBetweenShots
+    averageDifficulty
     createdAt
     updatedAt
     startTime
@@ -4811,6 +4903,14 @@ export const ShotWithAllFeaturesFragmentDoc = gql`
     endFrame
     startTime @client
     endTime @client
+    startSegment @client {
+      index
+      time
+    }
+    endSegment @client {
+      index
+      time
+    }
     user {
       id
     }
@@ -5712,6 +5812,100 @@ export type GetMedalsQueryResult = Apollo.QueryResult<
   GetMedalsQuery,
   GetMedalsQueryVariables
 >;
+export const GetRunsForHighlightsDocument = gql`
+  query GetRunsForHighlights(
+    $filterInput: RunFilterInput!
+    $runIds: [Int!] = null
+    $runsOrdering: GetRunsOrdering
+  ) {
+    getRuns(
+      filterInput: $filterInput
+      runIds: $runIds
+      runsOrdering: $runsOrdering
+    ) {
+      count
+      runs {
+        id
+        runLength
+        userId
+        videoId
+        shots {
+          videoId
+          id
+        }
+      }
+      runIds
+    }
+  }
+`;
+
+/**
+ * __useGetRunsForHighlightsQuery__
+ *
+ * To run a query within a React component, call `useGetRunsForHighlightsQuery` and pass it any options that fit your needs.
+ * When your component renders, `useGetRunsForHighlightsQuery` 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 } = useGetRunsForHighlightsQuery({
+ *   variables: {
+ *      filterInput: // value for 'filterInput'
+ *      runIds: // value for 'runIds'
+ *      runsOrdering: // value for 'runsOrdering'
+ *   },
+ * });
+ */
+export function useGetRunsForHighlightsQuery(
+  baseOptions: Apollo.QueryHookOptions<
+    GetRunsForHighlightsQuery,
+    GetRunsForHighlightsQueryVariables
+  >,
+) {
+  const options = { ...defaultOptions, ...baseOptions };
+  return Apollo.useQuery<
+    GetRunsForHighlightsQuery,
+    GetRunsForHighlightsQueryVariables
+  >(GetRunsForHighlightsDocument, options);
+}
+export function useGetRunsForHighlightsLazyQuery(
+  baseOptions?: Apollo.LazyQueryHookOptions<
+    GetRunsForHighlightsQuery,
+    GetRunsForHighlightsQueryVariables
+  >,
+) {
+  const options = { ...defaultOptions, ...baseOptions };
+  return Apollo.useLazyQuery<
+    GetRunsForHighlightsQuery,
+    GetRunsForHighlightsQueryVariables
+  >(GetRunsForHighlightsDocument, options);
+}
+export function useGetRunsForHighlightsSuspenseQuery(
+  baseOptions?: Apollo.SuspenseQueryHookOptions<
+    GetRunsForHighlightsQuery,
+    GetRunsForHighlightsQueryVariables
+  >,
+) {
+  const options = { ...defaultOptions, ...baseOptions };
+  return Apollo.useSuspenseQuery<
+    GetRunsForHighlightsQuery,
+    GetRunsForHighlightsQueryVariables
+  >(GetRunsForHighlightsDocument, options);
+}
+export type GetRunsForHighlightsQueryHookResult = ReturnType<
+  typeof useGetRunsForHighlightsQuery
+>;
+export type GetRunsForHighlightsLazyQueryHookResult = ReturnType<
+  typeof useGetRunsForHighlightsLazyQuery
+>;
+export type GetRunsForHighlightsSuspenseQueryHookResult = ReturnType<
+  typeof useGetRunsForHighlightsSuspenseQuery
+>;
+export type GetRunsForHighlightsQueryResult = Apollo.QueryResult<
+  GetRunsForHighlightsQuery,
+  GetRunsForHighlightsQueryVariables
+>;
 export const GetSerializedShotPathsDocument = gql`
   query GetSerializedShotPaths($filterInput: FilterInput!) {
     getShots(filterInput: $filterInput) {
@@ -6932,6 +7126,10 @@ export const GetUserTagsDocument = gql`
     getUserTags {
       id
       name
+      tagClasses {
+        id
+        name
+      }
     }
   }
 `;

src/operations/feed.gql

@@ -27,6 +27,8 @@ fragment VideoCardFields on VideoGQL {
   totalShotsMade
   totalShots
   makePercentage
+  averageTimeBetweenShots
+  averageDifficulty
   createdAt
   updatedAt
   startTime

src/operations/runs.gql

@@ -0,0 +1,24 @@
+query GetRunsForHighlights(
+  $filterInput: RunFilterInput!
+  $runIds: [Int!] = null
+  $runsOrdering: GetRunsOrdering
+) {
+  getRuns(
+    filterInput: $filterInput
+    runIds: $runIds
+    runsOrdering: $runsOrdering
+  ) {
+    count
+    runs {
+      id
+      runLength
+      userId
+      videoId
+      shots {
+        videoId
+        id
+      }
+    }
+    runIds
+  }
+}

src/operations/shots.gql

@@ -139,6 +139,14 @@ fragment ShotWithAllFeatures on ShotGQL {
   endFrame
   startTime @client
   endTime @client
+  startSegment @client {
+    index
+    time
+  }
+  endSegment @client {
+    index
+    time
+  }
   user {
     id
   }

src/operations/user.gql

@@ -79,6 +79,10 @@ query GetUserTags {
   getUserTags {
     id
     name
+    tagClasses {
+      id
+      name
+    }
   }
 }
 

src/schema.gql

@@ -462,6 +462,7 @@ type VideoGQL {
   makePercentage: Float!
   medianRun: Float
   averageTimeBetweenShots: Float
+  averageDifficulty: Float
   createdAt: DateTime
   updatedAt: DateTime
   shots: [ShotGQL!]!
@@ -477,6 +478,7 @@ type VideoGQL {
   currentHomography: HomographyInfoGQL
   homographyHistory: [HomographyInfoGQL!]!
   currentProcessing: VideoProcessingGQL
+  reactions: [ReactionGQL!]!
 }
 
 type UploadStreamGQL {
@@ -610,6 +612,22 @@ type VideoProcessingStatusGQL {
   updatedAt: DateTime
 }
 
+type ReactionGQL {
+  videoId: Int!
+  user: UserGQL!
+  reaction: ReactionEnum!
+  createdAt: DateTime
+  updatedAt: DateTime
+}
+
+enum ReactionEnum {
+  LIKE
+  HEART
+  BULLSEYE
+  HUNDRED
+  NONE
+}
+
 type RunFeaturesGQL {
   runId: Int!
   indexInRun: Int!
@@ -714,9 +732,14 @@ type PageInfoGQL {
 }
 
 type TagGQL {
-  name: String!
   id: Int!
-  group: String
+  name: String!
+  tagClasses: [TagClassGQL!]
+}
+
+type TagClassGQL {
+  id: Int!
+  name: String!
 }
 
 """
@@ -791,6 +814,7 @@ type Mutation {
   ): Boolean!
   editUploadStream(videoId: Int!, videoMetadata: VideoMetadataInput!): Boolean!
   deleteVideo(videoId: Int!): Boolean!
+  reactToVideo(videoId: Int!, reaction: ReactionEnum!): Boolean!
 }
 
 input CreateBucketSetInput {
@@ -895,6 +919,12 @@ input VideoMetadataInput {
   startTime: DateTime = null
   endTime: DateTime = null
   gameType: String = null
+    @deprecated(reason: "`game_type` is deprecated. Use `tags` instead.")
+
+  """
+  A list of tags associated with the video. Replace `game_type`
+  """
+  tags: [VideoTagInput!] = null
   tableSize: Float = null
   lastIntendedSegmentBound: Int = null
   streamSegmentType: StreamSegmentTypeEnum = null