Merge pull request 'dean/my-drill-runs' (#257) from dean/my-drill-runs into master

Reviewed-on: #257

src/index.tsx

@@ -79,12 +79,6 @@ export enum AlignedIntervalEnum {
   Year = "YEAR",
 }
 
-export type AppleIapSubscriptionOptionsGql = {
-  __typename?: "AppleIapSubscriptionOptionsGQL";
-  enabled: Scalars["Boolean"]["output"];
-  proMonthlyProductId?: Maybe<Scalars["String"]["output"]>;
-};
-
 export type BankFeaturesGql = {
   __typename?: "BankFeaturesGQL";
   bankAngle: Scalars["Float"]["output"];
@@ -2845,6 +2839,7 @@ export type Query = {
   getLongestRunsLeaderboard: RunLeaderboardGql;
   getMakesLeaderboard: CountLeaderboardGql;
   getMedals: RequestedMedalsGql;
+  getMyDrillRuns: Array<RunGql>;
   getOrderedShots: GetShotsResult;
   getPlayTime: UserPlayTimeGql;
   getQuotaStatus: QuotaStatusGql;
@@ -2904,6 +2899,10 @@ export type QueryGetDrillRunLeaderboardArgs = {
   drillTag: Scalars["String"]["input"];
   interval?: InputMaybe<TimeInterval>;
   limit?: Scalars["Int"]["input"];
+  pocketSizeMax?: InputMaybe<Scalars["Float"]["input"]>;
+  pocketSizeMin?: InputMaybe<Scalars["Float"]["input"]>;
+  tableSizeMax?: InputMaybe<Scalars["Float"]["input"]>;
+  tableSizeMin?: InputMaybe<Scalars["Float"]["input"]>;
 };
 
 export type QueryGetFeedVideosArgs = {
@@ -2936,6 +2935,11 @@ export type QueryGetMedalsArgs = {
   userId?: InputMaybe<Scalars["Int"]["input"]>;
 };
 
+export type QueryGetMyDrillRunsArgs = {
+  drillTag: Scalars["String"]["input"];
+  limit?: Scalars["Int"]["input"];
+};
+
 export type QueryGetOrderedShotsArgs = {
   countRespectsLimit?: Scalars["Boolean"]["input"];
   filterInput: FilterInput;
@@ -3381,7 +3385,6 @@ export type StripeProductGql = {
 
 export type StripeSubscriptionOptionsGql = {
   __typename?: "StripeSubscriptionOptionsGQL";
-  appleIap: AppleIapSubscriptionOptionsGql;
   products: Array<StripeProductGql>;
   trialPeriodDays?: Maybe<Scalars["Int"]["output"]>;
 };
@@ -4627,6 +4630,10 @@ export type GetDrillRunLeaderboardQueryVariables = Exact<{
   drillTag: Scalars["String"]["input"];
   interval?: InputMaybe<TimeInterval>;
   limit?: InputMaybe<Scalars["Int"]["input"]>;
+  tableSizeMin?: InputMaybe<Scalars["Float"]["input"]>;
+  tableSizeMax?: InputMaybe<Scalars["Float"]["input"]>;
+  pocketSizeMin?: InputMaybe<Scalars["Float"]["input"]>;
+  pocketSizeMax?: InputMaybe<Scalars["Float"]["input"]>;
 }>;
 
 export type GetDrillRunLeaderboardQuery = {
@@ -4640,6 +4647,11 @@ export type GetDrillRunLeaderboardQuery = {
       id: number;
       runLength: number;
       videoId: number;
+      video: {
+        __typename?: "VideoGQL";
+        tableSize: number;
+        pocketSize?: number | null;
+      };
       user: {
         __typename?: "UserGQL";
         id: number;
@@ -4656,6 +4668,22 @@ export type GetDrillRunLeaderboardQuery = {
   };
 };
 
+export type GetMyDrillRunsQueryVariables = Exact<{
+  drillTag: Scalars["String"]["input"];
+  limit?: InputMaybe<Scalars["Int"]["input"]>;
+}>;
+
+export type GetMyDrillRunsQuery = {
+  __typename?: "Query";
+  getMyDrillRuns: Array<{
+    __typename?: "RunGQL";
+    id: number;
+    runLength: number;
+    videoId: number;
+    video: { __typename?: "VideoGQL"; createdAt?: any | null };
+  }>;
+};
+
 export type GetVideoMakePercentageIntervalsQueryVariables = Exact<{
   videoId: Scalars["ID"]["input"];
   intervalDuration: Scalars["Int"]["input"];
@@ -9635,16 +9663,28 @@ export const GetDrillRunLeaderboardDocument = gql`
     $drillTag: String!
     $interval: TimeInterval
     $limit: Int = 50
+    $tableSizeMin: Float
+    $tableSizeMax: Float
+    $pocketSizeMin: Float
+    $pocketSizeMax: Float
   ) {
     getDrillRunLeaderboard(
       drillTag: $drillTag
       interval: $interval
       limit: $limit
+      tableSizeMin: $tableSizeMin
+      tableSizeMax: $tableSizeMax
+      pocketSizeMin: $pocketSizeMin
+      pocketSizeMax: $pocketSizeMax
     ) {
       entries {
         id
         runLength
         videoId
+        video {
+          tableSize
+          pocketSize
+        }
         user {
           id
           username
@@ -9677,6 +9717,10 @@ export const GetDrillRunLeaderboardDocument = gql`
  *      drillTag: // value for 'drillTag'
  *      interval: // value for 'interval'
  *      limit: // value for 'limit'
+ *      tableSizeMin: // value for 'tableSizeMin'
+ *      tableSizeMax: // value for 'tableSizeMax'
+ *      pocketSizeMin: // value for 'pocketSizeMin'
+ *      pocketSizeMax: // value for 'pocketSizeMax'
  *   },
  * });
  */
@@ -9729,6 +9773,85 @@ export type GetDrillRunLeaderboardQueryResult = Apollo.QueryResult<
   GetDrillRunLeaderboardQuery,
   GetDrillRunLeaderboardQueryVariables
 >;
+export const GetMyDrillRunsDocument = gql`
+  query GetMyDrillRuns($drillTag: String!, $limit: Int = 50) {
+    getMyDrillRuns(drillTag: $drillTag, limit: $limit) {
+      id
+      runLength
+      videoId
+      video {
+        createdAt
+      }
+    }
+  }
+`;
+
+/**
+ * __useGetMyDrillRunsQuery__
+ *
+ * To run a query within a React component, call `useGetMyDrillRunsQuery` and pass it any options that fit your needs.
+ * When your component renders, `useGetMyDrillRunsQuery` 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 } = useGetMyDrillRunsQuery({
+ *   variables: {
+ *      drillTag: // value for 'drillTag'
+ *      limit: // value for 'limit'
+ *   },
+ * });
+ */
+export function useGetMyDrillRunsQuery(
+  baseOptions: Apollo.QueryHookOptions<
+    GetMyDrillRunsQuery,
+    GetMyDrillRunsQueryVariables
+  >,
+) {
+  const options = { ...defaultOptions, ...baseOptions };
+  return Apollo.useQuery<GetMyDrillRunsQuery, GetMyDrillRunsQueryVariables>(
+    GetMyDrillRunsDocument,
+    options,
+  );
+}
+export function useGetMyDrillRunsLazyQuery(
+  baseOptions?: Apollo.LazyQueryHookOptions<
+    GetMyDrillRunsQuery,
+    GetMyDrillRunsQueryVariables
+  >,
+) {
+  const options = { ...defaultOptions, ...baseOptions };
+  return Apollo.useLazyQuery<GetMyDrillRunsQuery, GetMyDrillRunsQueryVariables>(
+    GetMyDrillRunsDocument,
+    options,
+  );
+}
+export function useGetMyDrillRunsSuspenseQuery(
+  baseOptions?: Apollo.SuspenseQueryHookOptions<
+    GetMyDrillRunsQuery,
+    GetMyDrillRunsQueryVariables
+  >,
+) {
+  const options = { ...defaultOptions, ...baseOptions };
+  return Apollo.useSuspenseQuery<
+    GetMyDrillRunsQuery,
+    GetMyDrillRunsQueryVariables
+  >(GetMyDrillRunsDocument, options);
+}
+export type GetMyDrillRunsQueryHookResult = ReturnType<
+  typeof useGetMyDrillRunsQuery
+>;
+export type GetMyDrillRunsLazyQueryHookResult = ReturnType<
+  typeof useGetMyDrillRunsLazyQuery
+>;
+export type GetMyDrillRunsSuspenseQueryHookResult = ReturnType<
+  typeof useGetMyDrillRunsSuspenseQuery
+>;
+export type GetMyDrillRunsQueryResult = Apollo.QueryResult<
+  GetMyDrillRunsQuery,
+  GetMyDrillRunsQueryVariables
+>;
 export const GetVideoMakePercentageIntervalsDocument = gql`
   query GetVideoMakePercentageIntervals(
     $videoId: ID!

src/operations/leaderboards.gql

@@ -35,16 +35,28 @@ query GetDrillRunLeaderboard(
   $drillTag: String!
   $interval: TimeInterval
   $limit: Int = 50
+  $tableSizeMin: Float
+  $tableSizeMax: Float
+  $pocketSizeMin: Float
+  $pocketSizeMax: Float
 ) {
   getDrillRunLeaderboard(
     drillTag: $drillTag
     interval: $interval
     limit: $limit
+    tableSizeMin: $tableSizeMin
+    tableSizeMax: $tableSizeMax
+    pocketSizeMin: $pocketSizeMin
+    pocketSizeMax: $pocketSizeMax
   ) {
     entries {
       id
       runLength
       videoId
+      video {
+        tableSize
+        pocketSize
+      }
       user {
         id
         username
@@ -60,3 +72,14 @@ query GetDrillRunLeaderboard(
     totalPlayers
   }
 }
+
+query GetMyDrillRuns($drillTag: String!, $limit: Int = 50) {
+  getMyDrillRuns(drillTag: $drillTag, limit: $limit) {
+    id
+    runLength
+    videoId
+    video {
+      createdAt
+    }
+  }
+}

src/schema.gql

@@ -35,7 +35,12 @@ type Query {
     drillTag: String!
     interval: TimeInterval = null
     limit: Int! = 50
+    tableSizeMin: Float = null
+    tableSizeMax: Float = null
+    pocketSizeMin: Float = null
+    pocketSizeMax: Float = null
   ): DrillRunLeaderboardGQL!
+  getMyDrillRuns(drillTag: String!, limit: Int! = 50): [RunGQL!]!
   getMakesLeaderboard(
     interval: TimeInterval = null
     when: DateTime = null
@@ -996,7 +1001,6 @@ type UserRelationship {
 type StripeSubscriptionOptionsGQL {
   products: [StripeProductGQL!]!
   trialPeriodDays: Int
-  appleIap: AppleIapSubscriptionOptionsGQL!
 }
 
 type StripeProductGQL {
@@ -1017,11 +1021,6 @@ type StripePriceGQL {
   active: Boolean!
 }
 
-type AppleIapSubscriptionOptionsGQL {
-  enabled: Boolean!
-  proMonthlyProductId: String
-}
-
 type UserSubscriptionStatusGQL {
   hasActiveSubscription: Boolean!
   entitlementSource: EntitlementSourceTypeEnum