Merge pull request 'Use pocketing intention fragment to prevent cache merge issues' (#180) from loewy/update-runs-operations into master

Reviewed-on: #180

src/index.tsx

@@ -2239,6 +2239,7 @@ export type Mutation = {
   getHlsInitUploadLink: GetUploadLinkReturn;
   getProfileImageUploadLink: GetProfileUploadLinkReturn;
   getUploadLink: GetUploadLinkReturn;
+  reactToVideo: Scalars["Boolean"]["output"];
   retireTags: Scalars["Boolean"]["output"];
   setLoggerLevel: Scalars["Boolean"]["output"];
   setSegmentDuration: Scalars["Boolean"]["output"];
@@ -2309,6 +2310,11 @@ export type MutationGetUploadLinkArgs = {
   videoId: Scalars["Int"]["input"];
 };
 
+export type MutationReactToVideoArgs = {
+  reaction?: InputMaybe<ReactionEnum>;
+  videoId: Scalars["Int"]["input"];
+};
+
 export type MutationRetireTagsArgs = {
   tagIds: Array<Scalars["Int"]["input"]>;
 };
@@ -2565,6 +2571,22 @@ export type QueryWaitForArgs = {
   duration: Scalars["Float"]["input"];
 };
 
+export enum ReactionEnum {
+  Bullseye = "BULLSEYE",
+  Heart = "HEART",
+  Hundred = "HUNDRED",
+  Like = "LIKE",
+}
+
+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>;
@@ -3000,6 +3022,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"]>;
@@ -3187,6 +3210,23 @@ export type GetFeedQuery = {
           status: ProcessingStatusEnum;
         }>;
       } | null;
+      reactions: Array<{
+        __typename?: "ReactionGQL";
+        videoId: number;
+        reaction: ReactionEnum;
+        user: {
+          __typename?: "UserGQL";
+          id: number;
+          username: string;
+          profileImageUri?: string | null;
+          followers?: Array<{
+            __typename?: "UserGQL";
+            id: number;
+            username: string;
+            profileImageUri?: string | null;
+          }> | null;
+        };
+      }>;
     }>;
     pageInfo: {
       __typename?: "PageInfoGQL";
@@ -3240,6 +3280,23 @@ export type VideoCardFieldsFragment = {
       status: ProcessingStatusEnum;
     }>;
   } | null;
+  reactions: Array<{
+    __typename?: "ReactionGQL";
+    videoId: number;
+    reaction: ReactionEnum;
+    user: {
+      __typename?: "UserGQL";
+      id: number;
+      username: string;
+      profileImageUri?: string | null;
+      followers?: Array<{
+        __typename?: "UserGQL";
+        id: number;
+        username: string;
+        profileImageUri?: string | null;
+      }> | null;
+    };
+  }>;
 };
 
 export type GetVideoFeedQueryVariables = Exact<{
@@ -3302,6 +3359,23 @@ export type GetVideoFeedQuery = {
           status: ProcessingStatusEnum;
         }>;
       } | null;
+      reactions: Array<{
+        __typename?: "ReactionGQL";
+        videoId: number;
+        reaction: ReactionEnum;
+        user: {
+          __typename?: "UserGQL";
+          id: number;
+          username: string;
+          profileImageUri?: string | null;
+          followers?: Array<{
+            __typename?: "UserGQL";
+            id: number;
+            username: string;
+            profileImageUri?: string | null;
+          }> | null;
+        };
+      }>;
     }>;
     pageInfo: {
       __typename?: "PageInfoGQL";
@@ -3505,10 +3579,22 @@ export type GetMedalsQuery = {
   };
 };
 
+export type ReactToVideoMutationVariables = Exact<{
+  videoId: Scalars["Int"]["input"];
+  reaction?: InputMaybe<ReactionEnum>;
+}>;
+
+export type ReactToVideoMutation = {
+  __typename?: "Mutation";
+  reactToVideo: boolean;
+};
+
 export type GetRunsForHighlightsQueryVariables = Exact<{
   filterInput: RunFilterInput;
   runIds?: InputMaybe<Array<Scalars["Int"]["input"]> | Scalars["Int"]["input"]>;
   runsOrdering?: InputMaybe<GetRunsOrdering>;
+  limit?: Scalars["Int"]["input"];
+  countRespectsLimit?: Scalars["Boolean"]["input"];
 }>;
 
 export type GetRunsForHighlightsQuery = {
@@ -3528,6 +3614,55 @@ export type GetRunsForHighlightsQuery = {
   };
 };
 
