Create get usernames and followers operation

Reviewed-on: #83

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/shots.gql

@@ -1,59 +1,3 @@
-query GetShots(
-  $filterInput: FilterInput!
-  $shotsPagination: GetShotsPagination
-  $limit: Int
-  $includeCreatedAt: Boolean! = false
-  $includeUpdatedAt: Boolean! = false
-  $includeCueObjectFeatures: Boolean! = false
-  $includePocketingIntentionFeatures: Boolean! = false
-  $includeCueObjectDistance: Boolean! = false
-  $includeCueObjectAngle: Boolean! = false
-  $includeCueBallSpeed: Boolean! = false
-  $includeSpinType: Boolean! = false
-  $includeShotDirection: Boolean! = false
-  $includeTargetPocketDistance: Boolean! = false
-  $includeMake: Boolean! = false
-  $includeIntendedPocketType: Boolean! = false
-) {
-  getShots(
-    filterInput: $filterInput
-    shotsPagination: $shotsPagination
-    limit: $limit
-  ) {
-    id
-    videoId
-    startFrame
-    endFrame
-    user {
-      id
-    }
-    falsePositiveScore
-    video {
-      stream {
-        resolution {
-          width
-          height
-        }
-      }
-    }
-    createdAt @include(if: $includeCreatedAt)
-    updatedAt @include(if: $includeUpdatedAt)
-    cueObjectFeatures @include(if: $includeCueObjectFeatures) {
-      cueObjectDistance @include(if: $includeCueObjectDistance)
-      cueObjectAngle @include(if: $includeCueObjectAngle)
-      cueBallSpeed @include(if: $includeCueBallSpeed)
-      shotDirection @include(if: $includeShotDirection)
-      spinType @include(if: $includeSpinType)
-    }
-    pocketingIntentionFeatures
-      @include(if: $includePocketingIntentionFeatures) {
-      targetPocketDistance @include(if: $includeTargetPocketDistance)
-      make @include(if: $includeMake)
-      intendedPocketType @include(if: $includeIntendedPocketType)
-    }
-  }
-}
-
 query GetSerializedShotPaths($filterInput: FilterInput!) {
   getShots(filterInput: $filterInput) {
     id
@@ -73,104 +17,78 @@ query GetShotAnnotationTypes {
   }
 }
 
-query GetShotsWithMetadata(
+mutation UpdateShotAnnotations(
-  $filterInput: FilterInput!
+  $shotId: Int!
-  $shotsPagination: GetShotsPagination
+  $annotations: [UpdateAnnotationInputGQL!]!
-  $limit: Int
-  $includeCreatedAt: Boolean! = false
-  $includeUpdatedAt: Boolean! = false
-  $includeCueObjectFeatures: Boolean! = false
-  $includePocketingIntentionFeatures: Boolean! = false
-  $includeCueObjectDistance: Boolean! = false
-  $includeCueObjectAngle: Boolean! = false
-  $includeCueBallSpeed: Boolean! = false
-  $includeSpinType: Boolean! = false
-  $includeShotDirection: Boolean! = false
-  $includeTargetPocketDistance: Boolean! = false
-  $includeMake: Boolean! = false
-  $includeIntendedPocketType: Boolean! = false
 ) {
-  getShotsWithMetadata(
+  updateShotAnnotations(shotId: $shotId, annotations: $annotations) {
-    filterInput: $filterInput
+    value {
-    shotsPagination: $shotsPagination
+      ... on SuccessfulUpdate {
-    limit: $limit
+        value
-  ) {
-    count
-    shots {
-      id
-      videoId
-      startFrame
-      endFrame
-      user {
-        id
       }
-      falsePositiveScore
+      ... on UpdateShotAnnotationErrors {
-      video {
+        error {
-        stream {
+          shotId
-          resolution {
+          msg
-            width
-            height
-          }
         }
       }
-      createdAt @include(if: $includeCreatedAt)
-      updatedAt @include(if: $includeUpdatedAt)
-      cueObjectFeatures @include(if: $includeCueObjectFeatures) {
-        cueObjectDistance @include(if: $includeCueObjectDistance)
-        cueObjectAngle @include(if: $includeCueObjectAngle)
-        cueBallSpeed @include(if: $includeCueBallSpeed)
-        shotDirection @include(if: $includeShotDirection)
-        spinType @include(if: $includeSpinType)
-      }
-      pocketingIntentionFeatures
-        @include(if: $includePocketingIntentionFeatures) {
-        targetPocketDistance @include(if: $includeTargetPocketDistance)
-        make @include(if: $includeMake)
-        intendedPocketType @include(if: $includeIntendedPocketType)
-      }
-      pocketingIntentionInfo @include(if: $includePocketingIntentionFeatures) {
-        ballId
-        pocketId
-        pathMetadataIndex
-      }
-      serializedShotPaths @include(if: $includePocketingIntentionFeatures) {
-        b64EncodedBuffer
-      }
     }
   }
 }
 
-fragment ShotWithAllFeatures on ShotGQL {
+query GetShotsWithVideoGql($filterInput: FilterInput!, $limit: Int) {
-  id
+  getShotsWithMetadata(filterInput: $filterInput, limit: $limit) {
-  videoId
+    ids
-  startFrame
+    shots {
-  endFrame
+      id
-  falsePositiveScore
+      videoId
-  createdAt
+      video {
-  updatedAt
+        screenshotUri
-  user {
+        endTime
-    id
-  }
-  video {
-    id
-    stream {
-      resolution {
-        width
-        height
       }
     }
   }
-  cueObjectFeatures {
+}
-    cueObjectDistance
+
-    cueObjectAngle
+## Reserved for playlists (which are created from a filter)
-    cueBallSpeed
+query GetShotsWithMetadataFilterResult(
-    shotDirection
+  $filterInput: FilterInput!
-    spinType
+  $shotsOrdering: GetShotsOrdering
+  $limit: Int
+  $ids: [Int!]
+) {
+  getOrderedShots(
+    filterInput: $filterInput
+    shotsOrdering: $shotsOrdering
+    limit: $limit
+    ids: $ids
+  ) {
+    count
+    shots {
+      ...ShotWithAllFeatures
+    }
+    ids
   }
-  pocketingIntentionFeatures {
+}
-    targetPocketDistance
+
-    make
+# TODO: Delete
-    intendedPocketType
+query GetShotsWithMetadata(
+  $filterInput: FilterInput!
+  $shotsPagination: GetShotsPagination
+  $limit: Int
+  $ids: [Int!]
+) {
+  getShotsWithMetadata(
+    filterInput: $filterInput
+    shotsPagination: $shotsPagination
+    limit: $limit
+    ids: $ids
+  ) {
+    count
+    shots {
+      ...ShotWithAllFeatures
+    }
+    ids
   }
 }
 
@@ -179,3 +97,49 @@ query GetShotsByIds($ids: [Int!]!) {
     ...ShotWithAllFeatures
   }
 }
+
+fragment ShotWithAllFeatures on ShotGQL {
+  id
+  videoId
+  startFrame
+  endFrame
+  startTime @client
+  endTime @client
+  user {
+    id
+  }
+  falsePositiveScore
+  createdAt
+  updatedAt
+  cueObjectFeatures {
+    cueObjectDistance
+    cueObjectAngle
+    cueBallSpeed
+    shotDirection
+    spinType
+  }
+  pocketingIntentionFeatures {
+    make
+    targetPocketDistance
+    targetPocketAngle
+    targetPocketAngleDirection
+    marginOfErrorInDegrees
+    intendedPocketType
+  }
+  pocketingIntentionInfo {
+    ballId
+    pocketId
+    pathMetadataIndex
+  }
+  serializedShotPaths {
+    b64EncodedBuffer
+  }
+  annotations {
+    shotId
+    type {
+      id
+      name
+    }
+    notes
+  }
+}

src/operations/user.gql

@@ -57,6 +57,24 @@ 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
+    usernames
+  }
+}
+
 query GetUserTags {
   getUserTags {
     id

src/operations/video.gql

@@ -117,23 +117,33 @@ query GetVideoDetails($videoId: Int!) {
 
 query GetVideos($videoIds: [Int!]!) {
   getVideos(videoIds: $videoIds) {
+    ...VideoStreamMetadata
+  }
+}
+
+fragment VideoStreamMetadata on VideoGQL {
+  id
+  framesPerSecond
+  stream {
     id
-    framesPerSecond
+    streamSegmentType
-    stream {
+    segments {
-      id
+      uploaded
-      streamSegmentType
+      valid
-      segments {
+      segmentIndex
-        uploaded
+      endFrameIndex
-        valid
+      framesPerSecond
-        segmentIndex
-        endFrameIndex
-        framesPerSecond
-      }
-    }
-    playlist {
-      segmentDurations
     }
   }
+  playlist {
+    segmentDurations
+  }
+}
+
+query GetVideoForShotTime($videoId: Int!) {
+  getVideo(videoId: $videoId) {
+    ...VideoStreamMetadata
+  }
 }
 
 query GetVideo($videoId: Int!) {
@@ -204,12 +214,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 +229,60 @@ query GetMedianRunForVideo($videoId: Int!) {
   }
 }
 
-query GetVideoForClipTimes($videoId: Int!) {
+fragment StreamWithEndFrames on UploadStreamGQL {
-  getVideo(videoId: $videoId) {
+  id
-    id
+  streamSegmentType
+  segmentEndFrames @client
+  resolution {
+    width
+    height
+  }
+  segments {
+    uploaded
+    valid
+    segmentIndex
+    endFrameIndex
     framesPerSecond
-    playlist {
+  }
-      segmentDurations
+}
-    }
+
-    stream {
+fragment SegmentEndFrames on SegmentEndFramesGQL {
-      id
+  id
-      streamSegmentType
+  segmentEndFrames
-      segments {
+}
-        uploaded
+
-        valid
+fragment SegmentStartTimes on SegmentStartTimesGQL {
-        segmentIndex
+  id
-        endFrameIndex
+  segmentStartTimes
-        framesPerSecond
+}
-      }
+
-    }
+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,8 +9,15 @@ 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
     shotsPagination: GetShotsPagination = null
     limit: Int! = 500
   ): GetShotsResult!
@@ -28,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
@@ -38,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 {
@@ -124,6 +142,7 @@ enum AlignedIntervalEnum {
   MONTH
   YEAR
   WEEK
+  DAY
 }
 
 input FilterInput @oneOf {
@@ -139,6 +158,8 @@ input FilterInput @oneOf {
   shotDirection: [ShotDirectionEnum!]
   videoId: [Int!]
   userId: [Int!]
+  username: [String!]
+  fargoRating: FloatRangeFilter
   make: [Boolean!]
   tags: [VideoTagInput!]
   annotations: [ShotAnnotationInput!]
@@ -161,7 +182,10 @@ input FilterInput @oneOf {
   targetPocketAngleDirection: [ShotDirectionEnum!]
   targetPocketAngle: FloatRangeFilter
   missAngleInDegrees: FloatRangeFilter
+  marginOfErrorInDegrees: FloatRangeFilter
   createdAt: DateRangeFilter
+  totalDistance: FloatRangeFilter
+  runLength: FloatRangeFilter
 }
 
 input FloatRangeFilter {
@@ -281,6 +305,7 @@ type PocketingIntentionFeaturesGQL {
   difficulty: Float
   targetPocketAngle: Float
   targetPocketAngleDirection: ShotDirectionEnum
+  marginOfErrorInDegrees: Float
   backcut: Boolean
 }
 
@@ -319,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 {
@@ -489,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!
@@ -499,6 +554,12 @@ input CreatedAfter @oneOf {
   createdAt: DateTime
 }
 
+type UsernamesAndFollowingResponse {
+  usernames: [String!]!
+  following: [Int!]!
+  followers: [Int!]!
+}
+
 type UserPlayTimeGQL {
   totalSeconds: Float!
 }
@@ -540,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!
@@ -593,6 +661,27 @@ type OtherErrorNeedsNote {
   msg: String
 }
 
+type UpdateShotAnnotationReturn {
+  value: SuccessfulUpdateUpdateShotAnnotationErrors!
+}
+
+union SuccessfulUpdateUpdateShotAnnotationErrors =
+    SuccessfulUpdate
+  | UpdateShotAnnotationErrors
+
+type SuccessfulUpdate {
+  value: Boolean!
+}
+
+type UpdateShotAnnotationErrors {
+  error: DoesNotOwnShotErr
+}
+
+input UpdateAnnotationInputGQL {
+  name: String!
+  notes: String = null
+}
+
 type GetProfileUploadLinkReturn {
   value: UploadLinkGetProfileUploadLinkErrors!
 }
@@ -619,6 +708,11 @@ type TooManyProfileImageUploadsErr {
   linksRequested: Int!
 }
 
+input EditUserInputGQL {
+  username: String = null
+  fargoRating: Int = null
+}
+
 type CreateUploadStreamReturn {
   videoId: Int!
 }
@@ -629,7 +723,6 @@ input VideoMetadataInput {
   endTime: DateTime = null
   gameType: String = null
   tableSize: Float = null
-  uploadStreamMetadataInput: UploadStreamMetadataInput = null
   lastIntendedSegmentBound: Int = null
   streamSegmentType: StreamSegmentTypeEnum = null
   endStream: Boolean! = false
@@ -637,24 +730,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!