Merge pull request 'Add spinType and cueBallSpeed to get shots operation' (#47) from loewy/add-spin-type-to-get-shots into master

Reviewed-on: #47

src/operations/config.gql

@@ -4,5 +4,6 @@ query getDeployedConfig {
     devMode
     environment
     firebase
+    minimumAllowedAppVersion
   }
 }

src/operations/feed.gql

@@ -23,6 +23,7 @@ query GetFeed(
       stream {
         isCompleted
       }
+      tableSize
       tags {
         tagClasses {
           name

src/operations/shots.gql

@@ -1,5 +1,7 @@
 query GetShots(
   $filterInput: FilterInput!
+  $shotsPagination: GetShotsPagination
+  $limit: Int
   $includeCreatedAt: Boolean! = false
   $includeUpdatedAt: Boolean! = false
   $includeCueObjectFeatures: Boolean! = false
@@ -7,12 +9,17 @@ query GetShots(
   $includeCueObjectDistance: Boolean! = false
   $includeCueObjectAngle: Boolean! = false
   $includeCueBallSpeed: Boolean! = false
+  $includeSpinType: Boolean! = false
   $includeShotDirection: Boolean! = false
   $includeTargetPocketDistance: Boolean! = false
   $includeMake: Boolean! = false
   $includeIntendedPocketType: Boolean! = false
 ) {
-  getShots(filterInput: $filterInput) {
+  getShots(
+    filterInput: $filterInput
+    shotsPagination: $shotsPagination
+    limit: $limit
+  ) {
     id
     videoId
     startFrame
@@ -21,6 +28,14 @@ query GetShots(
       id
     }
     falsePositiveScore
+    video {
+      stream {
+        resolution {
+          width
+          height
+        }
+      }
+    }
     createdAt @include(if: $includeCreatedAt)
     updatedAt @include(if: $includeUpdatedAt)
     cueObjectFeatures @include(if: $includeCueObjectFeatures) {
@@ -28,6 +43,7 @@ query GetShots(
       cueObjectAngle @include(if: $includeCueObjectAngle)
       cueBallSpeed @include(if: $includeCueBallSpeed)
       shotDirection @include(if: $includeShotDirection)
+      spinType @include(if: $includeSpinType)
     }
     pocketingIntentionFeatures
       @include(if: $includePocketingIntentionFeatures) {
@@ -38,6 +54,18 @@ query GetShots(
   }
 }
 
+query GetSerializedShotPaths($filterInput: FilterInput!) {
+  getShots(filterInput: $filterInput) {
+    id
+    videoId
+    startFrame
+    endFrame
+    serializedShotPaths {
+      b64EncodedBuffer
+    }
+  }
+}
+
 query GetShotAnnotationTypes {
   getShotAnnotationTypes {
     id

src/operations/user.gql

@@ -1,9 +1,20 @@
 mutation getProfileImageUploadLink($fileExt: String = ".png") {
   getProfileImageUploadLink(fileExt: $fileExt) {
-    uploadUrl
+    value {
-    headers {
+      ... on UploadLink {
-      key
+        uploadUrl
-      value
+        headers {
+          key
+          value
+        }
+      }
+      ... on GetProfileUploadLinkErrors {
+        error {
+          ... on TooManyProfileImageUploadsErr {
+            linksRequested
+          }
+        }
+      }
     }
   }
 }

src/operations/video.gql

@@ -1,5 +1,5 @@
-query GetStreamMonitoringDetails($videoId: Int!) {
+query GetStreamMonitoringDetails($videoId: Int!, $debuggingJson: JSON) {
-  getVideo(videoId: $videoId) {
+  getVideo(videoId: $videoId, debuggingJson: $debuggingJson) {
     id
     totalShots
     makePercentage
@@ -70,6 +70,7 @@ query GetVideoUpdatePageDetails($videoId: Int!) {
     totalShots
     makePercentage
     elapsedTime
+    tableSize
     tags {
       tagClasses {
         name
@@ -98,6 +99,7 @@ query GetVideoDetails($videoId: Int!) {
     totalShotsMade
     createdAt
     updatedAt
+    tableSize
     owner {
       id
       firebaseUid
@@ -116,11 +118,10 @@ query GetVideoDetails($videoId: Int!) {
 query GetVideos($videoIds: [Int!]!) {
   getVideos(videoIds: $videoIds) {
     id
-    playlist {
+    framesPerSecond
-      segmentDurations
-    }
     stream {
       id
+      streamSegmentType
       segments {
         uploaded
         valid
@@ -129,6 +130,9 @@ query GetVideos($videoIds: [Int!]!) {
         framesPerSecond
       }
     }
+    playlist {
+      segmentDurations
+    }
   }
 }
 
@@ -139,6 +143,7 @@ query GetVideo($videoId: Int!) {
       segmentDurations
     }
     homographyHistory {
+      frameIndex
       crop {
         left
         top
@@ -215,6 +220,7 @@ query GetMedianRunForVideo($videoId: Int!) {
 query GetVideoForClipTimes($videoId: Int!) {
   getVideo(videoId: $videoId) {
     id
+    framesPerSecond
     playlist {
       segmentDurations
     }

src/operations/video_upload.gql

@@ -6,20 +6,57 @@ mutation CreateUploadStream($videoMetadataInput: VideoMetadataInput!) {
 
 mutation GetUploadLink($videoId: Int!, $segmentIndex: Int!) {
   getUploadLink(videoId: $videoId, segmentIndex: $segmentIndex) {
-    uploadUrl
+    value {
-    headers {
+      ... on UploadLink {
-      key
+        uploadUrl
-      value
+        headers {
+          key
+          value
+        }
+      }
+      ... on GetUploadLinkErrors {
+        error {
+          ... on MustHaveSetForUploadLinkErr {
+            resolution
+            framesPerSecond
+          }
+          ... on SegmentAlreadyUploadedErr {
+            segmentId
+          }
+          ... on ProcessingFailedErr {
+            processing {
+              status
+              errors {
+                message
+              }
+            }
+          }
+        }
+      }
+    }
+    stream {
+      uploadCompletionCursor
     }
   }
 }
 
 mutation GetHlsInitUploadLink($videoId: Int!) {
   getHlsInitUploadLink(videoId: $videoId) {
-    uploadUrl
+    value {
-    headers {
+      ... on UploadLink {
-      key
+        uploadUrl
-      value
+        headers {
+          key
+          value
+        }
+      }
+      ... on GetUploadLinkErrors {
+        error {
+          ... on NoInitForChunkedUploadErr {
+            segmentType
+          }
+        }
+      }
     }
   }
 }
@@ -72,6 +109,7 @@ query GetUploadStreamsWithDetails(
         isCompleted
         lastIntendedSegmentBound
         uploadCompletionCursor
+        uploadsCompleted
       }
     }
     pageInfo {

src/schema.gql

@@ -4,12 +4,17 @@ type Query {
   ): [AggregateResultGQL!]!
   getBucketSet(keyName: String!): BucketSetGQL
   getDeployedConfig: DeployedConfigGQL!
+  waitFor(duration: Float!): Float!
   getVideoMakePercentageIntervals(
     videoId: ID!
     intervalDuration: Int! = 300
   ): [MakePercentageIntervalGQL!]!
-  getShots(filterInput: FilterInput!): [ShotGQL!]!
+  getShots(
-  getShotAnnotationTypes: [ShotAnnotationTypeGQL!]!
+    filterInput: FilterInput!
+    shotsPagination: GetShotsPagination = null
+    limit: Int! = 500
+  ): [ShotGQL!]!
+  getShotAnnotationTypes(errorTypes: Boolean = false): [ShotAnnotationTypeGQL!]!
   getUser(userId: Int!): UserGQL
   getLoggedInUser: UserGQL
   getUsernames(
@@ -25,7 +30,7 @@ type Query {
     filters: VideoFilterInput = null
   ): VideoHistoryGQL!
   getUserTags: [TagGQL!]!
-  getVideo(videoId: Int!): VideoGQL!
+  getVideo(videoId: Int!, debuggingJson: JSON = null): VideoGQL!
   getVideos(videoIds: [Int!]!): [VideoGQL!]!
 }
 
@@ -91,20 +96,24 @@ input FilterInput @oneOf {
   isLeftMiss: [Boolean!]
   isRightMiss: [Boolean!]
   isDirect: [Boolean!]
+  tableSize: RangeFilter
   bankAngle: RangeFilter
   bankDistance: RangeFilter
   kickAngle: RangeFilter
   kickDistance: RangeFilter
   cueAngleAfterObject: RangeFilter
+  spinType: [SpinTypeEnum!]
   cueSpeedAfterObject: RangeFilter
-  spinType: [String!]
   falsePositiveScore: RangeFilter
 }
 
 input RangeFilter {
   lessThan: Float = null
   greaterThanEqualTo: Float = null
+  greaterThan: Float = null
   includeOnNone: Boolean! = false
+  lessThanInclusive: Boolean! = false
+  greaterThanInclusive: Boolean! = true
 }
 
 enum PocketEnum {
@@ -131,6 +140,13 @@ input ShotAnnotationInput {
   name: String!
 }
 
+enum SpinTypeEnum {
+  DRAW
+  FOLLOW
+  CENTER
+  UNKNOWN
+}
+
 type BucketSetGQL {
   keyName: String!
   feature: String!
@@ -147,6 +163,7 @@ type DeployedConfigGQL {
   firebase: Boolean!
   devMode: Boolean!
   environment: String!
+  minimumAllowedAppVersion: String!
 }
 
 type MakePercentageIntervalGQL {
@@ -168,6 +185,7 @@ type ShotGQL {
   user: UserGQL
   annotations: [ShotAnnotationGQL!]!
   falsePositiveScore: Float
+  video: VideoGQL
 }
 
 """
@@ -180,6 +198,7 @@ type CueObjectFeaturesGQL {
   cueObjectAngle: Float
   cueBallSpeed: Float
   shotDirection: ShotDirectionEnum
+  spinType: SpinTypeEnum
 }
 
 type PocketingIntentionFeaturesGQL {
@@ -220,6 +239,7 @@ type ShotAnnotationGQL {
   type: ShotAnnotationTypeGQL!
   creator: UserGQL!
   notes: String!
+  errorDefault: Boolean!
   createdAt: DateTime
   updatedAt: DateTime
 }
@@ -229,15 +249,6 @@ type ShotAnnotationTypeGQL {
   name: String!
 }
 
-type UserPlayTimeGQL {
-  totalSeconds: Float!
-}
-
-type VideoHistoryGQL {
-  videos: [VideoGQL!]!
-  pageInfo: PageInfoGQL!
-}
-
 type VideoGQL {
   id: Int!
   owner: UserGQL
@@ -255,6 +266,7 @@ type VideoGQL {
   endTime: DateTime
   elapsedTime: Float
   framesPerSecond: Float!
+  tableSize: Float!
   stream: UploadStreamGQL
   playlist: HLSPlaylistGQL
   tags: [VideoTag!]!
@@ -356,6 +368,8 @@ type IntPoint2D {
 
 type VideoProcessingGQL {
   errors: [VideoProcessingErrorGQL!]!
+  status: ProcessingStatusEnum!
+  statuses: [VideoProcessingStatusGQL!]!
 }
 
 type VideoProcessingErrorGQL {
@@ -364,6 +378,44 @@ type VideoProcessingErrorGQL {
   endSegmentIndex: Int
 }
 
+enum ProcessingStatusEnum {
+  STARTED
+  FAILED
+  SUCCEEDED
+  SUSPENDED
+  CREATED
+  QUEUED
+  RUNNING
+  REEXTRACTING_FEATURES
+}
+
+type VideoProcessingStatusGQL {
+  status: ProcessingStatusEnum!
+  appVersion: String!
+  sequenceId: Int!
+  createdAt: DateTime
+  updatedAt: DateTime
+}
+
+input GetShotsPagination {
+  createdAfter: CreatedAfter!
+  startFrameAfter: Int!
+}
+
+input CreatedAfter @oneOf {
+  videoId: Int
+  createdAt: DateTime
+}
+
+type UserPlayTimeGQL {
+  totalSeconds: Float!
+}
+
+type VideoHistoryGQL {
+  videos: [VideoGQL!]!
+  pageInfo: PageInfoGQL!
+}
+
 type PageInfoGQL {
   hasNextPage: Boolean!
   endCursor: String
@@ -380,10 +432,25 @@ type TagGQL {
   group: String
 }
 
+"""
+The `JSON` scalar type represents JSON values as specified by [ECMA-404](https://ecma-international.org/wp-content/uploads/ECMA-404_2nd_edition_december_2017.pdf).
+"""
+scalar JSON
+  @specifiedBy(
+    url: "https://ecma-international.org/wp-content/uploads/ECMA-404_2nd_edition_december_2017.pdf"
+  )
+
 type Mutation {
   createBucketSet(params: CreateBucketSetInput!): BucketSetGQL!
   setLoggerLevel(path: String!, level: String!): Boolean!
-  getProfileImageUploadLink(fileExt: String = ".png"): GetUploadLinkReturn!
+  addAnnotationToShot(
+    shotId: Int!
+    annotationName: String!
+    notes: String = null
+  ): AddShotAnnotationReturn!
+  getProfileImageUploadLink(
+    fileExt: String = ".png"
+  ): GetProfileUploadLinkReturn!
   editProfileImageUri(profileImageUri: String!): UserGQL!
   createUploadStream(
     videoMetadata: VideoMetadataInput!
@@ -405,7 +472,44 @@ input CreateBucketSetInput {
   buckets: [BucketInputGQL!]!
 }
 
-type GetUploadLinkReturn {
+type AddShotAnnotationReturn {
+  value: SuccessfulAddAddShotAnnotationErrors!
+}
+
+union SuccessfulAddAddShotAnnotationErrors =
+    SuccessfulAdd
+  | AddShotAnnotationErrors
+
+type SuccessfulAdd {
+  value: Boolean!
+}
+
+type AddShotAnnotationErrors {
+  error: DoesNotOwnShotErrOtherErrorNeedsNote!
+}
+
+union DoesNotOwnShotErrOtherErrorNeedsNote =
+    DoesNotOwnShotErr
+  | OtherErrorNeedsNote
+
+type DoesNotOwnShotErr {
+  shotId: Int!
+  msg: String
+}
+
+type OtherErrorNeedsNote {
+  msg: String
+}
+
+type GetProfileUploadLinkReturn {
+  value: UploadLinkGetProfileUploadLinkErrors!
+}
+
+union UploadLinkGetProfileUploadLinkErrors =
+    UploadLink
+  | GetProfileUploadLinkErrors
+
+type UploadLink {
   uploadUrl: String!
   headers: [Header]!
 }
@@ -415,6 +519,14 @@ type Header {
   value: String!
 }
 
+type GetProfileUploadLinkErrors {
+  error: TooManyProfileImageUploadsErr!
+}
+
+type TooManyProfileImageUploadsErr {
+  linksRequested: Int!
+}
+
 type CreateUploadStreamReturn {
   videoId: Int!
 }
@@ -424,7 +536,7 @@ input VideoMetadataInput {
   startTime: DateTime = null
   endTime: DateTime = null
   gameType: String = null
-  tableSize: String = null
+  tableSize: Float = null
   uploadStreamMetadataInput: UploadStreamMetadataInput = null
   lastIntendedSegmentBound: Int = null
   streamSegmentType: StreamSegmentTypeEnum = null
@@ -455,3 +567,38 @@ input VideoResolution {
   width: Int!
   height: Int!
 }
+
+type GetUploadLinkReturn {
+  value: UploadLinkGetUploadLinkErrors!
+  stream: UploadStreamGQL
+}
+
+union UploadLinkGetUploadLinkErrors = UploadLink | GetUploadLinkErrors
+
+type GetUploadLinkErrors {
+  error: MustHaveSetForUploadLinkErrSegmentAlreadyUploadedErrProcessingFailedErrNoInitForChunkedUploadErrTooManyProfileImageUploadsErr!
+}
+
+union MustHaveSetForUploadLinkErrSegmentAlreadyUploadedErrProcessingFailedErrNoInitForChunkedUploadErrTooManyProfileImageUploadsErr =
+    MustHaveSetForUploadLinkErr
+  | SegmentAlreadyUploadedErr
+  | ProcessingFailedErr
+  | NoInitForChunkedUploadErr
+  | TooManyProfileImageUploadsErr
+
+type MustHaveSetForUploadLinkErr {
+  resolution: Boolean
+  framesPerSecond: Boolean
+}
+
+type SegmentAlreadyUploadedErr {
+  segmentId: Int!
+}
+
+type ProcessingFailedErr {
+  processing: VideoProcessingGQL!
+}
+
+type NoInitForChunkedUploadErr {
+  segmentType: StreamSegmentTypeEnum!
+}