Create reserved query for get shots with metadata

Reviewed-on: #73

src/operations/shots.gql

@@ -1,59 +1,3 @@
-query GetShots(
-  $filterInput: FilterInput!
-  $shotsPagination: GetShotsPagination
-  $limit: Int
-  $includeCreatedAt: Boolean! = false
-  $includeUpdatedAt: Boolean! = false
-  $includeCueObjectFeatures: Boolean! = false
-  $includePocketingIntentionFeatures: Boolean! = false
-  $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
-    shotsPagination: $shotsPagination
-    limit: $limit
-  ) {
-    id
-    videoId
-    startFrame
-    endFrame
-    user {
-      id
-    }
-    falsePositiveScore
-    video {
-      stream {
-        resolution {
-          width
-          height
-        }
-      }
-    }
-    createdAt @include(if: $includeCreatedAt)
-    updatedAt @include(if: $includeUpdatedAt)
-    cueObjectFeatures @include(if: $includeCueObjectFeatures) {
-      cueObjectDistance @include(if: $includeCueObjectDistance)
-      cueObjectAngle @include(if: $includeCueObjectAngle)
-      cueBallSpeed @include(if: $includeCueBallSpeed)
-      shotDirection @include(if: $includeShotDirection)
-      spinType @include(if: $includeSpinType)
-    }
-    pocketingIntentionFeatures
-      @include(if: $includePocketingIntentionFeatures) {
-      targetPocketDistance @include(if: $includeTargetPocketDistance)
-      make @include(if: $includeMake)
-      intendedPocketType @include(if: $includeIntendedPocketType)
-    }
-  }
-}
-
 query GetSerializedShotPaths($filterInput: FilterInput!) {
   getShots(filterInput: $filterInput) {
     id
@@ -73,30 +17,69 @@ query GetShotAnnotationTypes {
   }
 }
 
-query GetShotsWithMetadata(
+query GetShotsWithVideoGql($filterInput: FilterInput!, $limit: Int) {
+  getShotsWithMetadata(filterInput: $filterInput, limit: $limit) {
+    ids
+    shots {
+      id
+      videoId
+      video {
+        screenshotUri
+        endTime
+      }
+    }
+  }
+}
+
+## Reserved for playlists (which are created from a filter)
+query GetShotsWithMetadataFilterResult(
   $filterInput: FilterInput!
   $shotsPagination: GetShotsPagination
   $limit: Int
-  $includeCreatedAt: Boolean! = false
+  $ids: [Int!]
-  $includeUpdatedAt: Boolean! = false
-  $includeCueObjectFeatures: Boolean! = false
-  $includePocketingIntentionFeatures: Boolean! = false
-  $includeCueObjectDistance: Boolean! = false
-  $includeCueObjectAngle: Boolean! = false
-  $includeCueBallSpeed: Boolean! = false
-  $includeSpinType: Boolean! = false
-  $includeShotDirection: Boolean! = false
-  $includeTargetPocketDistance: Boolean! = false
-  $includeMake: Boolean! = false
-  $includeIntendedPocketType: Boolean! = false
 ) {
   getShotsWithMetadata(
     filterInput: $filterInput
     shotsPagination: $shotsPagination
     limit: $limit
+    ids: $ids
   ) {
     count
     shots {
+      ...ShotWithAllFeatures
+    }
+    ids
+  }
+}
+
+# TODO: Delete
+query GetShotsWithMetadata(
+  $filterInput: FilterInput!
+  $shotsPagination: GetShotsPagination
+  $limit: Int
+  $ids: [Int!]
+) {
+  getShotsWithMetadata(
+    filterInput: $filterInput
+    shotsPagination: $shotsPagination
+    limit: $limit
+    ids: $ids
+  ) {
+    count
+    shots {
+      ...ShotWithAllFeatures
+    }
+    ids
+  }
+}
+
+query GetShotsByIds($ids: [Int!]!) {
+  getShotsByIds(ids: $ids) {
+    ...ShotWithAllFeatures
+  }
+}
+
+fragment ShotWithAllFeatures on ShotGQL {
   id
   videoId
   startFrame
@@ -106,6 +89,7 @@ query GetShotsWithMetadata(
   }
   falsePositiveScore
   video {
+    id
     stream {
       resolution {
         width
@@ -113,29 +97,29 @@ query GetShotsWithMetadata(
       }
     }
   }
-      createdAt @include(if: $includeCreatedAt)
+  createdAt
-      updatedAt @include(if: $includeUpdatedAt)
+  updatedAt
-      cueObjectFeatures @include(if: $includeCueObjectFeatures) {
+  cueObjectFeatures {
-        cueObjectDistance @include(if: $includeCueObjectDistance)
+    cueObjectDistance
-        cueObjectAngle @include(if: $includeCueObjectAngle)
+    cueObjectAngle
-        cueBallSpeed @include(if: $includeCueBallSpeed)
+    cueBallSpeed
-        shotDirection @include(if: $includeShotDirection)
+    shotDirection
-        spinType @include(if: $includeSpinType)
+    spinType
   }
-      pocketingIntentionFeatures
+  pocketingIntentionFeatures {
-        @include(if: $includePocketingIntentionFeatures) {
+    make
-        targetPocketDistance @include(if: $includeTargetPocketDistance)
+    targetPocketDistance
-        make @include(if: $includeMake)
+    targetPocketAngle
-        intendedPocketType @include(if: $includeIntendedPocketType)
+    targetPocketAngleDirection
+    marginOfErrorInDegrees
+    intendedPocketType
   }
-      pocketingIntentionInfo @include(if: $includePocketingIntentionFeatures) {
+  pocketingIntentionInfo {
     ballId
     pocketId
     pathMetadataIndex
   }
-      serializedShotPaths @include(if: $includePocketingIntentionFeatures) {
+  serializedShotPaths {
     b64EncodedBuffer
   }
 }
-  }
-}

src/operations/video.gql

@@ -237,3 +237,11 @@ query GetVideoForClipTimes($videoId: Int!) {
     }
   }
 }
+
+query GetHeaderInfoByVideoId($videoId: Int!) {
+  getVideo(videoId: $videoId) {
+    id
+    name
+    startTime
+  }
+}

src/schema.gql

@@ -11,6 +11,7 @@ type Query {
   ): [MakePercentageIntervalGQL!]!
   getShotsWithMetadata(
     filterInput: FilterInput!
+    ids: [Int!] = null
     shotsPagination: GetShotsPagination = null
     limit: Int! = 500
   ): GetShotsResult!
@@ -19,6 +20,7 @@ type Query {
     shotsPagination: GetShotsPagination = null
     limit: Int! = 500
   ): [ShotGQL!]!
+  getShotsByIds(ids: [Int!]!): [ShotGQL!]!
   getShotAnnotationTypes(errorTypes: Boolean = false): [ShotAnnotationTypeGQL!]!
   getUser(userId: Int!): UserGQL
   getLoggedInUser: UserGQL
@@ -107,26 +109,23 @@ Date with time (isoformat)
 """
 scalar DateTime
 
-input TimeInterval {
+input TimeInterval @oneOf {
-  """
+  timedelta: TimeDeltaGQL
-  A second is the base unit and cannot be subdivided
+  aligned: AlignedIntervalEnum
-  """
+}
-  seconds: Int = 0
+
-  minutes: Int = 0
+input TimeDeltaGQL {
-  hours: Int = 0
   days: Int = 0
   weeks: Int = 0
   months: Int = 0
-
-  """
-  Assumes a year is 365 days long
-  """
   years: Int = 0
+}
 
-  """
+enum AlignedIntervalEnum {
-  True eg 1/15-3/15 => [(1/15,1/31), (2/1,2/28), (3/1,3/15)] False eg 1/15-2/15 => [(1/15,2/14), (2/14,3/15)]
+  MONTH
-  """
+  YEAR
-  calendarAlignedMonths: Boolean! = true
+  WEEK
+  DAY
 }
 
 input FilterInput @oneOf {
@@ -142,6 +141,7 @@ input FilterInput @oneOf {
   shotDirection: [ShotDirectionEnum!]
   videoId: [Int!]
   userId: [Int!]
+  username: [String!]
   make: [Boolean!]
   tags: [VideoTagInput!]
   annotations: [ShotAnnotationInput!]
@@ -164,6 +164,7 @@ input FilterInput @oneOf {
   targetPocketAngleDirection: [ShotDirectionEnum!]
   targetPocketAngle: FloatRangeFilter
   missAngleInDegrees: FloatRangeFilter
+  marginOfErrorInDegrees: FloatRangeFilter
   createdAt: DateRangeFilter
 }
 
@@ -248,6 +249,7 @@ type MakePercentageIntervalGQL {
 type GetShotsResult {
   shots: [ShotGQL!]!
   count: Int
+  ids: [Int!]!
 }
 
 type ShotGQL {
@@ -283,6 +285,7 @@ type PocketingIntentionFeaturesGQL {
   difficulty: Float
   targetPocketAngle: Float
   targetPocketAngleDirection: ShotDirectionEnum
+  marginOfErrorInDegrees: Float
   backcut: Boolean
 }