+export type PocketingIntentionFragmentFragment = {
+  __typename?: "PocketingIntentionFeaturesGQL";
+  make?: boolean | null;
+  targetPocketDistance?: number | null;
+  targetPocketAngle?: number | null;
+  targetPocketAngleDirection?: ShotDirectionEnum | null;
+  marginOfErrorInDegrees?: number | null;
+  intendedPocketType?: PocketEnum | null;
+  difficulty?: number | null;
+};
+
+export type GetRunsWithTimestampsQueryVariables = Exact<{
+  filterInput: RunFilterInput;
+  runIds?: InputMaybe<Array<Scalars["Int"]["input"]> | Scalars["Int"]["input"]>;
+  runsOrdering?: InputMaybe<GetRunsOrdering>;
+}>;
+
+export type GetRunsWithTimestampsQuery = {
+  __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;
+        createdAt?: any | null;
+        pocketingIntentionFeatures?: {
+          __typename?: "PocketingIntentionFeaturesGQL";
+          make?: boolean | null;
+          targetPocketDistance?: number | null;
+          targetPocketAngle?: number | null;
+          targetPocketAngleDirection?: ShotDirectionEnum | null;
+          marginOfErrorInDegrees?: number | null;
+          intendedPocketType?: PocketEnum | null;
+          difficulty?: number | null;
+        } | null;
+      }>;
+    }>;
+  };
+};
+
 export type GetSerializedShotPathsQueryVariables = Exact<{
   filterInput: FilterInput;
 }>;
@@ -4983,6 +5118,20 @@ export const VideoCardFieldsFragmentDoc = gql`
         status
       }
     }
+    reactions {
+      videoId
+      user {
+        id
+        username
+        profileImageUri
+        followers {
+          id
+          username
+          profileImageUri
+        }
+      }
+      reaction
+    }
   }
 `;
 export const MedalFieldsFragmentDoc = gql`
@@ -4991,6 +5140,17 @@ export const MedalFieldsFragmentDoc = gql`
     nickname
   }
 `;
+export const PocketingIntentionFragmentFragmentDoc = gql`
+  fragment PocketingIntentionFragment on PocketingIntentionFeaturesGQL {
+    make
+    targetPocketDistance
+    targetPocketAngle
+    targetPocketAngleDirection
+    marginOfErrorInDegrees
+    intendedPocketType
+    difficulty
+  }
+`;
 export const ShotWithAllFeaturesFragmentDoc = gql`
   fragment ShotWithAllFeatures on ShotGQL {
     id
@@ -5908,16 +6068,69 @@ export type GetMedalsQueryResult = Apollo.QueryResult<
   GetMedalsQuery,
   GetMedalsQueryVariables
 >;
+export const ReactToVideoDocument = gql`
+  mutation ReactToVideo($videoId: Int!, $reaction: ReactionEnum) {
+    reactToVideo(videoId: $videoId, reaction: $reaction)
+  }
+`;
+export type ReactToVideoMutationFn = Apollo.MutationFunction<
+  ReactToVideoMutation,
+  ReactToVideoMutationVariables
+>;
+
+/**
+ * __useReactToVideoMutation__
+ *
+ * To run a mutation, you first call `useReactToVideoMutation` within a React component and pass it any options that fit your needs.
+ * When your component renders, `useReactToVideoMutation` returns a tuple that includes:
+ * - A mutate function that you can call at any time to execute the mutation
+ * - An object with fields that represent the current status of the mutation's execution
+ *
+ * @param baseOptions options that will be passed into the mutation, supported options are listed on: https://www.apollographql.com/docs/react/api/react-hooks/#options-2;
+ *
+ * @example
+ * const [reactToVideoMutation, { data, loading, error }] = useReactToVideoMutation({
+ *   variables: {
+ *      videoId: // value for 'videoId'
+ *      reaction: // value for 'reaction'
+ *   },
+ * });
+ */
+export function useReactToVideoMutation(
+  baseOptions?: Apollo.MutationHookOptions<
+    ReactToVideoMutation,
+    ReactToVideoMutationVariables
+  >,
+) {
+  const options = { ...defaultOptions, ...baseOptions };
+  return Apollo.useMutation<
+    ReactToVideoMutation,
+    ReactToVideoMutationVariables
+  >(ReactToVideoDocument, options);
+}
+export type ReactToVideoMutationHookResult = ReturnType<
+  typeof useReactToVideoMutation
+>;
+export type ReactToVideoMutationResult =
+  Apollo.MutationResult<ReactToVideoMutation>;
+export type ReactToVideoMutationOptions = Apollo.BaseMutationOptions<
+  ReactToVideoMutation,
+  ReactToVideoMutationVariables
+>;
 export const GetRunsForHighlightsDocument = gql`
   query GetRunsForHighlights(
     $filterInput: RunFilterInput!
     $runIds: [Int!] = null
     $runsOrdering: GetRunsOrdering
+    $limit: Int! = 500
+    $countRespectsLimit: Boolean! = false
   ) {
     getRuns(
       filterInput: $filterInput
       runIds: $runIds
       runsOrdering: $runsOrdering
+      limit: $limit
+      countRespectsLimit: $countRespectsLimit
     ) {
       count
       runs {
@@ -5950,6 +6163,8 @@ export const GetRunsForHighlightsDocument = gql`
  *      filterInput: // value for 'filterInput'
  *      runIds: // value for 'runIds'
  *      runsOrdering: // value for 'runsOrdering'
+ *      limit: // value for 'limit'
+ *      countRespectsLimit: // value for 'countRespectsLimit'
  *   },
  * });
  */
