Merge remote-tracking branch 'origin/master' into colonelpanic/allow-transient-homography-ids

Reviewed-on: #293

src/operations/shot_simulation.gql

@@ -9,6 +9,9 @@ query GetTableState(
     useHomography: $useHomography
   ) {
     identifierToPosition
+    identifierToColor {
+      hex
+    }
   }
 }
 
@@ -18,6 +21,9 @@ query GetLiveTableState($videoId: Int!) {
     frameIndex
     tableState {
       identifierToPosition
+      identifierToColor {
+        hex
+      }
       homography {
         ...HomographyInfo
       }

src/operations/usage_stats.gql

@@ -1,5 +1,24 @@
 query getUsageStats($days: Int! = 30) {
   getUsageStats(days: $days) {
+    funnel {
+      freemiumEpoch
+      eraSignups
+      eraPaying
+      activationCohort
+      activationActivated
+      payingUsers
+      newPaid7d
+      newPaid30d
+      retentionPrevActive
+      retentionReturned
+    }
+    cohorts {
+      weekStart
+      signups
+      activated7d
+      paid7d
+      activatedNotPaid7d
+    }
     totalUsers
     totalVideos
     totalShots

src/schema.gql

@@ -73,6 +73,7 @@ type Query {
     useHomography: HomographyInputGQL = null
   ): TableStateGQL!
   getLiveTableState(videoId: Int!): LiveTableStateGQL!
+  getShotTableState(shotId: Int!): ShotTableStateGQL!
   simulateShot(simulationInput: SimulateShotInputGQL!): ShotProjectionGQL!
   computePotAim(
     simulationInput: SimulateShotInputGQL!
@@ -609,7 +610,7 @@ type VideoTagClass {
 }
 
 type HomographyInfoGQL {
-  id: Int!
+  id: Int
   frameIndex: Int!
   crop: BoundingBoxGQL!
   pockets: [BoundingBoxGQL!]!
@@ -1065,6 +1066,13 @@ type LiveTableStateGQL {
   tableState: TableStateGQL!
 }
 
+type ShotTableStateGQL {
+  shotId: Int!
+  videoId: Int!
+  frameIndex: Int!
+  tableState: TableStateGQL!
+}
+
 type ShotProjectionGQL {
   trajectories: [BallTrajectoryGQL!]!
   events: [SimulationEventGQL!]!
@@ -1170,15 +1178,38 @@ input CreatedAfter @oneOf {
 }
 
 type UsageStatsGQL {
+  funnel: FunnelStatsGQL!
   totalUsers: Int!
   totalVideos: Int!
   totalShots: Int!
   totalRuns: Int!
+  cohorts: [CohortStatsGQL!]!
   windows: [UsageStatsWindowGQL!]!
   daily: [UsageStatsDailyGQL!]!
   processingLast24h: [ProcessingStatusCountGQL!]!
 }
 
+type FunnelStatsGQL {
+  freemiumEpoch: Date!
+  eraSignups: Int!
+  eraPaying: Int!
+  activationCohort: Int!
+  activationActivated: Int!
+  payingUsers: Int!
+  newPaid7d: Int!
+  newPaid30d: Int!
+  retentionPrevActive: Int!
+  retentionReturned: Int!
+}
+
+type CohortStatsGQL {
+  weekStart: Date!
+  signups: Int!
+  activated7d: Int!
+  paid7d: Int!
+  activatedNotPaid7d: Int!
+}
+
 type UsageStatsWindowGQL {
   label: String!
   newUsers: Int!