Merge pull request 'Add ID to user processing' (#134) from kat/add-id-processing into master

Reviewed-on: #134

src/operations/feed.gql

@@ -1,3 +1,4 @@
+# DO NOT USE: use getVideoFeed instead
 query GetFeed(
   $limit: Int! = 5
   $after: String = null
@@ -5,32 +6,71 @@ query GetFeed(
 ) {
   getUserVideos(limit: $limit, after: $after, filters: $filters) {
     videos {
-      id
+      ...VideoCardFields
-      owner {
+    }
-        username
+    pageInfo {
-      }
+      hasNextPage
-      name
+      endCursor
-      screenshotUri
+    }
-      totalShotsMade
+  }
-      totalShots
+}
-      makePercentage
+
-      createdAt
+fragment VideoCardFields on VideoGQL {
-      updatedAt
+  id
-      startTime
+  owner {
-      endTime
+    id
-      elapsedTime
+    username
-      screenshotUri
+    profileImageUri
-      stream {
+  }
-        id
+  name
-        isCompleted
+  screenshotUri
-      }
+  totalShotsMade
-      tableSize
+  totalShots
-      tags {
+  makePercentage
-        tagClasses {
+  createdAt
-          name
+  updatedAt
-        }
+  startTime
-        name
+  endTime
-      }
+  private
+  elapsedTime
+  screenshotUri
+  stream {
+    id
+    isCompleted
+  }
+  tableSize
+  tags {
+    tagClasses {
+      name
+    }
+    name
+  }
+  currentProcessing {
+    id
+    errors {
+      message
+    }
+    status
+    statuses {
+      status
+    }
+  }
+}
+
+query GetVideoFeed(
+  $limit: Int! = 5
+  $after: String = null
+  $filters: VideoFilterInput = null
+  $includeCallersVideos: Boolean = null
+) {
+  getFeedVideos(
+    limit: $limit
+    after: $after
+    filters: $filters
+    includeCallersVideos: $includeCallersVideos
+  ) {
+    videos {
+      ...VideoCardFields
     }
     pageInfo {
       hasNextPage

src/operations/shots.gql

@@ -40,6 +40,7 @@ mutation UpdateShotAnnotations(
   }
 }
 
+## Should be deprecated
 query GetShotsWithVideoGql(
   $filterInput: FilterInput!
   $shotsOrdering: GetShotsOrdering
@@ -61,18 +62,40 @@ query GetShotsWithVideoGql(
   }
 }
 
+query GetShotsWithJustIds(
+  $filterInput: FilterInput!
+  $shotsOrdering: GetShotsOrdering
+  $limit: Int
+  $countRespectsLimit: Boolean
+) {
+  getOrderedShots(
+    filterInput: $filterInput
+    shotsOrdering: $shotsOrdering
+    limit: $limit
+    countRespectsLimit: $countRespectsLimit
+  ) {
+    count
+    shots {
+      id
+      videoId
+    }
+  }
+}
+
 ## Reserved for playlists (which are created from a filter)
 query GetShotsWithMetadataFilterResult(
   $filterInput: FilterInput!
   $shotsOrdering: GetShotsOrdering
   $limit: Int
   $ids: [Int!]
+  $countRespectsLimit: Boolean
 ) {
   getOrderedShots(
     filterInput: $filterInput
     shotsOrdering: $shotsOrdering
     limit: $limit
     ids: $ids
+    countRespectsLimit: $countRespectsLimit
   ) {
     count
     shots {

src/operations/user.gql

@@ -41,11 +41,12 @@ query getLoggedInUser {
     activeVideoId
     createdAt
     updatedAt
+    videosPrivateByDefault
   }
 }
 
-query GetUserPlayTime($userId: Int!) {
+query GetUserPlayTime($userId: Int!, $filters: VideoFilterInput) {
-  getPlayTime(userId: $userId) {
+  getPlayTime(userId: $userId, filters: $filters) {
     totalSeconds
   }
 }
@@ -135,3 +136,24 @@ query getUserFollowingFollowers {
 query doesUsernameExist($candidateUsername: String!) {
   doesUsernameExist(candidateUsername: $candidateUsername)
 }
+
+mutation editUser(
+  $username: String
+  $fargoRating: Int
+  $videosPrivateByDefault: Boolean
+) {
+  editUser(
+    input: {
+      username: $username
+      fargoRating: $fargoRating
+      videosPrivateByDefault: $videosPrivateByDefault
+    }
+  ) {
+    id
+    firebaseUid
+    username
+    fargoRating
+    updatedAt
+    videosPrivateByDefault
+  }
+}

src/operations/video.gql

@@ -5,44 +5,7 @@ query GetStreamMonitoringDetails($videoId: Int!, $debuggingJson: JSON) {
     makePercentage
     elapsedTime
     currentHomography {
-      crop {
+      ...HomographyInfo
-        left
-        top
-        width
-        height
-      }
-      pockets {
-        left
-        top
-        width
-        height
-      }
-      sourcePoints {
-        topLeft {
-          x
-          y
-        }
-        topSide {
-          x
-          y
-        }
-        topRight {
-          x
-          y
-        }
-        bottomLeft {
-          x
-          y
-        }
-        bottomSide {
-          x
-          y
-        }
-        bottomRight {
-          x
-          y
-        }
-      }
     }
     stream {
       id
@@ -55,6 +18,7 @@ query GetStreamMonitoringDetails($videoId: Int!, $debuggingJson: JSON) {
       initPlaylistUploadStatus
     }
     currentProcessing {
+      id
       errors {
         message
         startSegmentIndex
@@ -154,45 +118,7 @@ query GetVideo($videoId: Int!) {
       segmentDurations
     }
     homographyHistory {
-      frameIndex
+      ...HomographyInfo
-      crop {
-        left
-        top
-        width
-        height
-      }
-      pockets {
-        left
-        top
-        width
-        height
-      }
-      sourcePoints {
-        topLeft {
-          x
-          y
-        }
-        topSide {
-          x
-          y
-        }
-        topRight {
-          x
-          y
-        }
-        bottomLeft {
-          x
-          y
-        }
-        bottomSide {
-          x
-          y
-        }
-        bottomRight {
-          x
-          y
-        }
-      }
     }
     stream {
       id
@@ -288,3 +214,51 @@ query GetHeaderInfoByVideoId($videoId: Int!) {
     startTime
   }
 }
+
+mutation FindPrerecordTableLayout($b64Image: String!, $videoId: Int!) {
+  findPrerecordTableLayout(b64Image: $b64Image, videoId: $videoId) {
+    ...HomographyInfo
+  }
+}
+
+fragment HomographyInfo on HomographyInfoGQL {
+  frameIndex
+  crop {
+    left
+    top
+    width
+    height
+  }
+  pockets {
+    left
+    top
+    width
+    height
+  }
+  sourcePoints {
+    topLeft {
+      x
+      y
+    }
+    topSide {
+      x
+      y
+    }
+    topRight {
+      x
+      y
+    }
+    bottomLeft {
+      x
+      y
+    }
+    bottomSide {
+      x
+      y
+    }
+    bottomRight {
+      x
+      y
+    }
+  }
+}

src/schema.gql

@@ -15,17 +15,20 @@ type Query {
     ids: [Int!] = null
     shotsOrdering: GetShotsOrdering = null
     limit: Int! = 500
+    countRespectsLimit: Boolean! = false
   ): GetShotsResult!
   getShotsWithMetadata(
     filterInput: FilterInput!
     ids: [Int!] = null
     shotsPagination: GetShotsPagination = null
     limit: Int! = 500
+    countRespectsLimit: Boolean! = false
   ): GetShotsResult!
   getShots(
     filterInput: FilterInput!
     shotsPagination: GetShotsPagination = null
     limit: Int! = 500
+    countRespectsLimit: Boolean! = false
   ): [ShotGQL!]!
   getShotsByIds(ids: [Int!]!): [ShotGQL!]!
   getShotAnnotationTypes(errorTypes: Boolean = false): [ShotAnnotationTypeGQL!]!
@@ -43,7 +46,7 @@ type Query {
     limit: Int = 100
     after: String = null
   ): UserRelationshipsResult!
-  getPlayTime(userId: Int!): UserPlayTimeGQL!
+  getPlayTime(userId: Int!, filters: VideoFilterInput = null): UserPlayTimeGQL!
   getUserVideos(
     userId: Int = null
     limit: Int! = 5
@@ -56,6 +59,7 @@ type Query {
   getFeedVideos(
     limit: Int! = 5
     after: String = null
+    includeCallersVideos: Boolean = true
     filters: VideoFilterInput = null
   ): VideoHistoryGQL!
 }
@@ -397,6 +401,7 @@ type UserGQL {
   profileImageUri: String
   createdAt: DateTime
   updatedAt: DateTime
+  videosPrivateByDefault: Boolean
   following: [UserGQL!]
   followers: [UserGQL!]
 }
@@ -434,6 +439,7 @@ type VideoGQL {
   elapsedTime: Float
   framesPerSecond: Float!
   tableSize: Float!
+  private: Boolean!
   stream: UploadStreamGQL
   playlist: HLSPlaylistGQL
   tags: [VideoTag!]!
@@ -506,6 +512,7 @@ type VideoTagClass {
 }
 
 type HomographyInfoGQL {
+  id: Int!
   frameIndex: Int!
   crop: BoundingBoxGQL!
   pockets: [BoundingBoxGQL!]!
@@ -535,6 +542,7 @@ type IntPoint2D {
 }
 
 type VideoProcessingGQL {
+  id: Int!
   errors: [VideoProcessingErrorGQL!]!
   status: ProcessingStatusEnum!
   statuses: [VideoProcessingStatusGQL!]!
@@ -617,6 +625,13 @@ type UserPlayTimeGQL {
   totalSeconds: Float!
 }
 
+input VideoFilterInput {
+  isStreamCompleted: Boolean = null
+  requireCursorCompletion: Boolean! = true
+  createdAt: DateRangeFilter = null
+  excludeVideosWithNoShots: Boolean = null
+}
+
 type VideoHistoryGQL {
   videos: [VideoGQL!]!
   pageInfo: PageInfoGQL!
@@ -627,11 +642,6 @@ type PageInfoGQL {
   endCursor: String
 }
 
-input VideoFilterInput {
-  isStreamCompleted: Boolean = null
-  requireCursorCompletion: Boolean! = true
-}
-
 type TagGQL {
   name: String!
   id: Int!
@@ -665,6 +675,7 @@ type Mutation {
   editUser(input: EditUserInputGQL!): UserGQL!
   followUser(followedUserId: Int!): UserGQL!
   unfollowUser(followedUserId: Int!): UserGQL!
+  findPrerecordTableLayout(b64Image: String!, videoId: Int!): HomographyInfoGQL
   createUploadStream(
     videoMetadata: VideoMetadataInput!
   ): CreateUploadStreamReturn!
@@ -753,6 +764,7 @@ type TooManyProfileImageUploadsErr {
 input EditUserInputGQL {
   username: String = null
   fargoRating: Int = null
+  videosPrivateByDefault: Boolean = null
 }
 
 type CreateUploadStreamReturn {
@@ -767,6 +779,7 @@ input VideoMetadataInput {
   tableSize: Float = null
   lastIntendedSegmentBound: Int = null
   streamSegmentType: StreamSegmentTypeEnum = null
+  private: Boolean = null
   endStream: Boolean! = false
   resolution: VideoResolution = null
   framesPerSecond: Float = null