Add client side start and end time

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

codegen.yml

@@ -1,5 +1,7 @@
 overwrite: true
-schema: "src/schema.gql"
+schema:
+  - "src/schema.gql"
+  - "src/client-schema.gql"
 documents: "src/**/*.gql"
 generates:
   src/index.tsx:

src/client-schema.gql

@@ -0,0 +1,7 @@
+# see: https://www.apollographql.com/docs/react/local-state/managing-state-with-field-policies/
+directive @client on FIELD
+
+extend type ShotGQL {
+  startTime: Float!
+  endTime: Float!
+}

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,65 +17,111 @@ 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 {
-      id
+      ...ShotWithAllFeatures
-      videoId
+    }
-      startFrame
+    ids
-      endFrame
+  }
-      user {
+}
-        id
-      }
-      falsePositiveScore
-      video {
-        stream {
-          resolution {
-            width
-            height
-          }
-        }
-      }
-      serializedShotPaths {
-        b64EncodedBuffer
-      }
 
-      createdAt @include(if: $includeCreatedAt)
+# TODO: Delete
-      updatedAt @include(if: $includeUpdatedAt)
+query GetShotsWithMetadata(
-      cueObjectFeatures @include(if: $includeCueObjectFeatures) {
+  $filterInput: FilterInput!
-        cueObjectDistance @include(if: $includeCueObjectDistance)
+  $shotsPagination: GetShotsPagination
-        cueObjectAngle @include(if: $includeCueObjectAngle)
+  $limit: Int
-        cueBallSpeed @include(if: $includeCueBallSpeed)
+  $ids: [Int!]
-        shotDirection @include(if: $includeShotDirection)
+) {
-        spinType @include(if: $includeSpinType)
+  getShotsWithMetadata(
-      }
+    filterInput: $filterInput
-      pocketingIntentionFeatures
+    shotsPagination: $shotsPagination
-        @include(if: $includePocketingIntentionFeatures) {
+    limit: $limit
-        targetPocketDistance @include(if: $includeTargetPocketDistance)
+    ids: $ids
-        make @include(if: $includeMake)
+  ) {
-        intendedPocketType @include(if: $includeIntendedPocketType)
+    count
+    shots {
+      ...ShotWithAllFeatures
+    }
+    ids
+  }
+}
+
+query GetShotsByIds($ids: [Int!]!) {
+  getShotsByIds(ids: $ids) {
+    ...ShotWithAllFeatures
+  }
+}
+
+fragment ShotWithAllFeatures on ShotGQL {
+  id
+  videoId
+  startFrame
+  endFrame
+  startTime @client
+  endTime @client
+  user {
+    id
+  }
+  falsePositiveScore
+  video {
+    id
+    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/operations/video.gql

@@ -117,25 +117,34 @@ query GetVideoDetails($videoId: Int!) {
 
 query GetVideos($videoIds: [Int!]!) {
   getVideos(videoIds: $videoIds) {
-    id
+    ...VideoStreamMetadata
-    framesPerSecond
-    stream {
-      id
-      streamSegmentType
-      segments {
-        uploaded
-        valid
-        segmentIndex
-        endFrameIndex
-        framesPerSecond
-      }
-    }
-    playlist {
-      segmentDurations
-    }
   }
 }
 
+fragment VideoStreamMetadata on VideoGQL {
+  id
+  framesPerSecond
+  stream {
+    id
+    streamSegmentType
+    segments {
+      uploaded
+      valid
+      segmentIndex
+      endFrameIndex
+      framesPerSecond
+    }
+  }
+  playlist {
+    segmentDurations
+  }
+}
+
+query GetVideoForShotTime($videoId: Int!) {
+  getVideo(videoId: $videoId) {
+    ...VideoStreamMetadata
+  }
+}
 query GetVideo($videoId: Int!) {
   getVideo(videoId: $videoId) {
     id
@@ -237,3 +246,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
 }
 
@@ -542,6 +545,10 @@ type Mutation {
     annotationName: String!
     notes: String = null
   ): AddShotAnnotationReturn!
+  updateShotAnnotations(
+    shotId: Int!
+    annotations: [UpdateAnnotationInputGQL!]!
+  ): UpdateShotAnnotationReturn!
   getProfileImageUploadLink(
     fileExt: String = ".png"
   ): GetProfileUploadLinkReturn!
@@ -595,6 +602,27 @@ type OtherErrorNeedsNote {
   msg: String
 }
 
+type UpdateShotAnnotationReturn {
+  value: SuccessfulUpdateUpdateShotAnnotationErrors!
+}
+
+union SuccessfulUpdateUpdateShotAnnotationErrors =
+    SuccessfulUpdate
+  | UpdateShotAnnotationErrors
+
+type SuccessfulUpdate {
+  value: Boolean!
+}
+
+type UpdateShotAnnotationErrors {
+  error: DoesNotOwnShotErr
+}
+
+input UpdateAnnotationInputGQL {
+  name: String!
+  notes: String = null
+}
+
 type GetProfileUploadLinkReturn {
   value: UploadLinkGetProfileUploadLinkErrors!
 }