Merge pull request 'Get user following followers' (#101) from kat/get-user-following-followers into master

Reviewed-on: #101

pyproject.toml

@@ -7,7 +7,7 @@ readme = "README.md"
 packages = [{include = "rbproto"}]
 
 [tool.poetry.dependencies]
-python = ">=3.10,<3.12"
+python = ">=3.10,<=3.13"
 protobuf = "^4.25.3"
 
 

src/operations/feed.gql

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

src/operations/shots.gql

@@ -17,9 +17,39 @@ query GetShotAnnotationTypes {
   }
 }
 
-query GetShotsWithVideoGql($filterInput: FilterInput!, $limit: Int) {
-  getShotsWithMetadata(filterInput: $filterInput, limit: $limit) {
-    ids
+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!
+  $shotsOrdering: GetShotsOrdering
+  $limit: Int
+) {
+  getOrderedShots(
+    filterInput: $filterInput
+    shotsOrdering: $shotsOrdering
+    limit: $limit
+  ) {
     shots {
       id
       videoId
@@ -115,4 +145,12 @@ fragment ShotWithAllFeatures on ShotGQL {
   serializedShotPaths {
     b64EncodedBuffer
   }
+  annotations {
+    shotId
+    type {
+      id
+      name
+    }
+    notes
+  }
 }

src/operations/user.gql

@@ -37,6 +37,7 @@ query getLoggedInUser {
     username
     isAdmin
     profileImageUri
+    fargoRating
     activeVideoId
     createdAt
     updatedAt
@@ -57,9 +58,70 @@ query getUsernames(
   getUsernames(matchString: $matchString, limit: $limit, after: $after)
 }
 
+query getUserRelationshipsMatching(
+  $userId: Int!
+  $matchString: String!
+  $limit: Int = null
+  $after: String = null
+) {
+  getUserRelationshipsMatching(
+    userId: $userId
+    matchString: $matchString
+    limit: $limit
+    after: $after
+  ) {
+    relationships {
+      toUser {
+        username
+        id
+      }
+      toUserFollows
+      toUserIsFollowedBy
+    }
+  }
+}
+
 query GetUserTags {
   getUserTags {
     id
     name
   }
 }
+
+mutation followUser($followedUserId: Int!) {
+  followUser(followedUserId: $followedUserId) {
+    username
+    following {
+      id
+    }
+    followers {
+      id
+    }
+  }
+}
+
+mutation unfollowUser($followedUserId: Int!) {
+  unfollowUser(followedUserId: $followedUserId) {
+    username
+    following {
+      id
+    }
+    followers {
+      id
+    }
+  }
+}
+
+query getUserFollowingFollowers {
+  getLoggedInUser {
+    id
+    following {
+      id
+      username
+    }
+    followers {
+      id
+      username
+    }
+  }
+}

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

@@ -35,6 +35,12 @@ type Query {
     limit: Int = null
     after: String = null
   ): [String!]!
+  getUserRelationshipsMatching(
+    userId: Int!
+    matchString: String = null
+    limit: Int = 100
+    after: String = null
+  ): UserRelationshipsResult!
   getPlayTime(userId: Int!): UserPlayTimeGQL!
   getUserVideos(
     userId: Int = null
@@ -179,6 +185,7 @@ input FilterInput @oneOf {
   marginOfErrorInDegrees: FloatRangeFilter
   createdAt: DateRangeFilter
   totalDistance: FloatRangeFilter
+  runLength: FloatRangeFilter
 }
 
 input FloatRangeFilter {
@@ -334,16 +341,16 @@ type SerializedShotPathsGQL {
 
 type UserGQL {
   id: Int!
-  firebaseUid: String!
+  firebaseUid: String
   username: String!
-  isAdmin: Boolean!
+  isAdmin: Boolean
   fargoRating: Int
   activeVideoId: Int
   profileImageUri: String
   createdAt: DateTime
   updatedAt: DateTime
-  following: [Int!]
-  followers: [Int!]
+  following: [UserGQL!]
+  followers: [UserGQL!]
 }
 
 type ShotAnnotationGQL {
@@ -519,6 +526,7 @@ input ShotsOrderingComponent @oneOf {
   marginOfError: FloatShotOrdering
   videoId: IntShotOrdering
   startFrame: IntShotOrdering
+  runLength: IntShotOrdering
 }
 
 input DatetimeShotOrdering {
@@ -546,6 +554,17 @@ input CreatedAfter @oneOf {
   createdAt: DateTime
 }
 
+type UserRelationshipsResult {
+  inquiringUser: UserGQL!
+  relationships: [UserRelationship!]!
+}
+
+type UserRelationship {
+  toUser: UserGQL!
+  toUserFollows: Boolean!
+  toUserIsFollowedBy: Boolean!
+}
+
 type UserPlayTimeGQL {
   totalSeconds: Float!
 }
@@ -648,18 +667,7 @@ type OtherErrorNeedsNote {
 }
 
 type UpdateShotAnnotationReturn {
-  value: SuccessfulUpdateUpdateShotAnnotationErrors!
-}
-
-union SuccessfulUpdateUpdateShotAnnotationErrors =
-    SuccessfulUpdate
-  | UpdateShotAnnotationErrors
-
-type SuccessfulUpdate {
-  value: Boolean!
-}
-
-type UpdateShotAnnotationErrors {
+  shot: ShotGQL
   error: DoesNotOwnShotErr
 }