Add subfields to usernames and following

Reviewed-on: #88

codegen.yml

@@ -1,5 +1,7 @@
 overwrite: true
-schema: "src/schema.gql"
+schema:
+  - "src/schema.gql"
+  - "src/client-schema.gql"
 documents: "src/**/*.gql"
 generates:
   src/index.tsx:

src/client-schema.gql

@@ -0,0 +1,25 @@
+# see: https://www.apollographql.com/docs/react/local-state/managing-state-with-field-policies/
+directive @client on FIELD
+
+extend type ShotGQL {
+  startTime: Float!
+  endTime: Float!
+}
+
+extend type UploadStreamGQL {
+  segmentEndFrames: [Int!]!
+}
+
+extend type HLSPlaylistGQL {
+  segmentStartTimes: [Float!]!
+}
+
+type SegmentEndFramesGQL {
+  id: Int!
+  segmentEndFrames: [Int!]!
+}
+
+type SegmentStartTimesGQL {
+  id: Int!
+  segmentStartTimes: [Float!]!
+}

src/operations/feed.gql

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

src/operations/shots.gql

@@ -17,6 +17,29 @@ query GetShotAnnotationTypes {
   }
 }
 
+mutation UpdateShotAnnotations(
+  $shotId: Int!
+  $annotations: [UpdateAnnotationInputGQL!]!
+) {
+  updateShotAnnotations(shotId: $shotId, annotations: $annotations) {
+    shot {
+      id
+      annotations {
+        shotId
+        type {
+          id
+          name
+        }
+        notes
+      }
+    }
+    error {
+      shotId
+      msg
+    }
+  }
+}
+
 query GetShotsWithVideoGql($filterInput: FilterInput!, $limit: Int) {
   getShotsWithMetadata(filterInput: $filterInput, limit: $limit) {
     ids
@@ -31,6 +54,28 @@ query GetShotsWithVideoGql($filterInput: FilterInput!, $limit: Int) {
   }
 }
 
+## Reserved for playlists (which are created from a filter)
+query GetShotsWithMetadataFilterResult(
+  $filterInput: FilterInput!
+  $shotsOrdering: GetShotsOrdering
+  $limit: Int
+  $ids: [Int!]
+) {
+  getOrderedShots(
+    filterInput: $filterInput
+    shotsOrdering: $shotsOrdering
+    limit: $limit
+    ids: $ids
+  ) {
+    count
+    shots {
+      ...ShotWithAllFeatures
+    }
+    ids
+  }
+}
+
+# TODO: Delete
 query GetShotsWithMetadata(
   $filterInput: FilterInput!
   $shotsPagination: GetShotsPagination
@@ -62,18 +107,12 @@ fragment ShotWithAllFeatures on ShotGQL {
   videoId
   startFrame
   endFrame
+  startTime @client
+  endTime @client
   user {
     id
   }
   falsePositiveScore
-  video {
-    stream {
-      resolution {
-        width
-        height
-      }
-    }
-  }
   createdAt
   updatedAt
   cueObjectFeatures {
@@ -99,4 +138,12 @@ fragment ShotWithAllFeatures on ShotGQL {
   serializedShotPaths {
     b64EncodedBuffer
   }
+  annotations {
+    shotId
+    type {
+      id
+      name
+    }
+    notes
+  }
 }

src/operations/user.gql

@@ -57,6 +57,27 @@ 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
+    usernamesAndIds {
+      username
+      id
+    }
+  }
+}
+
 query GetUserTags {
   getUserTags {
     id

src/operations/video.gql

@@ -45,6 +45,7 @@ query GetStreamMonitoringDetails($videoId: Int!, $debuggingJson: JSON) {
       }
     }
     stream {
+      id
       linksRequested
       uploadsCompleted
       segmentProcessingCursor
@@ -117,23 +118,33 @@ query GetVideoDetails($videoId: Int!) {
 
 query GetVideos($videoIds: [Int!]!) {
   getVideos(videoIds: $videoIds) {
+    ...VideoStreamMetadata
+  }
+}
+
+fragment VideoStreamMetadata on VideoGQL {
+  id
+  framesPerSecond
+  stream {
     id
-    framesPerSecond
-    stream {
-      id
-      streamSegmentType
-      segments {
-        uploaded
-        valid
-        segmentIndex
-        endFrameIndex
-        framesPerSecond
-      }
-    }
-    playlist {
-      segmentDurations
+    streamSegmentType
+    segments {
+      uploaded
+      valid
+      segmentIndex
+      endFrameIndex
+      framesPerSecond
     }
   }
+  playlist {
+    segmentDurations
+  }
+}
+
+query GetVideoForShotTime($videoId: Int!) {
+  getVideo(videoId: $videoId) {
+    ...VideoStreamMetadata
+  }
 }
 
 query GetVideo($videoId: Int!) {
@@ -184,6 +195,7 @@ query GetVideo($videoId: Int!) {
       }
     }
     stream {
+      id
       streamSegmentType
       segments {
         segmentIndex
@@ -204,12 +216,14 @@ query GetAverageTimePerShotForVideo($videoId: Int!) {
     averageTimeBetweenShots
   }
 }
+
 query GetElapsedTimeForVideo($videoId: Int!) {
   getVideo(videoId: $videoId) {
     id
     elapsedTime
   }
 }
+
 query GetMedianRunForVideo($videoId: Int!) {
   getVideo(videoId: $videoId) {
     id
@@ -217,23 +231,60 @@ query GetMedianRunForVideo($videoId: Int!) {
   }
 }
 
-query GetVideoForClipTimes($videoId: Int!) {
-  getVideo(videoId: $videoId) {
-    id
+fragment StreamWithEndFrames on UploadStreamGQL {
+  id
+  streamSegmentType
+  segmentEndFrames @client
+  resolution {
+    width
+    height
+  }
+  segments {
+    uploaded
+    valid
+    segmentIndex
+    endFrameIndex
     framesPerSecond
-    playlist {
-      segmentDurations
-    }
-    stream {
-      id
-      streamSegmentType
-      segments {
-        uploaded
-        valid
-        segmentIndex
-        endFrameIndex
-        framesPerSecond
-      }
-    }
+  }
+}
+
+fragment SegmentEndFrames on SegmentEndFramesGQL {
+  id
+  segmentEndFrames
+}
+
+fragment SegmentStartTimes on SegmentStartTimesGQL {
+  id
+  segmentStartTimes
+}
+
+fragment PlaylistWithSegmentStartTimes on HLSPlaylistGQL {
+  videoId
+  segmentDurations
+  segmentStartTimes @client
+}
+
+fragment VideoDurationData on VideoGQL {
+  id
+  framesPerSecond
+  playlist {
+    ...PlaylistWithSegmentStartTimes
+  }
+  stream {
+    ...StreamWithEndFrames
+  }
+}
+
+query GetVideoForClipTimes($videoId: Int!) {
+  getVideo(videoId: $videoId) {
+    ...VideoDurationData
+  }
+}
+
+query GetHeaderInfoByVideoId($videoId: Int!) {
+  getVideo(videoId: $videoId) {
+    id
+    name
+    startTime
   }
 }

src/schema.gql

@@ -9,6 +9,12 @@ type Query {
     videoId: ID!
     intervalDuration: Int! = 300
   ): [MakePercentageIntervalGQL!]!
+  getOrderedShots(
+    filterInput: FilterInput!
+    ids: [Int!] = null
+    shotsOrdering: GetShotsOrdering = null
+    limit: Int! = 500
+  ): GetShotsResult!
   getShotsWithMetadata(
     filterInput: FilterInput!
     ids: [Int!] = null
@@ -29,6 +35,12 @@ type Query {
     limit: Int = null
     after: String = null
   ): [String!]!
+  getUsernamesAndFollowing(
+    userId: Int!
+    matchString: String = null
+    limit: Int = 100
+    after: String = null
+  ): UsernamesAndFollowingResponse!
   getPlayTime(userId: Int!): UserPlayTimeGQL!
   getUserVideos(
     userId: Int = null
@@ -39,6 +51,11 @@ type Query {
   getUserTags: [TagGQL!]!
   getVideo(videoId: Int!, debuggingJson: JSON = null): VideoGQL!
   getVideos(videoIds: [Int!]!): [VideoGQL!]!
+  getFeedVideos(
+    limit: Int! = 5
+    after: String = null
+    filters: VideoFilterInput = null
+  ): VideoHistoryGQL!
 }
 
 type AggregateResultGQL {
@@ -142,6 +159,7 @@ input FilterInput @oneOf {
   videoId: [Int!]
   userId: [Int!]
   username: [String!]
+  fargoRating: FloatRangeFilter
   make: [Boolean!]
   tags: [VideoTagInput!]
   annotations: [ShotAnnotationInput!]
@@ -166,6 +184,8 @@ input FilterInput @oneOf {
   missAngleInDegrees: FloatRangeFilter
   marginOfErrorInDegrees: FloatRangeFilter
   createdAt: DateRangeFilter
+  totalDistance: FloatRangeFilter
+  runLength: FloatRangeFilter
 }
 
 input FloatRangeFilter {
@@ -324,10 +344,13 @@ type UserGQL {
   firebaseUid: String!
   username: String!
   isAdmin: Boolean!
+  fargoRating: Int
   activeVideoId: Int
   profileImageUri: String
   createdAt: DateTime
   updatedAt: DateTime
+  following: [Int!]
+  followers: [Int!]
 }
 
 type ShotAnnotationGQL {
@@ -494,6 +517,33 @@ type VideoProcessingStatusGQL {
   updatedAt: DateTime
 }
 
+input GetShotsOrdering {
+  orderings: [ShotsOrderingComponent!]!
+}
+
+input ShotsOrderingComponent @oneOf {
+  videoCreation: DatetimeShotOrdering
+  marginOfError: FloatShotOrdering
+  videoId: IntShotOrdering
+  startFrame: IntShotOrdering
+  runLength: IntShotOrdering
+}
+
+input DatetimeShotOrdering {
+  descending: Boolean! = true
+  startingAt: DateTime = null
+}
+
+input FloatShotOrdering {
+  descending: Boolean! = true
+  startingAt: Float = null
+}
+
+input IntShotOrdering {
+  descending: Boolean! = true
+  startingAt: Int = null
+}
+
 input GetShotsPagination {
   createdAfter: CreatedAfter!
   startFrameAfter: Int!
@@ -504,6 +554,12 @@ input CreatedAfter @oneOf {
   createdAt: DateTime
 }
 
+type UsernamesAndFollowingResponse {
+  usernames: [String!]!
+  following: [Int!]!
+  followers: [Int!]!
+}
+
 type UserPlayTimeGQL {
   totalSeconds: Float!
 }
@@ -545,10 +601,17 @@ type Mutation {
     annotationName: String!
     notes: String = null
   ): AddShotAnnotationReturn!
+  updateShotAnnotations(
+    shotId: Int!
+    annotations: [UpdateAnnotationInputGQL!]!
+  ): UpdateShotAnnotationReturn!
   getProfileImageUploadLink(
     fileExt: String = ".png"
   ): GetProfileUploadLinkReturn!
   editProfileImageUri(profileImageUri: String!): UserGQL!
+  editUser(input: EditUserInputGQL!): UserGQL!
+  followUser(followedUserId: Int!): UserGQL!
+  unfollowUser(followedUserId: Int!): UserGQL!
   createUploadStream(
     videoMetadata: VideoMetadataInput!
   ): CreateUploadStreamReturn!
@@ -598,6 +661,16 @@ type OtherErrorNeedsNote {
   msg: String
 }
 
+type UpdateShotAnnotationReturn {
+  shot: ShotGQL
+  error: DoesNotOwnShotErr
+}
+
+input UpdateAnnotationInputGQL {
+  name: String!
+  notes: String = null
+}
+
 type GetProfileUploadLinkReturn {
   value: UploadLinkGetProfileUploadLinkErrors!
 }
@@ -624,6 +697,11 @@ type TooManyProfileImageUploadsErr {
   linksRequested: Int!
 }
 
+input EditUserInputGQL {
+  username: String = null
+  fargoRating: Int = null
+}
+
 type CreateUploadStreamReturn {
   videoId: Int!
 }
@@ -634,7 +712,6 @@ input VideoMetadataInput {
   endTime: DateTime = null
   gameType: String = null
   tableSize: Float = null
-  uploadStreamMetadataInput: UploadStreamMetadataInput = null
   lastIntendedSegmentBound: Int = null
   streamSegmentType: StreamSegmentTypeEnum = null
   endStream: Boolean! = false
@@ -642,24 +719,6 @@ input VideoMetadataInput {
   framesPerSecond: Float = null
 }
 
-input UploadStreamMetadataInput {
-  deviceType: DeviceTypeEnum = null
-  osVersion: String = null
-  appVersion: String = null
-  browserName: String = null
-  browserVersion: String = null
-  locale: String = null
-  timezone: String = null
-  networkType: String = null
-  ipAddress: String = null
-}
-
-enum DeviceTypeEnum {
-  IOS
-  ANDROID
-  BROWSER
-}
-
 input VideoResolution {
   width: Int!
   height: Int!