Merge pull request 'Add last intended segment bound in fragment for VideoFeed stream obj' (#154) from loewy/add-last-intended-segment-bound-to-stream into master

Reviewed-on: #154

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/operations/feed.gql

@@ -36,6 +36,7 @@ fragment VideoCardFields on VideoGQL {
   screenshotUri
   stream {
     id
+    lastIntendedSegmentBound
     isCompleted
   }
   tableSize
@@ -62,12 +63,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

@@ -5,9 +5,6 @@ fragment MedalFields on MedalGQL {
 
 query getMedals($scope: MedalScope!, $userId: Int) {
   getMedals(scope: $scope, userId: $userId) {
-    distanceOver66 {
-      ...MedalFields
-    }
     distanceOver78 {
       ...MedalFields
     }
@@ -47,19 +44,18 @@ query getMedals($scope: MedalScope!, $userId: Int) {
     totalMakes100 {
       ...MedalFields
     }
-    # missing assets
+    totalMakes500 {
-    # totalMakes500 {
+      ...MedalFields
-    #   ...MedalFields
+    }
-    # }
+    totalMakes1000 {
-    # totalMakes1000 {
+      ...MedalFields
-    #   ...MedalFields
+    }
-    # }
+    totalMakes5000 {
-    # totalMakes5000 {
+      ...MedalFields
-    #   ...MedalFields
+    }
-    # }
+    totalMakes10000 {
-    # totalMakes10000 {
+      ...MedalFields
-    #   ...MedalFields
+    }
-    # }
     dailyMakes50 {
       ...MedalFields
     }
@@ -72,9 +68,8 @@ query getMedals($scope: MedalScope!, $userId: Int) {
     dailyMakes200 {
       ...MedalFields
     }
-    # missing asset
+    dailyMakes250 {
-    # dailyMakes250 {
+      ...MedalFields
-    #   ...MedalFields
+    }
-    # }
   }
 }

src/operations/shots.gql

@@ -178,3 +178,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
@@ -125,10 +118,12 @@ query getUserFollowingFollowers {
     following {
       id
       username
+      profileImageUri
     }
     followers {
       id
       username
+      profileImageUri
     }
   }
 }
@@ -157,3 +152,16 @@ mutation editUser(
     videosPrivateByDefault
   }
 }
+
+fragment UserFragment on UserGQL {
+  id
+  firebaseUid
+  username
+  isAdmin
+  profileImageUri
+  fargoRating
+  activeVideoId
+  createdAt
+  updatedAt
+  videosPrivateByDefault
+}

src/operations/video.gql

@@ -36,6 +36,7 @@ query GetVideoUpdatePageDetails($videoId: Int!) {
     makePercentage
     elapsedTime
     tableSize
+    private
     tags {
       tagClasses {
         name
@@ -65,6 +66,7 @@ query GetVideoDetails($videoId: Int!) {
     createdAt
     updatedAt
     tableSize
+    private
     owner {
       id
       firebaseUid

src/schema.gql

@@ -66,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 {
@@ -171,6 +183,7 @@ input FilterInput @oneOf {
   shotDirection: [ShotDirectionEnum!]
   videoId: [Int!]
   userId: [Int!]
+  runId: [Int!]
   username: [String!]
   fargoRating: FloatRangeFilter
   make: [Boolean!]
@@ -320,6 +333,8 @@ type MedalGQL {
 input MedalScope @oneOf {
   videoId: Int
   interval: TimeInterval
+    @deprecated(reason: "NO LONGER SUPPORTED, USE DATETIME_RANGE")
+  datetimeRange: DatetimeRangeAggregationInput
 }
 
 type GetRunsResult {
@@ -334,6 +349,8 @@ type RunGQL {
   videoId: Int!
   userId: Int!
   shots: [ShotGQL!]!
+  video: VideoGQL!
+  user: UserGQL!
 }
 
 type ShotGQL {
@@ -352,6 +369,8 @@ type ShotGQL {
   annotations: [ShotAnnotationGQL!]!
   falsePositiveScore: Float
   video: VideoGQL
+  run: RunGQL
+  runFeatures: RunFeaturesGQL
 }
 
 type CueObjectFeaturesGQL {
@@ -591,6 +610,11 @@ type VideoProcessingStatusGQL {
   updatedAt: DateTime
 }
 
+type RunFeaturesGQL {
+  runId: Int!
+  indexInRun: Int!
+}
+
 input RunFilterInput {
   videoId: [Int!]
   userId: [Int!]
@@ -636,6 +660,7 @@ input GetShotsOrdering {
 input ShotsOrderingComponent @oneOf {
   videoCreation: DatetimeOrdering
   marginOfError: FloatOrdering
+  difficulty: FloatOrdering
   videoId: IntOrdering
   startFrame: IntOrdering
   runLength: IntOrdering
@@ -702,9 +727,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!
@@ -742,6 +799,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!
 }
@@ -762,11 +840,6 @@ union DoesNotOwnShotErrOtherErrorNeedsNote =
     DoesNotOwnShotErr
   | OtherErrorNeedsNote
 
-type DoesNotOwnShotErr {
-  shotId: Int!
-  msg: String
-}
-
 type OtherErrorNeedsNote {
   msg: String
 }

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"