Return userGQL in usernames and ids endpoint

Reviewed-on: #92

src/index.tsx

@@ -2170,6 +2170,7 @@ export type Query = {
   getUserVideos: VideoHistoryGql;
   getUsernames: Array<Scalars["String"]["output"]>;
   getUsernamesAndFollowing: UsernamesAndFollowingResponse;
+  getUsernamesAndFollowingOld: UsernamesAndFollowingResponse;
   getVideo: VideoGql;
   getVideoMakePercentageIntervals: Array<MakePercentageIntervalGql>;
   getVideos: Array<VideoGql>;
@@ -2246,6 +2247,13 @@ export type QueryGetUsernamesAndFollowingArgs = {
   userId: Scalars["Int"]["input"];
 };
 
+export type QueryGetUsernamesAndFollowingOldArgs = {
+  after?: InputMaybe<Scalars["String"]["input"]>;
+  limit?: InputMaybe<Scalars["Int"]["input"]>;
+  matchString?: InputMaybe<Scalars["String"]["input"]>;
+  userId: Scalars["Int"]["input"];
+};
+
 export type QueryGetVideoArgs = {
   debuggingJson?: InputMaybe<Scalars["JSON"]["input"]>;
   videoId: Scalars["Int"]["input"];
@@ -2412,15 +2420,6 @@ export type SuccessfulAddAddShotAnnotationErrors =
   | AddShotAnnotationErrors
   | SuccessfulAdd;
 
-export type SuccessfulUpdate = {
-  __typename?: "SuccessfulUpdate";
-  value: Scalars["Boolean"]["output"];
-};
-
-export type SuccessfulUpdateUpdateShotAnnotationErrors =
-  | SuccessfulUpdate
-  | UpdateShotAnnotationErrors;
-
 export type TagGql = {
   __typename?: "TagGQL";
   group?: Maybe<Scalars["String"]["output"]>;
@@ -2463,14 +2462,10 @@ export type UpdateAnnotationInputGql = {
   notes?: InputMaybe<Scalars["String"]["input"]>;
 };
 
-export type UpdateShotAnnotationErrors = {
-  __typename?: "UpdateShotAnnotationErrors";
-  error?: Maybe<DoesNotOwnShotErr>;
-};
-
 export type UpdateShotAnnotationReturn = {
   __typename?: "UpdateShotAnnotationReturn";
-  value: SuccessfulUpdateUpdateShotAnnotationErrors;
+  error?: Maybe<DoesNotOwnShotErr>;
+  shot?: Maybe<ShotGql>;
 };
 
 export type UploadLink = {
@@ -2521,11 +2516,11 @@ export type UserGql = {
   activeVideoId?: Maybe<Scalars["Int"]["output"]>;
   createdAt?: Maybe<Scalars["DateTime"]["output"]>;
   fargoRating?: Maybe<Scalars["Int"]["output"]>;
-  firebaseUid: Scalars["String"]["output"];
+  firebaseUid?: Maybe<Scalars["String"]["output"]>;
   followers?: Maybe<Array<Scalars["Int"]["output"]>>;
   following?: Maybe<Array<Scalars["Int"]["output"]>>;
   id: Scalars["Int"]["output"];
-  isAdmin: Scalars["Boolean"]["output"];
+  isAdmin?: Maybe<Scalars["Boolean"]["output"]>;
   profileImageUri?: Maybe<Scalars["String"]["output"]>;
   updatedAt?: Maybe<Scalars["DateTime"]["output"]>;
   username: Scalars["String"]["output"];
@@ -2540,7 +2535,7 @@ export type UsernamesAndFollowingResponse = {
   __typename?: "UsernamesAndFollowingResponse";
   followers: Array<Scalars["Int"]["output"]>;
   following: Array<Scalars["Int"]["output"]>;
-  usernames: Array<Scalars["String"]["output"]>;
+  users: Array<UserGql>;
 };
 
 export type VideoFilterInput = {
@@ -2713,7 +2708,11 @@ export type GetFeedQuery = {
       elapsedTime?: number | null;
       tableSize: number;
       owner?: { __typename?: "UserGQL"; username: string } | null;
-      stream?: { __typename?: "UploadStreamGQL"; isCompleted: boolean } | null;
+      stream?: {
+        __typename?: "UploadStreamGQL";
+        id: string;
+        isCompleted: boolean;
+      } | null;
       tags: Array<{
         __typename?: "VideoTag";
         name: string;
@@ -2783,16 +2782,25 @@ export type UpdateShotAnnotationsMutation = {
   __typename?: "Mutation";
   updateShotAnnotations: {
     __typename?: "UpdateShotAnnotationReturn";
-    value:
+    shot?: {
-      | { __typename?: "SuccessfulUpdate"; value: boolean }
+      __typename?: "ShotGQL";
-      | {
+      id: number;
-          __typename?: "UpdateShotAnnotationErrors";
+      annotations: Array<{
-          error?: {
+        __typename?: "ShotAnnotationGQL";
-            __typename?: "DoesNotOwnShotErr";
+        shotId: number;
-            shotId: number;
+        notes: string;
-            msg?: string | null;
+        type: {
-          } | null;
+          __typename?: "ShotAnnotationTypeGQL";
+          id: number;
+          name: string;
         };
+      }>;
+    } | null;
+    error?: {
+      __typename?: "DoesNotOwnShotErr";
+      shotId: number;
+      msg?: string | null;
+    } | null;
   };
 };
 
@@ -3089,7 +3097,7 @@ export type EditProfileImageUriMutation = {
   editProfileImageUri: {
     __typename?: "UserGQL";
     id: number;
-    firebaseUid: string;
+    firebaseUid?: string | null;
     username: string;
     profileImageUri?: string | null;
     createdAt?: any | null;
@@ -3104,9 +3112,9 @@ export type GetLoggedInUserQuery = {
   getLoggedInUser?: {
     __typename?: "UserGQL";
     id: number;
-    firebaseUid: string;
+    firebaseUid?: string | null;
     username: string;
-    isAdmin: boolean;
+    isAdmin?: boolean | null;
     profileImageUri?: string | null;
     activeVideoId?: number | null;
     createdAt?: any | null;
@@ -3134,6 +3142,22 @@ export type GetUsernamesQuery = {
   getUsernames: Array<string>;
 };
 
+export type GetUsernamesAndFollowingQueryVariables = Exact<{
+  userId: Scalars["Int"]["input"];
+  matchString: Scalars["String"]["input"];
+  limit?: InputMaybe<Scalars["Int"]["input"]>;
+  after?: InputMaybe<Scalars["String"]["input"]>;
+}>;
+
+export type GetUsernamesAndFollowingQuery = {
+  __typename?: "Query";
+  getUsernamesAndFollowing: {
+    __typename?: "UsernamesAndFollowingResponse";
+    followers: Array<number>;
+    following: Array<number>;
+  };
+};
+
 export type GetUserTagsQueryVariables = Exact<{ [key: string]: never }>;
 
 export type GetUserTagsQuery = {
@@ -3182,6 +3206,7 @@ export type GetStreamMonitoringDetailsQuery = {
     } | null;
     stream?: {
       __typename?: "UploadStreamGQL";
+      id: string;
       linksRequested: number;
       uploadsCompleted: number;
       segmentProcessingCursor: number;
@@ -3258,7 +3283,7 @@ export type GetVideoDetailsQuery = {
     owner?: {
       __typename?: "UserGQL";
       id: number;
-      firebaseUid: string;
+      firebaseUid?: string | null;
       username: string;
       profileImageUri?: string | null;
     } | null;
@@ -3395,6 +3420,7 @@ export type GetVideoQuery = {
     }>;
     stream?: {
       __typename?: "UploadStreamGQL";
+      id: string;
       streamSegmentType: StreamSegmentTypeEnum;
       segments: Array<{
         __typename?: "UploadSegmentGQL";
@@ -4038,6 +4064,7 @@ export const GetFeedDocument = gql`
         elapsedTime
         screenshotUri
         stream {
+          id
           isCompleted
         }
         tableSize
@@ -4355,17 +4382,21 @@ export const UpdateShotAnnotationsDocument = gql`
     $annotations: [UpdateAnnotationInputGQL!]!
   ) {
     updateShotAnnotations(shotId: $shotId, annotations: $annotations) {
-      value {
+      shot {
-        ... on SuccessfulUpdate {
+        id
-          value
+        annotations {
-        }
+          shotId
-        ... on UpdateShotAnnotationErrors {
+          type {
-          error {
+            id
-            shotId
+            name
-            msg
           }
+          notes
         }
       }
+      error {
+        shotId
+        msg
+      }
     }
   }
 `;
@@ -5100,6 +5131,93 @@ export type GetUsernamesQueryResult = Apollo.QueryResult<
   GetUsernamesQuery,
   GetUsernamesQueryVariables
 >;
+export const GetUsernamesAndFollowingDocument = gql`
+  query getUsernamesAndFollowing(
+    $userId: Int!
+    $matchString: String!
+    $limit: Int = null
+    $after: String = null
+  ) {
+    getUsernamesAndFollowing(
+      userId: $userId
+      matchString: $matchString
+      limit: $limit
+      after: $after
+    ) {
+      followers
+      following
+    }
+  }
+`;
+
+/**
+ * __useGetUsernamesAndFollowingQuery__
+ *
+ * To run a query within a React component, call `useGetUsernamesAndFollowingQuery` and pass it any options that fit your needs.
+ * When your component renders, `useGetUsernamesAndFollowingQuery` 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 } = useGetUsernamesAndFollowingQuery({
+ *   variables: {
+ *      userId: // value for 'userId'
+ *      matchString: // value for 'matchString'
+ *      limit: // value for 'limit'
+ *      after: // value for 'after'
+ *   },
+ * });
+ */
+export function useGetUsernamesAndFollowingQuery(
+  baseOptions: Apollo.QueryHookOptions<
+    GetUsernamesAndFollowingQuery,
+    GetUsernamesAndFollowingQueryVariables
+  >,
+) {
+  const options = { ...defaultOptions, ...baseOptions };
+  return Apollo.useQuery<
+    GetUsernamesAndFollowingQuery,
+    GetUsernamesAndFollowingQueryVariables
+  >(GetUsernamesAndFollowingDocument, options);
+}
+export function useGetUsernamesAndFollowingLazyQuery(
+  baseOptions?: Apollo.LazyQueryHookOptions<
+    GetUsernamesAndFollowingQuery,
+    GetUsernamesAndFollowingQueryVariables
+  >,
+) {
+  const options = { ...defaultOptions, ...baseOptions };
+  return Apollo.useLazyQuery<
+    GetUsernamesAndFollowingQuery,
+    GetUsernamesAndFollowingQueryVariables
+  >(GetUsernamesAndFollowingDocument, options);
+}
+export function useGetUsernamesAndFollowingSuspenseQuery(
+  baseOptions?: Apollo.SuspenseQueryHookOptions<
+    GetUsernamesAndFollowingQuery,
+    GetUsernamesAndFollowingQueryVariables
+  >,
+) {
+  const options = { ...defaultOptions, ...baseOptions };
+  return Apollo.useSuspenseQuery<
+    GetUsernamesAndFollowingQuery,
+    GetUsernamesAndFollowingQueryVariables
+  >(GetUsernamesAndFollowingDocument, options);
+}
+export type GetUsernamesAndFollowingQueryHookResult = ReturnType<
+  typeof useGetUsernamesAndFollowingQuery
+>;
+export type GetUsernamesAndFollowingLazyQueryHookResult = ReturnType<
+  typeof useGetUsernamesAndFollowingLazyQuery
+>;
+export type GetUsernamesAndFollowingSuspenseQueryHookResult = ReturnType<
+  typeof useGetUsernamesAndFollowingSuspenseQuery
+>;
+export type GetUsernamesAndFollowingQueryResult = Apollo.QueryResult<
+  GetUsernamesAndFollowingQuery,
+  GetUsernamesAndFollowingQueryVariables
+>;
 export const GetUserTagsDocument = gql`
   query GetUserTags {
     getUserTags {
@@ -5219,6 +5337,7 @@ export const GetStreamMonitoringDetailsDocument = gql`
         }
       }
       stream {
+        id
         linksRequested
         uploadsCompleted
         segmentProcessingCursor
@@ -5726,6 +5845,7 @@ export const GetVideoDocument = gql`
         }
       }
       stream {
+        id
         streamSegmentType
         segments {
           segmentIndex

src/operations/feed.gql

@@ -21,6 +21,7 @@ query GetFeed(
       elapsedTime
       screenshotUri
       stream {
+        id
         isCompleted
       }
       tableSize

src/operations/shots.gql

@@ -22,17 +22,21 @@ mutation UpdateShotAnnotations(
   $annotations: [UpdateAnnotationInputGQL!]!
 ) {
   updateShotAnnotations(shotId: $shotId, annotations: $annotations) {
-    value {
+    shot {
-      ... on SuccessfulUpdate {
+      id
-        value
+      annotations {
-      }
+        shotId
-      ... on UpdateShotAnnotationErrors {
+        type {
-        error {
+          id
-          shotId
+          name
-          msg
         }
+        notes
       }
     }
+    error {
+      shotId
+      msg
+    }
   }
 }
 

src/operations/user.gql

@@ -57,6 +57,23 @@ query getUsernames(
   getUsernames(matchString: $matchString, limit: $limit, after: $after)
 }
 
+query getUsernamesAndFollowing(
+  $userId: Int!
+  $matchString: String!
+  $limit: Int = null
+  $after: String = null
+) {
+  getUsernamesAndFollowing(
+    userId: $userId
+    matchString: $matchString
+    limit: $limit
+    after: $after
+  ) {
+    followers
+    following
+  }
+}
+
 query GetUserTags {
   getUserTags {
     id

src/operations/video.gql

@@ -45,6 +45,7 @@ query GetStreamMonitoringDetails($videoId: Int!, $debuggingJson: JSON) {
       }
     }
     stream {
+      id
       linksRequested
       uploadsCompleted
       segmentProcessingCursor
@@ -194,6 +195,7 @@ query GetVideo($videoId: Int!) {
       }
     }
     stream {
+      id
       streamSegmentType
       segments {
         segmentIndex

src/schema.gql

@@ -41,6 +41,12 @@ type Query {
     limit: Int = 100
     after: String = null
   ): UsernamesAndFollowingResponse!
+  getUsernamesAndFollowingOld(
+    userId: Int!
+    matchString: String = null
+    limit: Int = 100
+    after: String = null
+  ): UsernamesAndFollowingResponse!
   getPlayTime(userId: Int!): UserPlayTimeGQL!
   getUserVideos(
     userId: Int = null
@@ -341,9 +347,9 @@ type SerializedShotPathsGQL {
 
 type UserGQL {
   id: Int!
-  firebaseUid: String!
+  firebaseUid: String
   username: String!
-  isAdmin: Boolean!
+  isAdmin: Boolean
   fargoRating: Int
   activeVideoId: Int
   profileImageUri: String
@@ -555,7 +561,7 @@ input CreatedAfter @oneOf {
 }
 
 type UsernamesAndFollowingResponse {
-  usernames: [String!]!
+  users: [UserGQL!]!
   following: [Int!]!
   followers: [Int!]!
 }
@@ -662,18 +668,7 @@ type OtherErrorNeedsNote {
 }
 
 type UpdateShotAnnotationReturn {
-  value: SuccessfulUpdateUpdateShotAnnotationErrors!
+  shot: ShotGQL
-}
-
-union SuccessfulUpdateUpdateShotAnnotationErrors =
-    SuccessfulUpdate
-  | UpdateShotAnnotationErrors
-
-type SuccessfulUpdate {
-  value: Boolean!
-}
-
-type UpdateShotAnnotationErrors {
   error: DoesNotOwnShotErr
 }