Add a username filter

Reviewed-on: #70

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
@@ -77,100 +21,19 @@ query GetShotsWithMetadata(
   $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
+  $ids: [Int!]
 ) {
   getShotsWithMetadata(
     filterInput: $filterInput
     shotsPagination: $shotsPagination
     limit: $limit
+    ids: $ids
   ) {
     count
     shots {
-      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)
-      }
-      pocketingIntentionInfo @include(if: $includePocketingIntentionFeatures) {
-        ballId
-        pocketId
-        pathMetadataIndex
-      }
-      serializedShotPaths @include(if: $includePocketingIntentionFeatures) {
-        b64EncodedBuffer
-      }
+      ...ShotWithAllFeatures
     }
-  }
-}
-
-fragment ShotWithAllFeatures on ShotGQL {
-  id
-  videoId
-  startFrame
-  endFrame
-  falsePositiveScore
-  createdAt
-  updatedAt
-  user {
-    id
-  }
-  video {
-    id
-    stream {
-      resolution {
-        width
-        height
-      }
-    }
-  }
-  cueObjectFeatures {
-    cueObjectDistance
-    cueObjectAngle
-    cueBallSpeed
-    shotDirection
-    spinType
-  }
-  pocketingIntentionFeatures {
-    targetPocketDistance
-    make
-    intendedPocketType
+    ids
   }
 }
 
@@ -179,3 +42,47 @@ query GetShotsByIds($ids: [Int!]!) {
     ...ShotWithAllFeatures
   }
 }
+
+fragment ShotWithAllFeatures on ShotGQL {
+  id
+  videoId
+  startFrame
+  endFrame
+  user {
+    id
+  }
+  falsePositiveScore
+  video {
+    stream {
+      resolution {
+        width
+        height
+      }
+    }
+  }
+  createdAt
+  updatedAt
+  cueObjectFeatures {
+    cueObjectDistance
+    cueObjectAngle
+    cueBallSpeed
+    shotDirection
+    spinType
+  }
+  pocketingIntentionFeatures {
+    make
+    targetPocketDistance
+    targetPocketAngle
+    targetPocketAngleDirection
+    marginOfErrorInDegrees
+    intendedPocketType
+  }
+  pocketingIntentionInfo {
+    ballId
+    pocketId
+    pathMetadataIndex
+  }
+  serializedShotPaths {
+    b64EncodedBuffer
+  }
+}

src/schema.gql

@@ -11,6 +11,7 @@ type Query {
   ): [MakePercentageIntervalGQL!]!
   getShotsWithMetadata(
     filterInput: FilterInput!
+    ids: [Int!] = null
     shotsPagination: GetShotsPagination = null
     limit: Int! = 500
   ): GetShotsResult!
@@ -124,6 +125,7 @@ enum AlignedIntervalEnum {
   MONTH
   YEAR
   WEEK
+  DAY
 }
 
 input FilterInput @oneOf {
@@ -139,6 +141,7 @@ input FilterInput @oneOf {
   shotDirection: [ShotDirectionEnum!]
   videoId: [Int!]
   userId: [Int!]
+  username: [String!]
   make: [Boolean!]
   tags: [VideoTagInput!]
   annotations: [ShotAnnotationInput!]
@@ -161,6 +164,7 @@ input FilterInput @oneOf {
   targetPocketAngleDirection: [ShotDirectionEnum!]
   targetPocketAngle: FloatRangeFilter
   missAngleInDegrees: FloatRangeFilter
+  marginOfErrorInDegrees: FloatRangeFilter
   createdAt: DateRangeFilter
 }
 
@@ -281,6 +285,7 @@ type PocketingIntentionFeaturesGQL {
   difficulty: Float
   targetPocketAngle: Float
   targetPocketAngleDirection: ShotDirectionEnum
+  marginOfErrorInDegrees: Float
   backcut: Boolean
 }