Merge pull request 'Medals' (#135) from volodymyr/medals into master

Reviewed-on: #135

src/operations/feed.gql

@@ -6,32 +6,7 @@ query GetFeed(
 ) {
   getUserVideos(limit: $limit, after: $after, filters: $filters) {
     videos {
-      id
+      ...VideoCardFields
-      owner {
-        username
-      }
-      name
-      screenshotUri
-      totalShotsMade
-      totalShots
-      makePercentage
-      createdAt
-      updatedAt
-      startTime
-      endTime
-      elapsedTime
-      screenshotUri
-      stream {
-        id
-        isCompleted
-      }
-      tableSize
-      tags {
-        tagClasses {
-          name
-        }
-        name
-      }
     }
     pageInfo {
       hasNextPage
@@ -56,6 +31,7 @@ fragment VideoCardFields on VideoGQL {
   updatedAt
   startTime
   endTime
+  private
   elapsedTime
   screenshotUri
   stream {
@@ -70,6 +46,7 @@ fragment VideoCardFields on VideoGQL {
     name
   }
   currentProcessing {
+    id
     errors {
       message
     }
@@ -84,8 +61,14 @@ query GetVideoFeed(
   $limit: Int! = 5
   $after: String = null
   $filters: VideoFilterInput = null
+  $includeCallersVideos: Boolean = null
+) {
+  getFeedVideos(
+    limit: $limit
+    after: $after
+    filters: $filters
+    includeCallersVideos: $includeCallersVideos
   ) {
-  getFeedVideos(limit: $limit, after: $after, filters: $filters) {
     videos {
       ...VideoCardFields
     }

src/operations/medals.gql

@@ -0,0 +1,84 @@
+query getMedals($scope: MedalScope!, $userId: Int) {
+  getMedals(scope: $scope, userId: $userId) {
+    distanceOver66 {
+      count
+      nickname
+    }
+    distanceOver78 {
+      count
+      nickname
+    }
+    distanceOver90 {
+      count
+      nickname
+    }
+    runLength3 {
+      count
+      nickname
+    }
+    runLength5 {
+      count
+      nickname
+    }
+    runLength8 {
+      count
+      nickname
+    }
+    runLength10 {
+      count
+      nickname
+    }
+    runLength15 {
+      count
+      nickname
+    }
+    runLength20 {
+      count
+      nickname
+    }
+    runLength25 {
+      count
+      nickname
+    }
+    runLength30 {
+      count
+      nickname
+    }
+    runLength40 {
+      count
+      nickname
+    }
+    runLength50 {
+      count
+      nickname
+    }
+    totalMakes25 {
+      count
+      nickname
+    }
+    totalMakes50 {
+      count
+      nickname
+    }
+    totalMakes75 {
+      count
+      nickname
+    }
+    totalMakes100 {
+      count
+      nickname
+    }
+    totalMakes200 {
+      count
+      nickname
+    }
+    totalMakes300 {
+      count
+      nickname
+    }
+    totalMakes400 {
+      count
+      nickname
+    }
+  }
+}

src/operations/shots.gql

@@ -66,12 +66,15 @@ query GetShotsWithJustIds(
   $filterInput: FilterInput!
   $shotsOrdering: GetShotsOrdering
   $limit: Int
+  $countRespectsLimit: Boolean
 ) {
   getOrderedShots(
     filterInput: $filterInput
     shotsOrdering: $shotsOrdering
     limit: $limit
+    countRespectsLimit: $countRespectsLimit
   ) {
+    count
     shots {
       id
       videoId

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

@@ -46,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
@@ -59,6 +59,7 @@ type Query {
   getFeedVideos(
     limit: Int! = 5
     after: String = null
+    includeCallersVideos: Boolean = true
     filters: VideoFilterInput = null
   ): VideoHistoryGQL!
 }
@@ -295,21 +296,11 @@ type RequestedMedalsGQL {
   totalMakes500: MedalGQL
   totalMakes750: MedalGQL
   totalMakes1000: MedalGQL
-  dayStreak2: MedalGQL
-  dayStreak3: MedalGQL
-  dayStreak4: MedalGQL
-  dayStreak5: MedalGQL
-  dayStreak6: MedalGQL
-  dayStreak7: MedalGQL
-  dayStreak14: MedalGQL
-  dayStreak21: MedalGQL
-  dayStreak30: MedalGQL
-  dayStreak60: MedalGQL
-  dayStreak90: MedalGQL
 }
 
 type MedalGQL {
   count: Int!
+  nickname: String
 }
 
 input MedalScope @oneOf {
@@ -400,6 +391,7 @@ type UserGQL {
   profileImageUri: String
   createdAt: DateTime
   updatedAt: DateTime
+  videosPrivateByDefault: Boolean
   following: [UserGQL!]
   followers: [UserGQL!]
 }
@@ -437,6 +429,7 @@ type VideoGQL {
   elapsedTime: Float
   framesPerSecond: Float!
   tableSize: Float!
+  private: Boolean!
   stream: UploadStreamGQL
   playlist: HLSPlaylistGQL
   tags: [VideoTag!]!
@@ -509,6 +502,7 @@ type VideoTagClass {
 }
 
 type HomographyInfoGQL {
+  id: Int!
   frameIndex: Int!
   crop: BoundingBoxGQL!
   pockets: [BoundingBoxGQL!]!
@@ -538,6 +532,7 @@ type IntPoint2D {
 }
 
 type VideoProcessingGQL {
+  id: Int!
   errors: [VideoProcessingErrorGQL!]!
   status: ProcessingStatusEnum!
   statuses: [VideoProcessingStatusGQL!]!
@@ -620,6 +615,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!
@@ -630,11 +632,6 @@ type PageInfoGQL {
   endCursor: String
 }
 
-input VideoFilterInput {
-  isStreamCompleted: Boolean = null
-  requireCursorCompletion: Boolean! = true
-}
-
 type TagGQL {
   name: String!
   id: Int!
@@ -668,7 +665,7 @@ type Mutation {
   editUser(input: EditUserInputGQL!): UserGQL!
   followUser(followedUserId: Int!): UserGQL!
   unfollowUser(followedUserId: Int!): UserGQL!
-  checkHomographyIsValid(b64Image: String!, videoId: Int!): HomographyInfoGQL
+  findPrerecordTableLayout(b64Image: String!, videoId: Int!): HomographyInfoGQL
   createUploadStream(
     videoMetadata: VideoMetadataInput!
   ): CreateUploadStreamReturn!
@@ -757,6 +754,7 @@ type TooManyProfileImageUploadsErr {
 input EditUserInputGQL {
   username: String = null
   fargoRating: Int = null
+  videosPrivateByDefault: Boolean = null
 }
 
 type CreateUploadStreamReturn {
@@ -771,6 +769,7 @@ input VideoMetadataInput {
   tableSize: Float = null
   lastIntendedSegmentBound: Int = null
   streamSegmentType: StreamSegmentTypeEnum = null
+  private: Boolean = null
   endStream: Boolean! = false
   resolution: VideoResolution = null
   framesPerSecond: Float = null