Merge pull request 'Use logged in user for followers' (#106) from kat/use-logged-in-user into master

Reviewed-on: #106

pyproject.toml

@@ -7,7 +7,7 @@ readme = "README.md"
 packages = [{include = "rbproto"}]
 
 [tool.poetry.dependencies]
-python = ">=3.10,<3.12"
+python = ">=3.10,<=3.13"
 protobuf = "^4.25.3"
 
 

src/index.tsx

@@ -1974,6 +1974,15 @@ export type MakePercentageIntervalGql = {
   makePercentage: Scalars["Float"]["output"];
 };
 
+export type MedalGql = {
+  __typename?: "MedalGQL";
+  count: Scalars["Int"]["output"];
+};
+
+export type MedalScope =
+  | { interval: TimeInterval; videoId?: never }
+  | { interval?: never; videoId: Scalars["Int"]["input"] };
+
 export type MustHaveSetForUploadLinkErr = {
   __typename?: "MustHaveSetForUploadLinkErr";
   framesPerSecond?: Maybe<Scalars["Boolean"]["output"]>;
@@ -2154,11 +2163,13 @@ export enum ProcessingStatusEnum {
 
 export type Query = {
   __typename?: "Query";
+  doesUsernameExist: Scalars["Boolean"]["output"];
   getAggregatedShotMetrics: Array<AggregateResultGql>;
   getBucketSet?: Maybe<BucketSetGql>;
   getDeployedConfig: DeployedConfigGql;
   getFeedVideos: VideoHistoryGql;
   getLoggedInUser?: Maybe<UserGql>;
+  getMedals: RequestedMedalsGql;
   getOrderedShots: GetShotsResult;
   getPlayTime: UserPlayTimeGql;
   getShotAnnotationTypes: Array<ShotAnnotationTypeGql>;
@@ -2176,6 +2187,10 @@ export type Query = {
   waitFor: Scalars["Float"]["output"];
 };
 
+export type QueryDoesUsernameExistArgs = {
+  candidateUsername: Scalars["String"]["input"];
+};
+
 export type QueryGetAggregatedShotMetricsArgs = {
   aggregateInput: AggregateInputGql;
 };
@@ -2190,6 +2205,11 @@ export type QueryGetFeedVideosArgs = {
   limit?: Scalars["Int"]["input"];
 };
 
+export type QueryGetMedalsArgs = {
+  scope: MedalScope;
+  userId?: InputMaybe<Scalars["Int"]["input"]>;
+};
+
 export type QueryGetOrderedShotsArgs = {
   filterInput: FilterInput;
   ids?: InputMaybe<Array<Scalars["Int"]["input"]>>;
@@ -2264,6 +2284,44 @@ export type QueryWaitForArgs = {
   duration: Scalars["Float"]["input"];
 };
 
+export type RequestedMedalsGql = {
+  __typename?: "RequestedMedalsGQL";
+  dayStreak2?: Maybe<MedalGql>;
+  dayStreak3?: Maybe<MedalGql>;
+  dayStreak4?: Maybe<MedalGql>;
+  dayStreak5?: Maybe<MedalGql>;
+  dayStreak6?: Maybe<MedalGql>;
+  dayStreak7?: Maybe<MedalGql>;
+  dayStreak14?: Maybe<MedalGql>;
+  dayStreak21?: Maybe<MedalGql>;
+  dayStreak30?: Maybe<MedalGql>;
+  dayStreak60?: Maybe<MedalGql>;
+  dayStreak90?: Maybe<MedalGql>;
+  distanceOver66?: Maybe<MedalGql>;
+  distanceOver78?: Maybe<MedalGql>;
+  distanceOver90?: Maybe<MedalGql>;
+  runLength3?: Maybe<MedalGql>;
+  runLength5?: Maybe<MedalGql>;
+  runLength8?: Maybe<MedalGql>;
+  runLength10?: Maybe<MedalGql>;
+  runLength15?: Maybe<MedalGql>;
+  runLength20?: Maybe<MedalGql>;
+  runLength25?: Maybe<MedalGql>;
+  runLength30?: Maybe<MedalGql>;
+  runLength40?: Maybe<MedalGql>;
+  runLength50?: Maybe<MedalGql>;
+  totalMakes25?: Maybe<MedalGql>;
+  totalMakes50?: Maybe<MedalGql>;
+  totalMakes75?: Maybe<MedalGql>;
+  totalMakes100?: Maybe<MedalGql>;
+  totalMakes200?: Maybe<MedalGql>;
+  totalMakes300?: Maybe<MedalGql>;
+  totalMakes400?: Maybe<MedalGql>;
+  totalMakes500?: Maybe<MedalGql>;
+  totalMakes750?: Maybe<MedalGql>;
+  totalMakes1000?: Maybe<MedalGql>;
+};
+
 export type SegmentAlreadyUploadedErr = {
   __typename?: "SegmentAlreadyUploadedErr";
   segmentId: Scalars["Int"]["output"];
@@ -2804,14 +2862,14 @@ export type UpdateShotAnnotationsMutation = {
 
 export type GetShotsWithVideoGqlQueryVariables = Exact<{
   filterInput: FilterInput;
+  shotsOrdering?: InputMaybe<GetShotsOrdering>;
   limit?: InputMaybe<Scalars["Int"]["input"]>;
 }>;
 
 export type GetShotsWithVideoGqlQuery = {
   __typename?: "Query";
-  getShotsWithMetadata: {
+  getOrderedShots: {
     __typename?: "GetShotsResult";
-    ids: Array<number>;
     shots: Array<{
       __typename?: "ShotGQL";
       id: number;
@@ -3114,6 +3172,7 @@ export type GetLoggedInUserQuery = {
     username: string;
     isAdmin?: boolean | null;
     profileImageUri?: string | null;
+    fargoRating?: number | null;
     activeVideoId?: number | null;
     createdAt?: any | null;
     updatedAt?: any | null;
@@ -3173,7 +3232,12 @@ export type FollowUserMutationVariables = Exact<{
 
 export type FollowUserMutation = {
   __typename?: "Mutation";
-  followUser: { __typename?: "UserGQL"; username: string };
+  followUser: {
+    __typename?: "UserGQL";
+    username: string;
+    following?: Array<{ __typename?: "UserGQL"; id: number }> | null;
+    followers?: Array<{ __typename?: "UserGQL"; id: number }> | null;
+  };
 };
 
 export type UnfollowUserMutationVariables = Exact<{
@@ -3182,7 +3246,33 @@ export type UnfollowUserMutationVariables = Exact<{
 
 export type UnfollowUserMutation = {
   __typename?: "Mutation";
-  unfollowUser: { __typename?: "UserGQL"; username: string };
+  unfollowUser: {
+    __typename?: "UserGQL";
+    username: string;
+    following?: Array<{ __typename?: "UserGQL"; id: number }> | null;
+    followers?: Array<{ __typename?: "UserGQL"; id: number }> | null;
+  };
+};
+
+export type GetUserFollowingFollowersQueryVariables = Exact<{
+  [key: string]: never;
+}>;
+
+export type GetUserFollowingFollowersQuery = {
+  __typename?: "Query";
+  getLoggedInUser?: {
+    __typename?: "UserGQL";
+    following?: Array<{
+      __typename?: "UserGQL";
+      id: number;
+      username: string;
+    }> | null;
+    followers?: Array<{
+      __typename?: "UserGQL";
+      id: number;
+      username: string;
+    }> | null;
+  } | null;
 };
 
 export type GetStreamMonitoringDetailsQueryVariables = Exact<{
@@ -4465,9 +4555,16 @@ export type UpdateShotAnnotationsMutationOptions = Apollo.BaseMutationOptions<
   UpdateShotAnnotationsMutationVariables
 >;
 export const GetShotsWithVideoGqlDocument = gql`
-  query GetShotsWithVideoGql($filterInput: FilterInput!, $limit: Int) {
-    getShotsWithMetadata(filterInput: $filterInput, limit: $limit) {
-      ids
+  query GetShotsWithVideoGql(
+    $filterInput: FilterInput!
+    $shotsOrdering: GetShotsOrdering
+    $limit: Int
+  ) {
+    getOrderedShots(
+      filterInput: $filterInput
+      shotsOrdering: $shotsOrdering
+      limit: $limit
+    ) {
       shots {
         id
         videoId
@@ -4493,6 +4590,7 @@ export const GetShotsWithVideoGqlDocument = gql`
  * const { data, loading, error } = useGetShotsWithVideoGqlQuery({
  *   variables: {
  *      filterInput: // value for 'filterInput'
+ *      shotsOrdering: // value for 'shotsOrdering'
  *      limit: // value for 'limit'
  *   },
  * });
@@ -4930,6 +5028,7 @@ export const GetLoggedInUserDocument = gql`
       username
       isAdmin
       profileImageUri
+      fargoRating
       activeVideoId
       createdAt
       updatedAt
@@ -5319,6 +5418,12 @@ export const FollowUserDocument = gql`
   mutation followUser($followedUserId: Int!) {
     followUser(followedUserId: $followedUserId) {
       username
+      following {
+        id
+      }
+      followers {
+        id
+      }
     }
   }
 `;
@@ -5369,6 +5474,12 @@ export const UnfollowUserDocument = gql`
   mutation unfollowUser($followedUserId: Int!) {
     unfollowUser(followedUserId: $followedUserId) {
       username
+      following {
+        id
+      }
+      followers {
+        id
+      }
     }
   }
 `;
@@ -5415,6 +5526,85 @@ export type UnfollowUserMutationOptions = Apollo.BaseMutationOptions<
   UnfollowUserMutation,
   UnfollowUserMutationVariables
 >;
+export const GetUserFollowingFollowersDocument = gql`
+  query getUserFollowingFollowers {
+    getLoggedInUser {
+      following {
+        id
+        username
+      }
+      followers {
+        id
+        username
+      }
+    }
+  }
+`;
+
+/**
+ * __useGetUserFollowingFollowersQuery__
+ *
+ * To run a query within a React component, call `useGetUserFollowingFollowersQuery` and pass it any options that fit your needs.
+ * When your component renders, `useGetUserFollowingFollowersQuery` 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 } = useGetUserFollowingFollowersQuery({
+ *   variables: {
+ *   },
+ * });
+ */
+export function useGetUserFollowingFollowersQuery(
+  baseOptions?: Apollo.QueryHookOptions<
+    GetUserFollowingFollowersQuery,
+    GetUserFollowingFollowersQueryVariables
+  >,
+) {
+  const options = { ...defaultOptions, ...baseOptions };
+  return Apollo.useQuery<
+    GetUserFollowingFollowersQuery,
+    GetUserFollowingFollowersQueryVariables
+  >(GetUserFollowingFollowersDocument, options);
+}
+export function useGetUserFollowingFollowersLazyQuery(
+  baseOptions?: Apollo.LazyQueryHookOptions<
+    GetUserFollowingFollowersQuery,
+    GetUserFollowingFollowersQueryVariables
+  >,
+) {
+  const options = { ...defaultOptions, ...baseOptions };
+  return Apollo.useLazyQuery<
+    GetUserFollowingFollowersQuery,
+    GetUserFollowingFollowersQueryVariables
+  >(GetUserFollowingFollowersDocument, options);
+}
+export function useGetUserFollowingFollowersSuspenseQuery(
+  baseOptions?: Apollo.SuspenseQueryHookOptions<
+    GetUserFollowingFollowersQuery,
+    GetUserFollowingFollowersQueryVariables
+  >,
+) {
+  const options = { ...defaultOptions, ...baseOptions };
+  return Apollo.useSuspenseQuery<
+    GetUserFollowingFollowersQuery,
+    GetUserFollowingFollowersQueryVariables
+  >(GetUserFollowingFollowersDocument, options);
+}
+export type GetUserFollowingFollowersQueryHookResult = ReturnType<
+  typeof useGetUserFollowingFollowersQuery
+>;
+export type GetUserFollowingFollowersLazyQueryHookResult = ReturnType<
+  typeof useGetUserFollowingFollowersLazyQuery
+>;
+export type GetUserFollowingFollowersSuspenseQueryHookResult = ReturnType<
+  typeof useGetUserFollowingFollowersSuspenseQuery
+>;
+export type GetUserFollowingFollowersQueryResult = Apollo.QueryResult<
+  GetUserFollowingFollowersQuery,
+  GetUserFollowingFollowersQueryVariables
+>;
 export const GetStreamMonitoringDetailsDocument = gql`
   query GetStreamMonitoringDetails($videoId: Int!, $debuggingJson: JSON) {
     getVideo(videoId: $videoId, debuggingJson: $debuggingJson) {

src/operations/shots.gql

@@ -40,9 +40,16 @@ mutation UpdateShotAnnotations(
   }
 }
 
-query GetShotsWithVideoGql($filterInput: FilterInput!, $limit: Int) {
-  getShotsWithMetadata(filterInput: $filterInput, limit: $limit) {
-    ids
+query GetShotsWithVideoGql(
+  $filterInput: FilterInput!
+  $shotsOrdering: GetShotsOrdering
+  $limit: Int
+) {
+  getOrderedShots(
+    filterInput: $filterInput
+    shotsOrdering: $shotsOrdering
+    limit: $limit
+  ) {
     shots {
       id
       videoId

src/operations/user.gql

@@ -37,6 +37,7 @@ query getLoggedInUser {
     username
     isAdmin
     profileImageUri
+    fargoRating
     activeVideoId
     createdAt
     updatedAt
@@ -90,11 +91,36 @@ query GetUserTags {
 mutation followUser($followedUserId: Int!) {
   followUser(followedUserId: $followedUserId) {
     username
+    following {
+      id
+    }
+    followers {
+      id
+    }
   }
 }
 
 mutation unfollowUser($followedUserId: Int!) {
   unfollowUser(followedUserId: $followedUserId) {
     username
+    following {
+      id
+    }
+    followers {
+      id
+    }
+  }
+}
+
+query getUserFollowingFollowers {
+  getLoggedInUser {
+    following {
+      id
+      username
+    }
+    followers {
+      id
+      username
+    }
   }
 }

src/schema.gql

@@ -9,6 +9,7 @@ type Query {
     videoId: ID!
     intervalDuration: Int! = 300
   ): [MakePercentageIntervalGQL!]!
+  getMedals(scope: MedalScope!, userId: Int = null): RequestedMedalsGQL!
   getOrderedShots(
     filterInput: FilterInput!
     ids: [Int!] = null
@@ -29,6 +30,7 @@ type Query {
   getShotsByIds(ids: [Int!]!): [ShotGQL!]!
   getShotAnnotationTypes(errorTypes: Boolean = false): [ShotAnnotationTypeGQL!]!
   getUser(userId: Int!): UserGQL
+  doesUsernameExist(candidateUsername: String!): Boolean!
   getLoggedInUser: UserGQL
   getUsernames(
     matchString: String = null
@@ -266,6 +268,52 @@ type MakePercentageIntervalGQL {
   elapsedTime: Float!
 }
 
+type RequestedMedalsGQL {
+  distanceOver66: MedalGQL
+  distanceOver78: MedalGQL
+  distanceOver90: MedalGQL
+  runLength3: MedalGQL
+  runLength5: MedalGQL
+  runLength8: MedalGQL
+  runLength10: MedalGQL
+  runLength15: MedalGQL
+  runLength20: MedalGQL
+  runLength25: MedalGQL
+  runLength30: MedalGQL
+  runLength40: MedalGQL
+  runLength50: MedalGQL
+  totalMakes25: MedalGQL
+  totalMakes50: MedalGQL
+  totalMakes75: MedalGQL
+  totalMakes100: MedalGQL
+  totalMakes200: MedalGQL
+  totalMakes300: MedalGQL
+  totalMakes400: MedalGQL
+  totalMakes500: MedalGQL
+  totalMakes750: MedalGQL
+  totalMakes1000: MedalGQL
+  dayStreak2: MedalGQL
+  dayStreak3: MedalGQL
+  dayStreak4: MedalGQL
+  dayStreak5: MedalGQL
+  dayStreak6: MedalGQL
+  dayStreak7: MedalGQL
+  dayStreak14: MedalGQL
+  dayStreak21: MedalGQL
+  dayStreak30: MedalGQL
+  dayStreak60: MedalGQL
+  dayStreak90: MedalGQL
+}
+
+type MedalGQL {
+  count: Int!
+}
+
+input MedalScope @oneOf {
+  videoId: Int
+  interval: TimeInterval
+}
+
 type GetShotsResult {
   shots: [ShotGQL!]!
   count: Int