@@ -6002,6 +6217,105 @@ export type GetRunsForHighlightsQueryResult = Apollo.QueryResult<
   GetRunsForHighlightsQuery,
   GetRunsForHighlightsQueryVariables
 >;
+export const GetRunsWithTimestampsDocument = gql`
+  query GetRunsWithTimestamps(
+    $filterInput: RunFilterInput!
+    $runIds: [Int!] = null
+    $runsOrdering: GetRunsOrdering
+  ) {
+    getRuns(
+      filterInput: $filterInput
+      runIds: $runIds
+      runsOrdering: $runsOrdering
+    ) {
+      count
+      runs {
+        id
+        runLength
+        userId
+        videoId
+        shots {
+          videoId
+          id
+          createdAt
+          pocketingIntentionFeatures {
+            ...PocketingIntentionFragment
+          }
+        }
+      }
+      runIds
+    }
+  }
+  ${PocketingIntentionFragmentFragmentDoc}
+`;
+
+/**
+ * __useGetRunsWithTimestampsQuery__
+ *
+ * To run a query within a React component, call `useGetRunsWithTimestampsQuery` and pass it any options that fit your needs.
+ * When your component renders, `useGetRunsWithTimestampsQuery` 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 } = useGetRunsWithTimestampsQuery({
+ *   variables: {
+ *      filterInput: // value for 'filterInput'
+ *      runIds: // value for 'runIds'
+ *      runsOrdering: // value for 'runsOrdering'
+ *   },
+ * });
+ */
+export function useGetRunsWithTimestampsQuery(
+  baseOptions: Apollo.QueryHookOptions<
+    GetRunsWithTimestampsQuery,
+    GetRunsWithTimestampsQueryVariables
+  >,
+) {
+  const options = { ...defaultOptions, ...baseOptions };
+  return Apollo.useQuery<
+    GetRunsWithTimestampsQuery,
+    GetRunsWithTimestampsQueryVariables
+  >(GetRunsWithTimestampsDocument, options);
+}
+export function useGetRunsWithTimestampsLazyQuery(
+  baseOptions?: Apollo.LazyQueryHookOptions<
+    GetRunsWithTimestampsQuery,
+    GetRunsWithTimestampsQueryVariables
+  >,
+) {
+  const options = { ...defaultOptions, ...baseOptions };
+  return Apollo.useLazyQuery<
+    GetRunsWithTimestampsQuery,
+    GetRunsWithTimestampsQueryVariables
+  >(GetRunsWithTimestampsDocument, options);
+}
+export function useGetRunsWithTimestampsSuspenseQuery(
+  baseOptions?: Apollo.SuspenseQueryHookOptions<
+    GetRunsWithTimestampsQuery,
+    GetRunsWithTimestampsQueryVariables
+  >,
+) {
+  const options = { ...defaultOptions, ...baseOptions };
+  return Apollo.useSuspenseQuery<
+    GetRunsWithTimestampsQuery,
+    GetRunsWithTimestampsQueryVariables
+  >(GetRunsWithTimestampsDocument, options);
+}
+export type GetRunsWithTimestampsQueryHookResult = ReturnType<
+  typeof useGetRunsWithTimestampsQuery
+>;
+export type GetRunsWithTimestampsLazyQueryHookResult = ReturnType<
+  typeof useGetRunsWithTimestampsLazyQuery
+>;
+export type GetRunsWithTimestampsSuspenseQueryHookResult = ReturnType<
+  typeof useGetRunsWithTimestampsSuspenseQuery
+>;
+export type GetRunsWithTimestampsQueryResult = Apollo.QueryResult<
+  GetRunsWithTimestampsQuery,
+  GetRunsWithTimestampsQueryVariables
+>;
 export const GetSerializedShotPathsDocument = gql`
   query GetSerializedShotPaths($filterInput: FilterInput!) {
     getShots(filterInput: $filterInput) {

src/operations/feed.gql

@@ -58,6 +58,20 @@ fragment VideoCardFields on VideoGQL {
       status
     }
   }
+  reactions {
+    videoId
+    user {
+      id
+      username
+      profileImageUri
+      followers {
+        id
+        username
+        profileImageUri
+      }
+    }
+    reaction
+  }
 }
 
 query GetVideoFeed(

src/operations/reactions.gql

@@ -0,0 +1,3 @@
+mutation ReactToVideo($videoId: Int!, $reaction: ReactionEnum) {
+  reactToVideo(videoId: $videoId, reaction: $reaction)
+}

src/operations/runs.gql

@@ -2,6 +2,45 @@ query GetRunsForHighlights(
   $filterInput: RunFilterInput!
   $runIds: [Int!] = null
   $runsOrdering: GetRunsOrdering
+  $limit: Int! = 500
+  $countRespectsLimit: Boolean! = false
+) {
+  getRuns(
+    filterInput: $filterInput
+    runIds: $runIds
+    runsOrdering: $runsOrdering
+    limit: $limit
+    countRespectsLimit: $countRespectsLimit
+  ) {
+    count
+    runs {
+      id
+      runLength
+      userId
+      videoId
+      shots {
+        videoId
+        id
+      }
+    }
+    runIds
+  }
+}
+
+fragment PocketingIntentionFragment on PocketingIntentionFeaturesGQL {
+  make
+  targetPocketDistance
+  targetPocketAngle
+  targetPocketAngleDirection
+  marginOfErrorInDegrees
+  intendedPocketType
+  difficulty
+}
+
+query GetRunsWithTimestamps(
+  $filterInput: RunFilterInput!
+  $runIds: [Int!] = null
+  $runsOrdering: GetRunsOrdering
 ) {
   getRuns(
     filterInput: $filterInput
@@ -17,6 +56,10 @@ query GetRunsForHighlights(
       shots {
         videoId
         id
+        createdAt
+        pocketingIntentionFeatures {
+          ...PocketingIntentionFragment
+        }
       }
     }
     runIds

src/schema.gql

@@ -479,6 +479,7 @@ type VideoGQL {
   currentHomography: HomographyInfoGQL
   homographyHistory: [HomographyInfoGQL!]!
   currentProcessing: VideoProcessingGQL
+  reactions: [ReactionGQL!]!
 }
 
 type UploadStreamGQL {
@@ -612,6 +613,21 @@ type VideoProcessingStatusGQL {
   updatedAt: DateTime
 }
 
+type ReactionGQL {
+  videoId: Int!
+  user: UserGQL!
+  reaction: ReactionEnum!
+  createdAt: DateTime
+  updatedAt: DateTime
+}
+
+enum ReactionEnum {
+  LIKE
+  HEART
+  BULLSEYE
+  HUNDRED
+}
+
 type RunFeaturesGQL {
   runId: Int!
   indexInRun: Int!
@@ -801,6 +817,7 @@ type Mutation {
   editUploadStream(videoId: Int!, videoMetadata: VideoMetadataInput!): Boolean!
   deleteVideo(videoId: Int!): Boolean!
   deleteTags(videoId: Int!, tagsToDelete: [VideoTagInput!]!): Boolean!
+  reactToVideo(videoId: Int!, reaction: ReactionEnum): Boolean!
 }
 
 input CreateBucketSetInput {