Merge pull request 'Add average time field to video in feed operation' (#164) from loewy/add-average-time-per-shot-in-feed-operation into master

Reviewed-on: #164

package.json

@@ -12,7 +12,7 @@
   "author": "Ivan Malison <IvanMalison@gmail.com>",
   "license": "MIT",
   "dependencies": {
-    "@apollo/client": "^3.9.2",
+    "@apollo/client": "^3.11.10",
     "@graphql-codegen/cli": "^5.0.0",
     "@graphql-codegen/typescript": "^4.0.1",
     "@graphql-codegen/typescript-operations": "^4.0.1",

src/client-schema.gql

@@ -1,9 +1,16 @@
 # see: https://www.apollographql.com/docs/react/local-state/managing-state-with-field-policies/
 directive @client on FIELD
 
+type SegmentInfo {
+  index: Int!
+  time: Float!
+}
+
 extend type ShotGQL {
   startTime: Float!
   endTime: Float!
+  startSegment: SegmentInfo!
+  endSegment: SegmentInfo!
 }
 
 extend type UploadStreamGQL {

src/operations/feed.gql

@@ -27,6 +27,8 @@ fragment VideoCardFields on VideoGQL {
   totalShotsMade
   totalShots
   makePercentage
+  averageTimeBetweenShots
+  averageDifficulty
   createdAt
   updatedAt
   startTime
@@ -36,6 +38,7 @@ fragment VideoCardFields on VideoGQL {
   screenshotUri
   stream {
     id
+    lastIntendedSegmentBound
     isCompleted
   }
   tableSize
@@ -62,12 +65,16 @@ query GetVideoFeed(
   $after: String = null
   $filters: VideoFilterInput = null
   $includeCallersVideos: Boolean = null
+  $includePrivate: IncludePrivateEnum = MINE
+  $feedInput: VideoFeedInputGQL = null
 ) {
   getFeedVideos(
     limit: $limit
     after: $after
     filters: $filters
     includeCallersVideos: $includeCallersVideos
+    includePrivate: $includePrivate
+    feedInput: $feedInput
   ) {
     videos {
       ...VideoCardFields

src/operations/leaderboards.gql

@@ -0,0 +1,32 @@
+query GetMakesLeaderboard($interval: TimeInterval, $when: DateTime) {
+  getMakesLeaderboard(interval: $interval, when: $when) {
+    entries {
+      user {
+        id
+        username
+        profileImageUri
+      }
+      value
+      proportionMade
+      total
+    }
+  }
+}
+
+query GetRunsLeaderboard($interval: TimeInterval, $when: DateTime) {
+  getLongestRunsLeaderboard(interval: $interval, when: $when) {
+    entries {
+      id
+      runLength
+      video {
+        name
+        createdAt
+      }
+      user {
+        id
+        username
+        profileImageUri
+      }
+    }
+  }
+}

src/operations/medals.gql

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

src/operations/runs.gql

@@ -0,0 +1,24 @@
+query GetRunsForHighlights(
+  $filterInput: RunFilterInput!
+  $runIds: [Int!] = null
+  $runsOrdering: GetRunsOrdering
+) {
+  getRuns(
+    filterInput: $filterInput
+    runIds: $runIds
+    runsOrdering: $runsOrdering
+  ) {
+    count
+    runs {
+      id
+      runLength
+      userId
+      videoId
+      shots {
+        videoId
+        id
+      }
+    }
+    runIds
+  }
+}

src/operations/shots.gql

@@ -139,6 +139,14 @@ fragment ShotWithAllFeatures on ShotGQL {
   endFrame
   startTime @client
   endTime @client
+  startSegment @client {
+    index
+    time
+  }
+  endSegment @client {
+    index
+    time
+  }
   user {
     id
   }
@@ -159,6 +167,7 @@ fragment ShotWithAllFeatures on ShotGQL {
     targetPocketAngleDirection
     marginOfErrorInDegrees
     intendedPocketType
+    difficulty
   }
   pocketingIntentionInfo {
     ballId
@@ -177,3 +186,15 @@ fragment ShotWithAllFeatures on ShotGQL {
     notes
   }
 }
+
+mutation EditShot($shotId: Int!, $fieldsToEdit: EditableShotFieldInputGQL!) {
+  editShot(shotId: $shotId, fieldsToEdit: $fieldsToEdit) {
+    error {
+      shotId
+      msg
+    }
+    shot {
+      ...ShotWithAllFeatures
+    }
+  }
+}

src/operations/user.gql

@@ -21,27 +21,19 @@ mutation getProfileImageUploadLink($fileExt: String = ".png") {
 
 mutation editProfileImageUri($profileImageUri: String!) {
   editProfileImageUri(profileImageUri: $profileImageUri) {
-    id
+    ...UserFragment
-    firebaseUid
-    username
-    profileImageUri
-    createdAt
-    updatedAt
   }
 }
 
 query getLoggedInUser {
   getLoggedInUser {
-    id
+    ...UserFragment
-    firebaseUid
+  }
-    username
+}
-    isAdmin
+
-    profileImageUri
+query GetUser($userId: Int!) {
-    fargoRating
+  getUser(userId: $userId) {
-    activeVideoId
+    ...UserFragment
-    createdAt
-    updatedAt
-    videosPrivateByDefault
   }
 }
 
@@ -74,6 +66,7 @@ query getUserRelationshipsMatching(
     relationships {
       toUser {
         username
+        profileImageUri
         id
       }
       toUserFollows
@@ -86,6 +79,10 @@ query GetUserTags {
   getUserTags {
     id
     name
+    tagClasses {
+      id
+      name
+    }
   }
 }
 
@@ -125,10 +122,12 @@ query getUserFollowingFollowers {
     following {
       id
       username
+      profileImageUri
     }
     followers {
       id
       username
+      profileImageUri
     }
   }
 }
@@ -157,3 +156,16 @@ mutation editUser(
     videosPrivateByDefault
   }
 }
+
+fragment UserFragment on UserGQL {
+  id
+  firebaseUid
+  username
+  isAdmin
+  profileImageUri
+  fargoRating
+  activeVideoId
+  createdAt
+  updatedAt
+  videosPrivateByDefault
+}

src/operations/video.gql

@@ -18,6 +18,7 @@ query GetStreamMonitoringDetails($videoId: Int!, $debuggingJson: JSON) {
       initPlaylistUploadStatus
     }
     currentProcessing {
+      id
       errors {
         message
         startSegmentIndex
@@ -35,6 +36,7 @@ query GetVideoUpdatePageDetails($videoId: Int!) {
     makePercentage
     elapsedTime
     tableSize
+    private
     tags {
       tagClasses {
         name
@@ -64,6 +66,7 @@ query GetVideoDetails($videoId: Int!) {
     createdAt
     updatedAt
     tableSize
+    private
     owner {
       id
       firebaseUid
@@ -213,6 +216,23 @@ query GetHeaderInfoByVideoId($videoId: Int!) {
     startTime
   }
 }
+query GetBannerInfoByVideoId($videoId: Int!) {
+  getVideo(videoId: $videoId) {
+    id
+    name
+    stream {
+      id
+      lastIntendedSegmentBound
+    }
+    owner {
+      id
+    }
+    currentProcessing {
+      id
+      status
+    }
+  }
+}
 
 mutation FindPrerecordTableLayout($b64Image: String!, $videoId: Int!) {
   findPrerecordTableLayout(b64Image: $b64Image, videoId: $videoId) {
@@ -221,6 +241,7 @@ mutation FindPrerecordTableLayout($b64Image: String!, $videoId: Int!) {
 }
 
 fragment HomographyInfo on HomographyInfoGQL {
+  id
   frameIndex
   crop {
     left

src/operations/video_upload.gql

@@ -101,13 +101,8 @@ query GetUploadStreams(
     }
   }
 }
-query GetUploadStreamsWithDetails(
+
-  $limit: Int! = 5
+fragment UploadStreamWithDetails on VideoGQL {
-  $after: String = null
-  $filters: VideoFilterInput = null
-) {
-  getUserVideos(limit: $limit, after: $after, filters: $filters) {
-    videos {
   id
   name
   startTime
@@ -118,6 +113,16 @@ query GetUploadStreamsWithDetails(
     uploadsCompleted
   }
 }
+
+query GetUploadStreamsWithDetails(
+  $limit: Int! = 5
+  $after: String = null
+  $filters: VideoFilterInput = null
+) {
+  getUserVideos(limit: $limit, after: $after, filters: $filters) {
+    videos {
+      ...UploadStreamWithDetails
+    }
     pageInfo {
       hasNextPage
       endCursor

src/schema.gql

@@ -10,6 +10,13 @@ type Query {
     intervalDuration: Int! = 300
   ): [MakePercentageIntervalGQL!]!
   getMedals(scope: MedalScope!, userId: Int = null): RequestedMedalsGQL!
+  getRuns(
+    filterInput: RunFilterInput!
+    runIds: [Int!] = null
+    runsOrdering: GetRunsOrdering = null
+    limit: Int! = 500
+    countRespectsLimit: Boolean! = false
+  ): GetRunsResult!
   getOrderedShots(
     filterInput: FilterInput!
     ids: [Int!] = null
@@ -59,9 +66,21 @@ type Query {
   getFeedVideos(
     limit: Int! = 5
     after: String = null
+    includePrivate: IncludePrivateEnum! = MINE
     includeCallersVideos: Boolean = true
     filters: VideoFilterInput = null
+    feedInput: VideoFeedInputGQL = null
   ): VideoHistoryGQL!
+  getLongestRunsLeaderboard(
+    interval: TimeInterval = null
+    when: DateTime = null
+    limit: Int! = 100
+    requiredTags: [String!] = null
+  ): RunLeaderboardGQL!
+  getMakesLeaderboard(
+    interval: TimeInterval = null
+    when: DateTime = null
+  ): CountLeaderboardGQL!
 }
 
 type AggregateResultGQL {
@@ -164,6 +183,7 @@ input FilterInput @oneOf {
   shotDirection: [ShotDirectionEnum!]
   videoId: [Int!]
   userId: [Int!]
+  runId: [Int!]
   username: [String!]
   fargoRating: FloatRangeFilter
   make: [Boolean!]
@@ -286,42 +306,51 @@ type RequestedMedalsGQL {
   runLength30: MedalGQL
   runLength40: MedalGQL
   runLength50: MedalGQL
-  totalMakes25: MedalGQL
+  totalMakes25: MedalGQL @deprecated(reason: "no longer supported")
-  totalMakes50: MedalGQL
+  totalMakes50: MedalGQL @deprecated(reason: "no longer supported")
-  totalMakes75: MedalGQL
+  totalMakes75: MedalGQL @deprecated(reason: "no longer supported")
+  totalMakes200: MedalGQL @deprecated(reason: "no longer supported")
+  totalMakes300: MedalGQL @deprecated(reason: "no longer supported")
+  totalMakes400: MedalGQL @deprecated(reason: "no longer supported")
+  totalMakes750: MedalGQL @deprecated(reason: "no longer supported")
   totalMakes100: MedalGQL
-  totalMakes200: MedalGQL
-  totalMakes300: MedalGQL
-  totalMakes400: MedalGQL
   totalMakes500: MedalGQL
-  totalMakes750: MedalGQL
   totalMakes1000: MedalGQL
-  dayStreak2: MedalGQL
+  totalMakes5000: MedalGQL
-  dayStreak3: MedalGQL
+  totalMakes10000: MedalGQL
-  dayStreak4: MedalGQL
+  dailyMakes50: MedalGQL
-  dayStreak5: MedalGQL
+  dailyMakes100: MedalGQL
-  dayStreak6: MedalGQL
+  dailyMakes150: MedalGQL
-  dayStreak7: MedalGQL
+  dailyMakes200: MedalGQL
-  dayStreak14: MedalGQL
+  dailyMakes250: MedalGQL
-  dayStreak21: MedalGQL
-  dayStreak30: MedalGQL
-  dayStreak60: MedalGQL
-  dayStreak90: MedalGQL
 }
 
 type MedalGQL {
   count: Int!
+  nickname: String
 }
 
 input MedalScope @oneOf {
   videoId: Int
   interval: TimeInterval
+    @deprecated(reason: "NO LONGER SUPPORTED, USE DATETIME_RANGE")
+  datetimeRange: DatetimeRangeAggregationInput
 }
 
-type GetShotsResult {
+type GetRunsResult {
-  shots: [ShotGQL!]!
+  runs: [RunGQL!]!
   count: Int
-  ids: [Int!]!
+  runIds: [Int!]!
+}
+
+type RunGQL {
+  id: Int!
+  runLength: Int!
+  videoId: Int!
+  userId: Int!
+  shots: [ShotGQL!]!
+  video: VideoGQL!
+  user: UserGQL!
 }
 
 type ShotGQL {
@@ -340,6 +369,8 @@ type ShotGQL {
   annotations: [ShotAnnotationGQL!]!
   falsePositiveScore: Float
   video: VideoGQL
+  run: RunGQL
+  runFeatures: RunFeaturesGQL
 }
 
 type CueObjectFeaturesGQL {
@@ -431,6 +462,7 @@ type VideoGQL {
   makePercentage: Float!
   medianRun: Float
   averageTimeBetweenShots: Float
+  averageDifficulty: Float
   createdAt: DateTime
   updatedAt: DateTime
   shots: [ShotGQL!]!
@@ -462,6 +494,7 @@ type UploadStreamGQL {
   createdAt: DateTime!
   updatedAt: DateTime!
   segments: [UploadSegmentGQL!]!
+  clientUploadStatus: ClientUploadStatusEnum
   resolution: VideoResolutionGQL!
   streamSegmentType: StreamSegmentTypeEnum!
 }
@@ -486,6 +519,11 @@ type UploadSegmentGQL {
   linksRequested: Int!
 }
 
+enum ClientUploadStatusEnum {
+  UPLOAD_ENABLED
+  UPLOAD_DISABLED
+}
+
 type VideoResolutionGQL {
   width: Int
   height: Int
@@ -573,33 +611,67 @@ type VideoProcessingStatusGQL {
   updatedAt: DateTime
 }
 
+type RunFeaturesGQL {
+  runId: Int!
+  indexInRun: Int!
+}
+
+input RunFilterInput {
+  videoId: [Int!]
+  userId: [Int!]
+  username: [String!]
+  andFilters: [RunFilterInput!]
+  orFilters: [RunFilterInput!]
+  notFilter: RunFilterInput
+  tableSize: FloatRangeFilter
+  createdAt: DateRangeFilter
+  runLength: FloatRangeFilter
+}
+
+input GetRunsOrdering {
+  orderings: [RunsOrderingComponent!]!
+}
+
+input RunsOrderingComponent @oneOf {
+  runLength: IntOrdering
+  videoId: IntOrdering
+  videoCreation: DatetimeOrdering
+}
+
+input IntOrdering {
+  descending: Boolean! = true
+  startingAt: Int = null
+}
+
+input DatetimeOrdering {
+  descending: Boolean! = true
+  startingAt: DateTime = null
+}
+
+type GetShotsResult {
+  shots: [ShotGQL!]!
+  count: Int
+  ids: [Int!]!
+}
+
 input GetShotsOrdering {
   orderings: [ShotsOrderingComponent!]!
 }
 
 input ShotsOrderingComponent @oneOf {
-  videoCreation: DatetimeShotOrdering
+  videoCreation: DatetimeOrdering
-  marginOfError: FloatShotOrdering
+  marginOfError: FloatOrdering
-  videoId: IntShotOrdering
+  difficulty: FloatOrdering
-  startFrame: IntShotOrdering
+  videoId: IntOrdering
-  runLength: IntShotOrdering
+  startFrame: IntOrdering
+  runLength: IntOrdering
 }
 
-input DatetimeShotOrdering {
+input FloatOrdering {
-  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!
@@ -643,9 +715,14 @@ type PageInfoGQL {
 }
 
 type TagGQL {
-  name: String!
   id: Int!
-  group: String
+  name: String!
+  tagClasses: [TagClassGQL!]
+}
+
+type TagClassGQL {
+  id: Int!
+  name: String!
 }
 
 """
@@ -656,9 +733,41 @@ scalar JSON
     url: "https://ecma-international.org/wp-content/uploads/ECMA-404_2nd_edition_december_2017.pdf"
   )
 
+enum IncludePrivateEnum {
+  ALL
+  MINE
+  NONE
+}
+
+input VideoFeedInputGQL @oneOf {
+  followedByUserId: Int
+  userId: Int
+  allUsers: Boolean
+}
+
+type RunLeaderboardGQL {
+  entries: [RunGQL!]!
+}
+
+type CountLeaderboardGQL {
+  entries: [UserShotCountEntry!]!
+}
+
+type UserShotCountEntry {
+  user: UserGQL!
+  value: Int!
+  total: Int!
+  proportionMade: Float!
+  videos: Int!
+}
+
 type Mutation {
   createBucketSet(params: CreateBucketSetInput!): BucketSetGQL!
   setLoggerLevel(path: String!, level: String!): Boolean!
+  editShot(
+    shotId: Int!
+    fieldsToEdit: EditableShotFieldInputGQL!
+  ): EditShotReturn!
   addAnnotationToShot(
     shotId: Int!
     annotationName: String!
@@ -696,6 +805,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!
 }
@@ -716,11 +846,6 @@ union DoesNotOwnShotErrOtherErrorNeedsNote =
     DoesNotOwnShotErr
   | OtherErrorNeedsNote
 
-type DoesNotOwnShotErr {
-  shotId: Int!
-  msg: String
-}
-
 type OtherErrorNeedsNote {
   msg: String
 }
@@ -776,11 +901,18 @@ input VideoMetadataInput {
   startTime: DateTime = null
   endTime: DateTime = null
   gameType: String = null
+    @deprecated(reason: "`game_type` is deprecated. Use `tags` instead.")
+
+  """
+  A list of tags associated with the video. Replace `game_type`
+  """
+  tags: [VideoTagInput!] = null
   tableSize: Float = null
   lastIntendedSegmentBound: Int = null
   streamSegmentType: StreamSegmentTypeEnum = null
   private: Boolean = null
   endStream: Boolean! = false
+  clientUploadStatus: ClientUploadStatusEnum = null
   resolution: VideoResolution = null
   framesPerSecond: Float = null
 }

yarn.lock

@@ -10,10 +10,10 @@
     "@jridgewell/gen-mapping" "^0.3.0"
     "@jridgewell/trace-mapping" "^0.3.9"
 
-"@apollo/client@^3.9.2":
+"@apollo/client@^3.11.10":
-  version "3.9.2"
+  version "3.12.3"
-  resolved "https://registry.yarnpkg.com/@apollo/client/-/client-3.9.2.tgz#96edf2c212f828bad1ef3d84234fa473c5a27ff8"
+  resolved "https://registry.yarnpkg.com/@apollo/client/-/client-3.12.3.tgz#0d252749baad8328e06883fe118dc7e73e3bbb1f"
-  integrity sha512-Zw9WvXjqhpbgkvAvnj52vstOWwM0iedKWtn1hSq1cODQyoe1CF2uFwMYFI7l56BrAY9CzLi6MQA0AhxpgJgvxw==
+  integrity sha512-KZ5zymRdb8bMbGUb1wP2U04ff7qIGgaC1BCdCVC+IPFiXkxEhHBc5fDEQOwAUT+vUo9KbBh3g7QK/JCOswn59w==
   dependencies:
     "@graphql-typed-document-node/core" "^3.1.1"
     "@wry/caches" "^1.0.0"
@@ -23,7 +23,7 @@
     hoist-non-react-statics "^3.3.2"
     optimism "^0.18.0"
     prop-types "^15.7.2"
-    rehackt "0.0.3"
+    rehackt "^0.1.0"
     response-iterator "^0.2.6"
     symbol-observable "^4.0.0"
     ts-invariant "^0.10.3"
@@ -2633,10 +2633,10 @@ regenerator-runtime@^0.14.0:
   resolved "https://registry.yarnpkg.com/regenerator-runtime/-/regenerator-runtime-0.14.1.tgz#356ade10263f685dda125100cd862c1db895327f"
   integrity sha512-dYnhHh0nJoMfnkZs6GmmhFknAGRrLznOu5nc9ML+EJxGvrx6H7teuevqVqCuPcPK//3eDrrjQhehXVx9cnkGdw==
 
-rehackt@0.0.3:
+rehackt@^0.1.0:
-  version "0.0.3"
+  version "0.1.0"
-  resolved "https://registry.yarnpkg.com/rehackt/-/rehackt-0.0.3.tgz#1ea454620d4641db8342e2db44595cf0e7ac6aa0"
+  resolved "https://registry.yarnpkg.com/rehackt/-/rehackt-0.1.0.tgz#a7c5e289c87345f70da8728a7eb878e5d03c696b"
-  integrity sha512-aBRHudKhOWwsTvCbSoinzq+Lej/7R8e8UoPvLZo5HirZIIBLGAgdG7SL9QpdcBoQ7+3QYPi3lRLknAzXBlhZ7g==
+  integrity sha512-7kRDOuLHB87D/JESKxQoRwv4DzbIdwkAGQ7p6QKGdVlY1IZheUnVhlk/4UZlNUVxdAXpyxikE3URsG067ybVzw==
 
 relay-runtime@12.0.0:
   version "12.0.0"