Merge pull request 'Add ensureStripeCustomerExists to schema' (#188) from loewy/get-stripe-customer-mutation into master

Reviewed-on: #188

src/operations/comments.gql

@@ -0,0 +1,19 @@
+mutation CommentOnVideo(
+  $videoId: Int!
+  $message: String!
+  $parentCommentId: Int
+) {
+  commentOnVideo(
+    videoId: $videoId
+    message: $message
+    parentCommentId: $parentCommentId
+  )
+}
+
+mutation EditComment($videoId: Int!, $commentId: Int!, $newMessage: String!) {
+  editComment(videoId: $videoId, commentId: $commentId, newMessage: $newMessage)
+}
+
+mutation DeleteComment($videoId: Int!, $commentId: Int!) {
+  deleteComment(videoId: $videoId, commentId: $commentId)
+}

src/operations/config.gql

@@ -5,5 +5,13 @@ query getDeployedConfig {
     environment
     firebase
     minimumAllowedAppVersion
+    bannerMessages {
+      color
+      dismissible
+      id
+      kind
+      message
+      priority
+    }
   }
 }

src/operations/feed.gql

@@ -15,6 +15,17 @@ query GetFeed(
   }
 }
 
+fragment UserSocialsFields on UserGQL {
+  id
+  username
+  profileImageUri
+  followers {
+    id
+    username
+    profileImageUri
+  }
+}
+
 fragment VideoCardFields on VideoGQL {
   id
   owner {
@@ -40,6 +51,7 @@ fragment VideoCardFields on VideoGQL {
     id
     lastIntendedSegmentBound
     isCompleted
+    streamSegmentType
   }
   tableSize
   tags {
@@ -61,17 +73,24 @@ fragment VideoCardFields on VideoGQL {
   reactions {
     videoId
     user {
-      id
-      username
-      profileImageUri
-      followers {
-        id
-        username
-        profileImageUri
-      }
+      ...UserSocialsFields
     }
     reaction
   }
+  comments {
+    id
+    message
+    user {
+      ...UserSocialsFields
+    }
+    replies {
+      id
+      message
+      user {
+        ...UserSocialsFields
+      }
+    }
+  }
 }
 
 query GetVideoFeed(

src/operations/runs.gql

@@ -2,11 +2,15 @@ query GetRunsForHighlights(
   $filterInput: RunFilterInput!
   $runIds: [Int!] = null
   $runsOrdering: GetRunsOrdering
+  $limit: Int! = 500
+  $countRespectsLimit: Boolean! = false
 ) {
   getRuns(
     filterInput: $filterInput
     runIds: $runIds
     runsOrdering: $runsOrdering
+    limit: $limit
+    countRespectsLimit: $countRespectsLimit
   ) {
     count
     runs {
@@ -23,6 +27,16 @@ query GetRunsForHighlights(
   }
 }
 
+fragment PocketingIntentionFragment on PocketingIntentionFeaturesGQL {
+  make
+  targetPocketDistance
+  targetPocketAngle
+  targetPocketAngleDirection
+  marginOfErrorInDegrees
+  intendedPocketType
+  difficulty
+}
+
 query GetRunsWithTimestamps(
   $filterInput: RunFilterInput!
   $runIds: [Int!] = null
@@ -43,8 +57,8 @@ query GetRunsWithTimestamps(
         videoId
         id
         createdAt
-        shotDifficulty: pocketingIntentionFeatures {
-          difficulty
+        pocketingIntentionFeatures {
+          ...PocketingIntentionFragment
         }
       }
     }

src/operations/shots.gql

@@ -185,6 +185,13 @@ fragment ShotWithAllFeatures on ShotGQL {
     }
     notes
   }
+  video {
+    id
+    stream {
+      id
+      streamSegmentType
+    }
+  }
 }
 
 mutation EditShot($shotId: Int!, $fieldsToEdit: EditableShotFieldInputGQL!) {

src/operations/video.gql

@@ -82,6 +82,57 @@ query GetVideoDetails($videoId: Int!) {
   }
 }
 
+fragment UserSocialsFields on UserGQL {
+  id
+  username
+  profileImageUri
+  followers {
+    id
+    username
+    profileImageUri
+  }
+}
+
+query GetVideoSocialDetailsById($videoId: Int!) {
+  getVideo(videoId: $videoId) {
+    id
+    name
+    owner {
+      id
+      firebaseUid
+      username
+      profileImageUri
+    }
+    tags {
+      tagClasses {
+        name
+      }
+      name
+    }
+    reactions {
+      videoId
+      user {
+        ...UserSocialsFields
+      }
+      reaction
+    }
+    comments {
+      id
+      message
+      user {
+        ...UserSocialsFields
+      }
+      replies {
+        id
+        message
+        user {
+          ...UserSocialsFields
+        }
+      }
+    }
+  }
+}
+
 query GetVideos($videoIds: [Int!]!) {
   getVideos(videoIds: $videoIds) {
     ...VideoStreamMetadata

src/schema.gql

@@ -5,10 +5,28 @@ type Query {
   getBucketSet(keyName: String!): BucketSetGQL
   getDeployedConfig: DeployedConfigGQL!
   waitFor(duration: Float!): Float!
+  getFeedVideos(
+    limit: Int! = 5
+    after: String = null
+    includePrivate: IncludePrivateEnum! = MINE
+    includeCallersVideos: Boolean = true
+    filters: VideoFilterInput = null
+    feedInput: VideoFeedInputGQL = null
+  ): VideoHistoryGQL!
   getVideoMakePercentageIntervals(
     videoId: ID!
     intervalDuration: Int! = 300
   ): [MakePercentageIntervalGQL!]!
+  getLongestRunsLeaderboard(
+    interval: TimeInterval = null
+    when: DateTime = null
+    limit: Int! = 100
+    requiredTags: [String!] = null
+  ): RunLeaderboardGQL!
+  getMakesLeaderboard(
+    interval: TimeInterval = null
+    when: DateTime = null
+  ): CountLeaderboardGQL!
   getMedals(scope: MedalScope!, userId: Int = null): RequestedMedalsGQL!
   getRuns(
     filterInput: RunFilterInput!
@@ -17,6 +35,12 @@ type Query {
     limit: Int! = 500
     countRespectsLimit: Boolean! = false
   ): GetRunsResult!
+  getShotAnnotationTypes(errorTypes: Boolean = false): [ShotAnnotationTypeGQL!]!
+  getTableState(
+    b64Image: String!
+    tableSize: Float = 100
+    useHomography: HomographyInputGQL = null
+  ): TableStateGQL!
   getOrderedShots(
     filterInput: FilterInput!
     ids: [Int!] = null
@@ -38,7 +62,6 @@ type Query {
     countRespectsLimit: Boolean! = false
   ): [ShotGQL!]!
   getShotsByIds(ids: [Int!]!): [ShotGQL!]!
-  getShotAnnotationTypes(errorTypes: Boolean = false): [ShotAnnotationTypeGQL!]!
   getUser(userId: Int!): UserGQL
   doesUsernameExist(candidateUsername: String!): Boolean!
   getLoggedInUser: UserGQL
@@ -47,6 +70,11 @@ type Query {
     limit: Int = null
     after: String = null
   ): [String!]!
+  getUsersMatching(
+    matchString: String = null
+    limit: Int = null
+    after: String = null
+  ): [UserGQL!]!
   getUserRelationshipsMatching(
     userId: Int!
     matchString: String = null
@@ -63,24 +91,6 @@ type Query {
   getUserTags(includeRetiredTags: Boolean = false): [TagGQL!]!
   getVideo(videoId: Int!, debuggingJson: JSON = null): VideoGQL!
   getVideos(videoIds: [Int!]!): [VideoGQL!]!
-  getFeedVideos(
-    limit: Int! = 5
-    after: String = null
-    includePrivate: IncludePrivateEnum! = MINE
-    includeCallersVideos: Boolean = true
-    filters: VideoFilterInput = null
-    feedInput: VideoFeedInputGQL = null
-  ): VideoHistoryGQL!
-  getLongestRunsLeaderboard(
-    interval: TimeInterval = null
-    when: DateTime = null
-    limit: Int! = 100
-    requiredTags: [String!] = null
-  ): RunLeaderboardGQL!
-  getMakesLeaderboard(
-    interval: TimeInterval = null
-    when: DateTime = null
-  ): CountLeaderboardGQL!
 }
 
 type AggregateResultGQL {
@@ -286,72 +296,73 @@ type DeployedConfigGQL {
   devMode: Boolean!
   environment: String!
   minimumAllowedAppVersion: String!
+  bannerMessages: [BannerGQL!]!
 }
 
-type MakePercentageIntervalGQL {
-  makePercentage: Float!
-  elapsedTime: Float!
-}
-
-type RequestedMedalsGQL {
-  distanceOver66: MedalGQL
-  distanceOver78: MedalGQL
-  distanceOver90: MedalGQL
-  runLength3: MedalGQL
-  runLength5: MedalGQL
-  runLength8: MedalGQL
-  runLength10: MedalGQL
-  runLength15: MedalGQL
-  runLength20: MedalGQL
-  runLength25: MedalGQL
-  runLength30: MedalGQL
-  runLength40: MedalGQL
-  runLength50: MedalGQL
-  totalMakes25: MedalGQL @deprecated(reason: "no longer supported")
-  totalMakes50: MedalGQL @deprecated(reason: "no longer supported")
-  totalMakes75: MedalGQL @deprecated(reason: "no longer supported")
-  totalMakes200: MedalGQL @deprecated(reason: "no longer supported")
-  totalMakes300: MedalGQL @deprecated(reason: "no longer supported")
-  totalMakes400: MedalGQL @deprecated(reason: "no longer supported")
-  totalMakes750: MedalGQL @deprecated(reason: "no longer supported")
-  totalMakes100: MedalGQL
-  totalMakes500: MedalGQL
-  totalMakes1000: MedalGQL
-  totalMakes5000: MedalGQL
-  totalMakes10000: MedalGQL
-  dailyMakes50: MedalGQL
-  dailyMakes100: MedalGQL
-  dailyMakes150: MedalGQL
-  dailyMakes200: MedalGQL
-  dailyMakes250: MedalGQL
-}
-
-type MedalGQL {
-  count: Int!
-  nickname: String
-}
-
-input MedalScope @oneOf {
-  videoId: Int
-  interval: TimeInterval
-    @deprecated(reason: "NO LONGER SUPPORTED, USE DATETIME_RANGE")
-  datetimeRange: DatetimeRangeAggregationInput
-}
-
-type GetRunsResult {
-  runs: [RunGQL!]!
-  count: Int
-  runIds: [Int!]!
-}
-
-type RunGQL {
+type BannerGQL {
   id: Int!
-  runLength: Int!
-  videoId: Int!
-  userId: Int!
+  message: String!
+  color: String!
+  kind: BannerKindEnum!
+  dismissible: Boolean!
+  priority: Int!
+}
+
+enum BannerKindEnum {
+  INFO
+  WARNING
+  ERROR
+}
+
+type VideoHistoryGQL {
+  videos: [VideoGQL!]!
+  pageInfo: PageInfoGQL!
+}
+
+type VideoGQL {
+  id: Int!
+  owner: UserGQL
+  name: String
+  screenshotUri: String
+  totalShotsMade: Int!
+  totalShots: Int!
+  makePercentage: Float!
+  medianRun: Float
+  averageTimeBetweenShots: Float
+  averageDifficulty: Float
+  createdAt: DateTime
+  updatedAt: DateTime
   shots: [ShotGQL!]!
-  video: VideoGQL!
-  user: UserGQL!
+  startTime: DateTime
+  endTime: DateTime
+  elapsedTime: Float
+  framesPerSecond: Float!
+  tableSize: Float!
+  private: Boolean!
+  stream: UploadStreamGQL
+  playlist: HLSPlaylistGQL
+  tags: [VideoTag!]!
+  currentHomography: HomographyInfoGQL
+  homographyHistory: [HomographyInfoGQL!]!
+  currentProcessing: VideoProcessingGQL
+  reactions: [ReactionGQL!]!
+  comments: [CommentGQL!]!
+}
+
+type UserGQL {
+  id: Int!
+  firebaseUid: String
+  username: String!
+  isAdmin: Boolean
+  fargoRating: Int
+  activeVideoId: Int
+  stripeCustomerId: String
+  profileImageUri: String
+  createdAt: DateTime
+  updatedAt: DateTime
+  videosPrivateByDefault: Boolean
+  following: [UserGQL!]
+  followers: [UserGQL!]
 }
 
 type ShotGQL {
@@ -423,21 +434,6 @@ type SerializedShotPathsGQL {
   b64EncodedBuffer: String
 }
 
-type UserGQL {
-  id: Int!
-  firebaseUid: String
-  username: String!
-  isAdmin: Boolean
-  fargoRating: Int
-  activeVideoId: Int
-  profileImageUri: String
-  createdAt: DateTime
-  updatedAt: DateTime
-  videosPrivateByDefault: Boolean
-  following: [UserGQL!]
-  followers: [UserGQL!]
-}
-
 type ShotAnnotationGQL {
   shotId: Int!
   type: ShotAnnotationTypeGQL!
@@ -453,33 +449,19 @@ type ShotAnnotationTypeGQL {
   name: String!
 }
 
-type VideoGQL {
+type RunGQL {
   id: Int!
-  owner: UserGQL
-  name: String
-  screenshotUri: String
-  totalShotsMade: Int!
-  totalShots: Int!
-  makePercentage: Float!
-  medianRun: Float
-  averageTimeBetweenShots: Float
-  averageDifficulty: Float
-  createdAt: DateTime
-  updatedAt: DateTime
+  runLength: Int!
+  videoId: Int!
+  userId: Int!
   shots: [ShotGQL!]!
-  startTime: DateTime
-  endTime: DateTime
-  elapsedTime: Float
-  framesPerSecond: Float!
-  tableSize: Float!
-  private: Boolean!
-  stream: UploadStreamGQL
-  playlist: HLSPlaylistGQL
-  tags: [VideoTag!]!
-  currentHomography: HomographyInfoGQL
-  homographyHistory: [HomographyInfoGQL!]!
-  currentProcessing: VideoProcessingGQL
-  reactions: [ReactionGQL!]!
+  video: VideoGQL!
+  user: UserGQL!
+}
+
+type RunFeaturesGQL {
+  runId: Int!
+  indexInRun: Int!
 }
 
 type UploadStreamGQL {
@@ -628,9 +610,107 @@ enum ReactionEnum {
   HUNDRED
 }
 
-type RunFeaturesGQL {
-  runId: Int!
-  indexInRun: Int!
+type CommentGQL {
+  id: Int!
+  user: UserGQL!
+  message: String!
+  replies: [CommentGQL!]!
+}
+
+type PageInfoGQL {
+  hasNextPage: Boolean!
+  endCursor: String
+}
+
+enum IncludePrivateEnum {
+  ALL
+  MINE
+  NONE
+}
+
+input VideoFilterInput {
+  isStreamCompleted: Boolean = null
+  requireCursorCompletion: Boolean! = true
+  createdAt: DateRangeFilter = null
+  excludeVideosWithNoShots: Boolean = null
+}
+
+input VideoFeedInputGQL @oneOf {
+  followedByUserId: Int
+  userId: Int
+  allUsers: Boolean
+}
+
+type MakePercentageIntervalGQL {
+  makePercentage: Float!
+  elapsedTime: Float!
+}
+
+type RunLeaderboardGQL {
+  entries: [RunGQL!]!
+}
+
+type CountLeaderboardGQL {
+  entries: [UserShotCountEntry!]!
+}
+
+type UserShotCountEntry {
+  user: UserGQL!
+  value: Int!
+  total: Int!
+  proportionMade: Float!
+  videos: Int!
+}
+
+type RequestedMedalsGQL {
+  distanceOver66: MedalGQL
+  distanceOver78: MedalGQL
+  distanceOver90: MedalGQL
+  runLength3: MedalGQL
+  runLength5: MedalGQL
+  runLength8: MedalGQL
+  runLength10: MedalGQL
+  runLength15: MedalGQL
+  runLength20: MedalGQL
+  runLength25: MedalGQL
+  runLength30: MedalGQL
+  runLength40: MedalGQL
+  runLength50: MedalGQL
+  totalMakes25: MedalGQL @deprecated(reason: "no longer supported")
+  totalMakes50: MedalGQL @deprecated(reason: "no longer supported")
+  totalMakes75: MedalGQL @deprecated(reason: "no longer supported")
+  totalMakes200: MedalGQL @deprecated(reason: "no longer supported")
+  totalMakes300: MedalGQL @deprecated(reason: "no longer supported")
+  totalMakes400: MedalGQL @deprecated(reason: "no longer supported")
+  totalMakes750: MedalGQL @deprecated(reason: "no longer supported")
+  totalMakes100: MedalGQL
+  totalMakes500: MedalGQL
+  totalMakes1000: MedalGQL
+  totalMakes5000: MedalGQL
+  totalMakes10000: MedalGQL
+  dailyMakes50: MedalGQL
+  dailyMakes100: MedalGQL
+  dailyMakes150: MedalGQL
+  dailyMakes200: MedalGQL
+  dailyMakes250: MedalGQL
+}
+
+type MedalGQL {
+  count: Int!
+  nickname: String
+}
+
+input MedalScope @oneOf {
+  videoId: Int
+  interval: TimeInterval
+    @deprecated(reason: "NO LONGER SUPPORTED, USE DATETIME_RANGE")
+  datetimeRange: DatetimeRangeAggregationInput
+}
+
+type GetRunsResult {
+  runs: [RunGQL!]!
+  count: Int
+  runIds: [Int!]!
 }
 
 input RunFilterInput {
@@ -665,6 +745,39 @@ input DatetimeOrdering {
   startingAt: DateTime = null
 }
 
+type TableStateGQL {
+  identifierToPosition: [[Float!]!]!
+  homography: HomographyInfoGQL
+}
+
+input HomographyInputGQL {
+  crop: BoundingBoxInputGQL!
+  pockets: [BoundingBoxInputGQL!]!
+  sourcePoints: PocketPointsInputGQL!
+  destPoints: PocketPointsInputGQL!
+}
+
+input BoundingBoxInputGQL {
+  left: Float!
+  top: Float!
+  width: Float!
+  height: Float!
+}
+
+input PocketPointsInputGQL {
+  topLeft: IntPoint2DInput!
+  topSide: IntPoint2DInput!
+  topRight: IntPoint2DInput!
+  bottomLeft: IntPoint2DInput!
+  bottomSide: IntPoint2DInput!
+  bottomRight: IntPoint2DInput!
+}
+
+input IntPoint2DInput {
+  x: Int!
+  y: Int!
+}
+
 type GetShotsResult {
   shots: [ShotGQL!]!
   count: Int
@@ -714,23 +827,6 @@ type UserPlayTimeGQL {
   totalSeconds: Float!
 }
 
-input VideoFilterInput {
-  isStreamCompleted: Boolean = null
-  requireCursorCompletion: Boolean! = true
-  createdAt: DateRangeFilter = null
-  excludeVideosWithNoShots: Boolean = null
-}
-
-type VideoHistoryGQL {
-  videos: [VideoGQL!]!
-  pageInfo: PageInfoGQL!
-}
-
-type PageInfoGQL {
-  hasNextPage: Boolean!
-  endCursor: String
-}
-
 type TagGQL {
   id: Int!
   name: String!
@@ -751,41 +847,17 @@ scalar JSON
     url: "https://ecma-international.org/wp-content/uploads/ECMA-404_2nd_edition_december_2017.pdf"
   )
 
-enum IncludePrivateEnum {
-  ALL
-  MINE
-  NONE
-}
-
-input VideoFeedInputGQL @oneOf {
-  followedByUserId: Int
-  userId: Int
-  allUsers: Boolean
-}
-
-type RunLeaderboardGQL {
-  entries: [RunGQL!]!
-}
-
-type CountLeaderboardGQL {
-  entries: [UserShotCountEntry!]!
-}
-
-type UserShotCountEntry {
-  user: UserGQL!
-  value: Int!
-  total: Int!
-  proportionMade: Float!
-  videos: Int!
-}
-
 type Mutation {
   createBucketSet(params: CreateBucketSetInput!): BucketSetGQL!
   setLoggerLevel(path: String!, level: String!): Boolean!
-  editShot(
-    shotId: Int!
-    fieldsToEdit: EditableShotFieldInputGQL!
-  ): EditShotReturn!
+  reactToVideo(videoId: Int!, reaction: ReactionEnum): Boolean!
+  commentOnVideo(
+    videoId: Int!
+    message: String!
+    parentCommentId: Int
+  ): Boolean!
+  editComment(videoId: Int!, commentId: Int!, newMessage: String!): Boolean!
+  deleteComment(videoId: Int!, commentId: Int!): Boolean!
   addAnnotationToShot(
     shotId: Int!
     annotationName: String!
@@ -795,6 +867,10 @@ type Mutation {
     shotId: Int!
     annotations: [UpdateAnnotationInputGQL!]!
   ): UpdateShotAnnotationReturn!
+  editShot(
+    shotId: Int!
+    fieldsToEdit: EditableShotFieldInputGQL!
+  ): EditShotReturn!
   getProfileImageUploadLink(
     fileExt: String = ".png"
   ): GetProfileUploadLinkReturn!
@@ -803,6 +879,7 @@ type Mutation {
   followUser(followedUserId: Int!): UserGQL!
   unfollowUser(followedUserId: Int!): UserGQL!
   retireTags(tagIds: [Int!]!): Boolean!
+  ensureStripeCustomerExists(email: String!): UserGQL!
   findPrerecordTableLayout(b64Image: String!, videoId: Int!): HomographyInfoGQL
   createUploadStream(
     videoMetadata: VideoMetadataInput!
@@ -817,7 +894,6 @@ type Mutation {
   editUploadStream(videoId: Int!, videoMetadata: VideoMetadataInput!): Boolean!
   deleteVideo(videoId: Int!): Boolean!
   deleteTags(videoId: Int!, tagsToDelete: [VideoTagInput!]!): Boolean!
-  reactToVideo(videoId: Int!, reaction: ReactionEnum): Boolean!
 }
 
 input CreateBucketSetInput {
@@ -826,27 +902,6 @@ input CreateBucketSetInput {
   buckets: [BucketInputGQL!]!
 }
 
-type EditShotReturn {
-  shot: ShotGQL
-  error: DoesNotOwnShotErr
-}
-
-type DoesNotOwnShotErr {
-  shotId: Int!
-  msg: String
-}
-
-input EditableShotFieldInputGQL {
-  intendedPocketType: PocketEnum
-  shotDirection: ShotDirectionEnum
-  spinType: SpinTypeEnum
-  targetPocketAngleDirection: ShotDirectionEnum
-  make: Boolean
-  backcut: Boolean
-  excludeFromStats: Boolean
-  notes: String
-}
-
 type AddShotAnnotationReturn {
   value: SuccessfulAddAddShotAnnotationErrors!
 }
@@ -867,6 +922,11 @@ union DoesNotOwnShotErrOtherErrorNeedsNote =
     DoesNotOwnShotErr
   | OtherErrorNeedsNote
 
+type DoesNotOwnShotErr {
+  shotId: Int!
+  msg: String
+}
+
 type OtherErrorNeedsNote {
   msg: String
 }
@@ -881,6 +941,22 @@ input UpdateAnnotationInputGQL {
   notes: String = null
 }
 
+type EditShotReturn {
+  shot: ShotGQL
+  error: DoesNotOwnShotErr
+}
+
+input EditableShotFieldInputGQL {
+  intendedPocketType: PocketEnum
+  shotDirection: ShotDirectionEnum
+  spinType: SpinTypeEnum
+  targetPocketAngleDirection: ShotDirectionEnum
+  make: Boolean
+  backcut: Boolean
+  excludeFromStats: Boolean
+  notes: String
+}
+
 type GetProfileUploadLinkReturn {
   value: UploadLinkGetProfileUploadLinkErrors!
 }