Make range filters generic

Reviewed-on: #58
Reviewed-by: Ivan Malison <ivanmalison@gmail.com>

src/operations/shots.gql

@@ -113,6 +113,10 @@ query GetShotsWithMetadata(
           }
         }
       }
+      serializedShotPaths {
+        b64EncodedBuffer
+      }
+
       createdAt @include(if: $includeCreatedAt)
       updatedAt @include(if: $includeUpdatedAt)
       cueObjectFeatures @include(if: $includeCueObjectFeatures) {

src/schema.gql

@@ -53,6 +53,21 @@ type TargetMetricsGQL {
   count: Int!
   makePercentage: Float
   averageDifficulty: Float
+  spinTypeCounts: SpinTypeCountsGQL
+  shotDirectionCounts: ShotDirectionCountsGQL
+}
+
+type SpinTypeCountsGQL {
+  follow: Int!
+  draw: Int!
+  center: Int!
+  unknown: Int!
+}
+
+type ShotDirectionCountsGQL {
+  left: Int!
+  right: Int!
+  straight: Int!
 }
 
 input AggregateInputGQL {
@@ -63,6 +78,7 @@ input AggregateInputGQL {
 input AggregationInput @oneOf {
   bucketSet: BucketSetInputGQL
   enum: EnumAggregation
+  datetimeRange: DatetimeRangeAggregationInput
 }
 
 input BucketSetInputGQL {
@@ -79,15 +95,47 @@ input EnumAggregation {
   feature: String!
 }
 
+input DatetimeRangeAggregationInput {
+  startDatetime: DateTime!
+  endDatetime: DateTime!
+  interval: TimeInterval!
+}
+
+"""
+Date with time (isoformat)
+"""
+scalar DateTime
+
+input TimeInterval {
+  """
+  A second is the base unit and cannot be subdivided
+  """
+  seconds: Int = 0
+  minutes: Int = 0
+  hours: Int = 0
+  days: Int = 0
+  weeks: Int = 0
+
+  """
+  Assumes a month is 30 days long
+  """
+  months: Int = 0
+
+  """
+  Assumes a year is 365 days long
+  """
+  years: Int = 0
+}
+
 input FilterInput @oneOf {
   andFilters: [FilterInput!]
   orFilters: [FilterInput!]
   notFilter: FilterInput
-  cueObjectDistance: RangeFilter
-  targetPocketDistance: RangeFilter
-  cueObjectAngle: RangeFilter
-  cueBallSpeed: RangeFilter
-  difficulty: RangeFilter
+  cueObjectDistance: FloatRangeFilter
+  targetPocketDistance: FloatRangeFilter
+  cueObjectAngle: FloatRangeFilter
+  cueBallSpeed: FloatRangeFilter
+  difficulty: FloatRangeFilter
   intendedPocketType: [PocketEnum!]
   shotDirection: [ShotDirectionEnum!]
   videoId: [Int!]
@@ -101,18 +149,23 @@ input FilterInput @oneOf {
   isLeftMiss: [Boolean!]
   isRightMiss: [Boolean!]
   isDirect: [Boolean!]
-  tableSize: RangeFilter
-  bankAngle: RangeFilter
-  bankDistance: RangeFilter
-  kickAngle: RangeFilter
-  kickDistance: RangeFilter
-  cueAngleAfterObject: RangeFilter
+  tableSize: FloatRangeFilter
+  bankAngle: FloatRangeFilter
+  bankDistance: FloatRangeFilter
+  kickAngle: FloatRangeFilter
+  kickDistance: FloatRangeFilter
+  cueAngleAfterObject: FloatRangeFilter
   spinType: [SpinTypeEnum!]
-  cueSpeedAfterObject: RangeFilter
-  falsePositiveScore: RangeFilter
+  cueSpeedAfterObject: FloatRangeFilter
+  falsePositiveScore: FloatRangeFilter
+  backcut: [Boolean!]
+  targetPocketAngleDirection: [ShotDirectionEnum!]
+  targetPocketAngle: FloatRangeFilter
+  missAngleInDegrees: FloatRangeFilter
+  createdAt: DateRangeFilter
 }
 
-input RangeFilter {
+input FloatRangeFilter {
   lessThan: Float = null
   greaterThanEqualTo: Float = null
   greaterThan: Float = null
@@ -152,6 +205,20 @@ enum SpinTypeEnum {
   UNKNOWN
 }
 
+input DateRangeFilter {
+  lessThan: Date = null
+  greaterThanEqualTo: Date = null
+  greaterThan: Date = null
+  includeOnNone: Boolean! = false
+  lessThanInclusive: Boolean! = false
+  greaterThanInclusive: Boolean! = true
+}
+
+"""
+Date (isoformat)
+"""
+scalar Date
+
 type BucketSetGQL {
   keyName: String!
   feature: String!
@@ -190,6 +257,7 @@ type ShotGQL {
   updatedAt: DateTime
   cueObjectFeatures: CueObjectFeaturesGQL
   pocketingIntentionFeatures: PocketingIntentionFeaturesGQL
+  pocketingIntentionInfo: PocketingIntentionInfoGQL
   bankFeatures: BankFeaturesGQL
   serializedShotPaths: SerializedShotPathsGQL
   user: UserGQL
@@ -198,11 +266,6 @@ type ShotGQL {
   video: VideoGQL
 }
 
-"""
-Date with time (isoformat)
-"""
-scalar DateTime
-
 type CueObjectFeaturesGQL {
   cueObjectDistance: Float
   cueObjectAngle: Float
@@ -216,6 +279,24 @@ type PocketingIntentionFeaturesGQL {
   make: Boolean
   intendedPocketType: PocketEnum
   difficulty: Float
+  targetPocketAngle: Float
+  targetPocketAngleDirection: ShotDirectionEnum
+  backcut: Boolean
+}
+
+type PocketingIntentionInfoGQL {
+  ballId: Int!
+  pocketId: PocketIdentifier!
+  pathMetadataIndex: Int!
+}
+
+enum PocketIdentifier {
+  TOP_LEFT
+  TOP_SIDE
+  TOP_RIGHT
+  BOTTOM_LEFT
+  BOTTOM_SIDE
+  BOTTOM_RIGHT
 }
 
 type BankFeaturesGQL {