Merge pull request 'Add Difficulty ShotOrdering' (#148) from mk/shots-ordering-by-difficulty into master

Reviewed-on: #148

src/index.tsx

@@ -186,12 +186,29 @@ export type DoesNotOwnShotErrOtherErrorNeedsNote =
   | DoesNotOwnShotErr
   | OtherErrorNeedsNote;
 
+export type EditShotReturn = {
+  __typename?: "EditShotReturn";
+  error?: Maybe<DoesNotOwnShotErr>;
+  shot?: Maybe<ShotGql>;
+};
+
 export type EditUserInputGql = {
   fargoRating?: InputMaybe<Scalars["Int"]["input"]>;
   username?: InputMaybe<Scalars["String"]["input"]>;
   videosPrivateByDefault?: InputMaybe<Scalars["Boolean"]["input"]>;
 };
 
+export type EditableShotFieldInputGql = {
+  backcut?: InputMaybe<Scalars["Boolean"]["input"]>;
+  excludeFromStats?: InputMaybe<Scalars["Boolean"]["input"]>;
+  intendedPocketType?: InputMaybe<PocketEnum>;
+  make?: InputMaybe<Scalars["Boolean"]["input"]>;
+  notes?: InputMaybe<Scalars["String"]["input"]>;
+  shotDirection?: InputMaybe<ShotDirectionEnum>;
+  spinType?: InputMaybe<SpinTypeEnum>;
+  targetPocketAngleDirection?: InputMaybe<ShotDirectionEnum>;
+};
+
 export type EnumAggregation = {
   feature: Scalars["String"]["input"];
 };
@@ -1999,8 +2016,17 @@ export type MedalGql = {
 };
 
 export type MedalScope =
-  | { interval: TimeInterval; videoId?: never }
-  | { interval?: never; videoId: Scalars["Int"]["input"] };
+  | {
+      datetimeRange: DatetimeRangeAggregationInput;
+      interval?: never;
+      videoId?: never;
+    } /** @deprecated NO LONGER SUPPORTED, USE DATETIME_RANGE */
+  | { datetimeRange?: never; interval: TimeInterval; videoId?: never }
+  | {
+      datetimeRange?: never;
+      interval?: never;
+      videoId: Scalars["Int"]["input"];
+    };
 
 export type MustHaveSetForUploadLinkErr = {
   __typename?: "MustHaveSetForUploadLinkErr";
@@ -2025,6 +2051,7 @@ export type Mutation = {
   createUploadStream: CreateUploadStreamReturn;
   deleteVideo: Scalars["Boolean"]["output"];
   editProfileImageUri: UserGql;
+  editShot: EditShotReturn;
   editUploadStream: Scalars["Boolean"]["output"];
   editUser: UserGql;
   findPrerecordTableLayout?: Maybe<HomographyInfoGql>;
@@ -2060,6 +2087,11 @@ export type MutationEditProfileImageUriArgs = {
   profileImageUri: Scalars["String"]["input"];
 };
 
+export type MutationEditShotArgs = {
+  fieldsToEdit: EditableShotFieldInputGql;
+  shotId: Scalars["Int"]["input"];
+};
+
 export type MutationEditUploadStreamArgs = {
   videoId: Scalars["Int"]["input"];
   videoMetadata: VideoMetadataInput;
@@ -2469,6 +2501,15 @@ export type ShotGql = {
 
 export type ShotsOrderingComponent =
   | {
+      difficulty: FloatOrdering;
+      marginOfError?: never;
+      runLength?: never;
+      startFrame?: never;
+      videoCreation?: never;
+      videoId?: never;
+    }
+  | {
+      difficulty?: never;
       marginOfError: FloatOrdering;
       runLength?: never;
       startFrame?: never;
@@ -2476,6 +2517,7 @@ export type ShotsOrderingComponent =
       videoId?: never;
     }
   | {
+      difficulty?: never;
       marginOfError?: never;
       runLength: IntOrdering;
       startFrame?: never;
@@ -2483,6 +2525,7 @@ export type ShotsOrderingComponent =
       videoId?: never;
     }
   | {
+      difficulty?: never;
       marginOfError?: never;
       runLength?: never;
       startFrame: IntOrdering;
@@ -2490,6 +2533,7 @@ export type ShotsOrderingComponent =
       videoId?: never;
     }
   | {
+      difficulty?: never;
       marginOfError?: never;
       runLength?: never;
       startFrame?: never;
@@ -2497,6 +2541,7 @@ export type ShotsOrderingComponent =
       videoId?: never;
     }
   | {
+      difficulty?: never;
       marginOfError?: never;
       runLength?: never;
       startFrame?: never;
@@ -2999,6 +3044,12 @@ export type GetVideoMakePercentageIntervalsQuery = {
   }>;
 };
 
+export type MedalFieldsFragment = {
+  __typename?: "MedalGQL";
+  count: number;
+  nickname?: string | null;
+};
+
 export type GetMedalsQueryVariables = Exact<{
   scope: MedalScope;
   userId?: InputMaybe<Scalars["Int"]["input"]>;
@@ -3008,11 +3059,6 @@ export type GetMedalsQuery = {
   __typename?: "Query";
   getMedals: {
     __typename?: "RequestedMedalsGQL";
-    distanceOver66?: {
-      __typename?: "MedalGQL";
-      count: number;
-      nickname?: string | null;
-    } | null;
     distanceOver78?: {
       __typename?: "MedalGQL";
       count: number;
@@ -3073,37 +3119,52 @@ export type GetMedalsQuery = {
       count: number;
       nickname?: string | null;
     } | null;
-    totalMakes25?: {
-      __typename?: "MedalGQL";
-      count: number;
-      nickname?: string | null;
-    } | null;
-    totalMakes50?: {
-      __typename?: "MedalGQL";
-      count: number;
-      nickname?: string | null;
-    } | null;
-    totalMakes75?: {
-      __typename?: "MedalGQL";
-      count: number;
-      nickname?: string | null;
-    } | null;
     totalMakes100?: {
       __typename?: "MedalGQL";
       count: number;
       nickname?: string | null;
     } | null;
-    totalMakes200?: {
+    totalMakes500?: {
       __typename?: "MedalGQL";
       count: number;
       nickname?: string | null;
     } | null;
-    totalMakes300?: {
+    totalMakes1000?: {
       __typename?: "MedalGQL";
       count: number;
       nickname?: string | null;
     } | null;
-    totalMakes400?: {
+    totalMakes5000?: {
+      __typename?: "MedalGQL";
+      count: number;
+      nickname?: string | null;
+    } | null;
+    totalMakes10000?: {
+      __typename?: "MedalGQL";
+      count: number;
+      nickname?: string | null;
+    } | null;
+    dailyMakes50?: {
+      __typename?: "MedalGQL";
+      count: number;
+      nickname?: string | null;
+    } | null;
+    dailyMakes100?: {
+      __typename?: "MedalGQL";
+      count: number;
+      nickname?: string | null;
+    } | null;
+    dailyMakes150?: {
+      __typename?: "MedalGQL";
+      count: number;
+      nickname?: string | null;
+    } | null;
+    dailyMakes200?: {
+      __typename?: "MedalGQL";
+      count: number;
+      nickname?: string | null;
+    } | null;
+    dailyMakes250?: {
       __typename?: "MedalGQL";
       count: number;
       nickname?: string | null;
@@ -3674,6 +3735,7 @@ export type GetStreamMonitoringDetailsQuery = {
     elapsedTime?: number | null;
     currentHomography?: {
       __typename?: "HomographyInfoGQL";
+      id: number;
       frameIndex: number;
       crop: {
         __typename?: "BoundingBoxGQL";
@@ -3737,6 +3799,7 @@ export type GetVideoUpdatePageDetailsQuery = {
     makePercentage: number;
     elapsedTime?: number | null;
     tableSize: number;
+    private: boolean;
     tags: Array<{
       __typename?: "VideoTag";
       name: string;
@@ -3776,6 +3839,7 @@ export type GetVideoDetailsQuery = {
     createdAt?: any | null;
     updatedAt?: any | null;
     tableSize: number;
+    private: boolean;
     owner?: {
       __typename?: "UserGQL";
       id: number;
@@ -3889,6 +3953,7 @@ export type GetVideoQuery = {
     } | null;
     homographyHistory: Array<{
       __typename?: "HomographyInfoGQL";
+      id: number;
       frameIndex: number;
       crop: {
         __typename?: "BoundingBoxGQL";
@@ -4099,6 +4164,7 @@ export type FindPrerecordTableLayoutMutation = {
   __typename?: "Mutation";
   findPrerecordTableLayout?: {
     __typename?: "HomographyInfoGQL";
+    id: number;
     frameIndex: number;
     crop: {
       __typename?: "BoundingBoxGQL";
@@ -4128,6 +4194,7 @@ export type FindPrerecordTableLayoutMutation = {
 
 export type HomographyInfoFragment = {
   __typename?: "HomographyInfoGQL";
+  id: number;
   frameIndex: number;
   crop: {
     __typename?: "BoundingBoxGQL";
@@ -4369,6 +4436,12 @@ export const VideoCardFieldsFragmentDoc = gql`
     }
   }
 `;
+export const MedalFieldsFragmentDoc = gql`
+  fragment MedalFields on MedalGQL {
+    count
+    nickname
+  }
+`;
 export const ShotWithAllFeaturesFragmentDoc = gql`
   fragment ShotWithAllFeatures on ShotGQL {
     id
@@ -4490,6 +4563,7 @@ export const VideoDurationDataFragmentDoc = gql`
 `;
 export const HomographyInfoFragmentDoc = gql`
   fragment HomographyInfo on HomographyInfoGQL {
+    id
     frameIndex
     crop {
       left
@@ -4943,88 +5017,75 @@ export type GetVideoMakePercentageIntervalsQueryResult = Apollo.QueryResult<
 export const GetMedalsDocument = gql`
   query getMedals($scope: MedalScope!, $userId: Int) {
     getMedals(scope: $scope, userId: $userId) {
-      distanceOver66 {
-        count
-        nickname
-      }
       distanceOver78 {
-        count
-        nickname
+        ...MedalFields
       }
       distanceOver90 {
-        count
-        nickname
+        ...MedalFields
       }
       runLength3 {
-        count
-        nickname
+        ...MedalFields
       }
       runLength5 {
-        count
-        nickname
+        ...MedalFields
       }
       runLength8 {
-        count
-        nickname
+        ...MedalFields
       }
       runLength10 {
-        count
-        nickname
+        ...MedalFields
       }
       runLength15 {
-        count
-        nickname
+        ...MedalFields
       }
       runLength20 {
-        count
-        nickname
+        ...MedalFields
       }
       runLength25 {
-        count
-        nickname
+        ...MedalFields
       }
       runLength30 {
-        count
-        nickname
+        ...MedalFields
       }
       runLength40 {
-        count
-        nickname
+        ...MedalFields
       }
       runLength50 {
-        count
-        nickname
-      }
-      totalMakes25 {
-        count
-        nickname
-      }
-      totalMakes50 {
-        count
-        nickname
-      }
-      totalMakes75 {
-        count
-        nickname
+        ...MedalFields
       }
       totalMakes100 {
-        count
-        nickname
+        ...MedalFields
       }
-      totalMakes200 {
-        count
-        nickname
+      totalMakes500 {
+        ...MedalFields
       }
-      totalMakes300 {
-        count
-        nickname
+      totalMakes1000 {
+        ...MedalFields
       }
-      totalMakes400 {
-        count
-        nickname
+      totalMakes5000 {
+        ...MedalFields
+      }
+      totalMakes10000 {
+        ...MedalFields
+      }
+      dailyMakes50 {
+        ...MedalFields
+      }
+      dailyMakes100 {
+        ...MedalFields
+      }
+      dailyMakes150 {
+        ...MedalFields
+      }
+      dailyMakes200 {
+        ...MedalFields
+      }
+      dailyMakes250 {
+        ...MedalFields
       }
     }
   }
+  ${MedalFieldsFragmentDoc}
 `;
 
 /**
@@ -6704,6 +6765,7 @@ export const GetVideoUpdatePageDetailsDocument = gql`
       makePercentage
       elapsedTime
       tableSize
+      private
       tags {
         tagClasses {
           name
@@ -6844,6 +6906,7 @@ export const GetVideoDetailsDocument = gql`
       createdAt
       updatedAt
       tableSize
+      private
       owner {
         id
         firebaseUid

src/operations/medals.gql

@@ -1,84 +1,75 @@
+fragment MedalFields on MedalGQL {
+  count
+  nickname
+}
+
 query getMedals($scope: MedalScope!, $userId: Int) {
   getMedals(scope: $scope, userId: $userId) {
-    distanceOver66 {
-      count
-      nickname
-    }
     distanceOver78 {
-      count
-      nickname
+      ...MedalFields
     }
     distanceOver90 {
-      count
-      nickname
+      ...MedalFields
     }
     runLength3 {
-      count
-      nickname
+      ...MedalFields
     }
     runLength5 {
-      count
-      nickname
+      ...MedalFields
     }
     runLength8 {
-      count
-      nickname
+      ...MedalFields
     }
     runLength10 {
-      count
-      nickname
+      ...MedalFields
     }
     runLength15 {
-      count
-      nickname
+      ...MedalFields
     }
     runLength20 {
-      count
-      nickname
+      ...MedalFields
     }
     runLength25 {
-      count
-      nickname
+      ...MedalFields
     }
     runLength30 {
-      count
-      nickname
+      ...MedalFields
     }
     runLength40 {
-      count
-      nickname
+      ...MedalFields
     }
     runLength50 {
-      count
-      nickname
-    }
-    totalMakes25 {
-      count
-      nickname
-    }
-    totalMakes50 {
-      count
-      nickname
-    }
-    totalMakes75 {
-      count
-      nickname
+      ...MedalFields
     }
     totalMakes100 {
-      count
-      nickname
+      ...MedalFields
     }
-    totalMakes200 {
-      count
-      nickname
+    totalMakes500 {
+      ...MedalFields
     }
-    totalMakes300 {
-      count
-      nickname
+    totalMakes1000 {
+      ...MedalFields
     }
-    totalMakes400 {
-      count
-      nickname
+    totalMakes5000 {
+      ...MedalFields
+    }
+    totalMakes10000 {
+      ...MedalFields
+    }
+    dailyMakes50 {
+      ...MedalFields
+    }
+    dailyMakes100 {
+      ...MedalFields
+    }
+    dailyMakes150 {
+      ...MedalFields
+    }
+    dailyMakes200 {
+      ...MedalFields
+    }
+    dailyMakes250 {
+      ...MedalFields
     }
   }
 }

src/operations/video.gql

@@ -36,6 +36,7 @@ query GetVideoUpdatePageDetails($videoId: Int!) {
     makePercentage
     elapsedTime
     tableSize
+    private
     tags {
       tagClasses {
         name
@@ -65,6 +66,7 @@ query GetVideoDetails($videoId: Int!) {
     createdAt
     updatedAt
     tableSize
+    private
     owner {
       id
       firebaseUid
@@ -222,6 +224,7 @@ mutation FindPrerecordTableLayout($b64Image: String!, $videoId: Int!) {
 }
 
 fragment HomographyInfo on HomographyInfoGQL {
+  id
   frameIndex
   crop {
     left

src/schema.gql

@@ -320,6 +320,8 @@ type MedalGQL {
 input MedalScope @oneOf {
   videoId: Int
   interval: TimeInterval
+    @deprecated(reason: "NO LONGER SUPPORTED, USE DATETIME_RANGE")
+  datetimeRange: DatetimeRangeAggregationInput
 }
 
 type GetRunsResult {
@@ -636,6 +638,7 @@ input GetShotsOrdering {
 input ShotsOrderingComponent @oneOf {
   videoCreation: DatetimeOrdering
   marginOfError: FloatOrdering
+  difficulty: FloatOrdering
   videoId: IntOrdering
   startFrame: IntOrdering
   runLength: IntOrdering
@@ -705,6 +708,10 @@ scalar JSON
 type Mutation {
   createBucketSet(params: CreateBucketSetInput!): BucketSetGQL!
   setLoggerLevel(path: String!, level: String!): Boolean!
+  editShot(
+    shotId: Int!
+    fieldsToEdit: EditableShotFieldInputGQL!
+  ): EditShotReturn!
   addAnnotationToShot(
     shotId: Int!
     annotationName: String!
@@ -742,6 +749,27 @@ input CreateBucketSetInput {
   buckets: [BucketInputGQL!]!
 }
 
+type EditShotReturn {
+  shot: ShotGQL
+  error: DoesNotOwnShotErr
+}
+
+type DoesNotOwnShotErr {
+  shotId: Int!
+  msg: String
+}
+
+input EditableShotFieldInputGQL {
+  intendedPocketType: PocketEnum
+  shotDirection: ShotDirectionEnum
+  spinType: SpinTypeEnum
+  targetPocketAngleDirection: ShotDirectionEnum
+  make: Boolean
+  backcut: Boolean
+  excludeFromStats: Boolean
+  notes: String
+}
+
 type AddShotAnnotationReturn {
   value: SuccessfulAddAddShotAnnotationErrors!
 }
@@ -762,11 +790,6 @@ union DoesNotOwnShotErrOtherErrorNeedsNote =
     DoesNotOwnShotErr
   | OtherErrorNeedsNote
 
-type DoesNotOwnShotErr {
-  shotId: Int!
-  msg: String
-}
-
 type OtherErrorNeedsNote {
   msg: String
 }