Compare commits

..

20 Commits

Author SHA1 Message Date
318a2a24fd Ignore 2024-02-22 18:01:42 -07:00
2224a8ccbd Remove after before 2024-02-22 18:00:52 -07:00
48e2bec9ce Elapsed time in seconds 2024-02-22 17:55:37 -07:00
6a1807efc8 Make created at, ended at optional 2024-02-22 17:13:46 -07:00
0ad6e63733 Make video name optional 2024-02-22 17:07:29 -07:00
6255e246e7 Merge pull request 'Remove @includes from feed' (#5) from kat/include into master
Reviewed-on: #5
2024-02-22 16:46:09 -07:00
808fae0480 Remove @includes from feed 2024-02-22 16:45:26 -07:00
cc597b3cfb Merge pull request 'Create gql feed' (#4) from kat/update-video-gql into master
Reviewed-on: #4
2024-02-21 19:18:20 -07:00
60af058ba4 Create feed 2024-02-21 19:13:30 -07:00
17aee8f220 Drop frame count from videl gql 2024-02-21 17:54:00 -07:00
828140ed2b Updates 2024-02-20 19:18:29 -07:00
9a2cae0c70 Add scripts for checking that graphql-codegen results in no changes 2024-02-20 19:18:29 -07:00
ce8cfd6a68 Merge pull request 'TerminateUploadStream -- add fields' (#3) from loewy/terminate-upload-add-fields into master
Reviewed-on: #3
2024-02-15 21:38:15 -07:00
Loewy
234d4d0fa9 run codegen 2024-02-15 18:30:33 -08:00
Loewy
4d05d9a539 update operations 2024-02-15 18:14:54 -08:00
Loewy
3f16310f67 wip: add videoName, gameType & tableSize 2024-02-15 15:45:38 -08:00
204e289627 Actually regenerate code 2024-02-11 22:46:11 -07:00
fd731b2ecf Fix video uplaod 2024-02-11 22:44:18 -07:00
e733e413ef Small tweaks 2024-02-11 22:42:37 -07:00
90fc81776f Merge pull request 'Add shots and bucketed shot gql' (#2) from update-agg-gql into master
Reviewed-on: #2
2024-02-05 19:56:07 -07:00
7 changed files with 243 additions and 71 deletions

5
.gitignore vendored Normal file
View File

@@ -0,0 +1,5 @@
node_modules
dist
.direnv
/after.txt
/before.txt

View File

@@ -0,0 +1,6 @@
#!/usr/bin/env bash
GQL_DIR=$(dirname $(dirname "$(realpath "$BASH_SOURCE")"))
cd $GQL_DIR
nix develop --impure --command bash "$GQL_DIR/bin/assert-no-changes.sh"

10
bin/assert-no-changes.sh Executable file
View File

@@ -0,0 +1,10 @@
#!/usr/bin/env bash
git ls-files | xargs md5sum > before.txt
yarn install
yarn graphql-codegen
git ls-files | xargs md5sum > after.txt
diff before.txt after.txt

View File

@@ -115,9 +115,7 @@ export type FilterInput = {
export type GetUploadLinkReturn = {
__typename?: 'GetUploadLinkReturn';
linksRequested: Scalars['Int']['output'];
uploadUrl: Scalars['String']['output'];
uploadsCompleted: Scalars['Int']['output'];
};
export type IntendedPocketTypeInput = {
@@ -129,7 +127,6 @@ export type Mutation = {
createBucketSet: BucketSetGql;
createUploadStream: CreateUploadStreamReturn;
getUploadLink: GetUploadLinkReturn;
processVideoSource: ProcessVideoSourceReturn;
terminateUploadStream: Scalars['Boolean']['output'];
};
@@ -146,24 +143,28 @@ export type MutationCreateUploadStreamArgs = {
export type MutationGetUploadLinkArgs = {
chunkIndex: Scalars['Int']['input'];
segmentIndex: Scalars['Int']['input'];
videoId: Scalars['Int']['input'];
};
export type MutationProcessVideoSourceArgs = {
input: ProcessVideoSourceInput;
};
export type MutationTerminateUploadStreamArgs = {
gameType?: InputMaybe<Scalars['String']['input']>;
tableSize?: InputMaybe<Scalars['String']['input']>;
videoId: Scalars['Int']['input'];
videoName?: InputMaybe<Scalars['String']['input']>;
};
export type OrFilter = {
filters: Array<FilterInput>;
};
export type PageInfoGql = {
__typename?: 'PageInfoGQL';
endCursor?: Maybe<Scalars['String']['output']>;
hasNextPage: Scalars['Boolean']['output'];
};
export enum PocketEnum {
Corner = 'CORNER',
Side = 'SIDE'
@@ -176,22 +177,15 @@ export type PocketingIntentionFeaturesGql = {
targetPocketDistance?: Maybe<Scalars['Float']['output']>;
};
export type ProcessVideoSourceInput = {
val: Scalars['Int']['input'];
};
export type ProcessVideoSourceReturn = {
__typename?: 'ProcessVideoSourceReturn';
val: Scalars['Int']['output'];
};
export type Query = {
__typename?: 'Query';
getAggregateShots: Array<AggregateResultGql>;
getBucketSet?: Maybe<BucketSetGql>;
getLoggedInUser?: Maybe<UserGql>;
getShots: Array<ShotGql>;
getUser?: Maybe<UserGql>;
getVideo: VideoGql;
getVideoFeedForUser: VideoFeedGql;
};
@@ -219,6 +213,12 @@ export type QueryGetVideoArgs = {
videoId: Scalars['Int']['input'];
};
export type QueryGetVideoFeedForUserArgs = {
after?: InputMaybe<Scalars['String']['input']>;
first?: Scalars['Int']['input'];
};
export type RangeFilter = {
greaterThanEqualTo?: InputMaybe<Scalars['Float']['input']>;
lessThan?: InputMaybe<Scalars['Float']['input']>;
@@ -315,6 +315,7 @@ export type UploadStreamMetadata = {
export type UserGql = {
__typename?: 'UserGQL';
createdAt?: Maybe<Scalars['DateTime']['output']>;
firebaseUid: Scalars['String']['output'];
id: Scalars['Int']['output'];
statistics: UserStatisticsGql;
updatedAt?: Maybe<Scalars['DateTime']['output']>;
@@ -331,23 +332,29 @@ export type UserStatisticsGql = {
totalShotsMade: Scalars['Int']['output'];
};
export type VideoFeedGql = {
__typename?: 'VideoFeedGQL';
pageInfo: PageInfoGql;
videos: Array<VideoGql>;
};
export type VideoGql = {
__typename?: 'VideoGQL';
averageTimeBetweenShots?: Maybe<Scalars['Decimal']['output']>;
createdAt: Scalars['DateTime']['output'];
elapsedTime: Scalars['Decimal']['output'];
endTime: Scalars['DateTime']['output'];
averageTimeBetweenShots?: Maybe<Scalars['Float']['output']>;
createdAt?: Maybe<Scalars['DateTime']['output']>;
elapsedTime?: Maybe<Scalars['Float']['output']>;
endTime?: Maybe<Scalars['DateTime']['output']>;
framesPerSecond: Scalars['Int']['output'];
id: Scalars['Int']['output'];
makePercentage: Scalars['Decimal']['output'];
medianRun: Scalars['Decimal']['output'];
makePercentage: Scalars['Float']['output'];
medianRun?: Maybe<Scalars['Float']['output']>;
name?: Maybe<Scalars['String']['output']>;
shots: Array<ShotGql>;
startTime: Scalars['DateTime']['output'];
startTime?: Maybe<Scalars['DateTime']['output']>;
stream?: Maybe<UploadStreamGql>;
totalFrames: Scalars['Int']['output'];
totalShots: Scalars['Int']['output'];
totalShotsMade: Scalars['Int']['output'];
updatedAt: Scalars['DateTime']['output'];
updatedAt?: Maybe<Scalars['DateTime']['output']>;
};
export enum WallTypeEnum {
@@ -362,6 +369,14 @@ export type GetAggregateShotsQueryVariables = Exact<{
export type GetAggregateShotsQuery = { __typename?: 'Query', getAggregateShots: Array<{ __typename?: 'AggregateResultGQL', featureBuckets: Array<{ __typename?: 'BucketGQL', rangeKey: string, lowerBound: number }>, targetMetrics: Array<{ __typename?: 'TargetMetricGQL', count?: number | null, makePercentage?: number | null, floatFeature?: { __typename?: 'TargetFloatFeatureGQL', featureName: string, average?: number | null, median?: number | null } | null }> }> };
export type GetFeedQueryVariables = Exact<{
first?: Scalars['Int']['input'];
after?: InputMaybe<Scalars['String']['input']>;
}>;
export type GetFeedQuery = { __typename?: 'Query', getVideoFeedForUser: { __typename?: 'VideoFeedGQL', videos: Array<{ __typename?: 'VideoGQL', id: number, name?: string | null, totalShotsMade: number, totalShots: number, makePercentage: number, medianRun?: number | null, averageTimeBetweenShots?: number | null, createdAt?: any | null, updatedAt?: any | null, startTime?: any | null, endTime?: any | null, elapsedTime?: number | null, shots: Array<{ __typename?: 'ShotGQL', id?: number | null, videoId?: number | null, startFrame?: number | null, endFrame?: number | null, createdAt?: any | null, updatedAt?: any | null }>, stream?: { __typename?: 'UploadStreamGQL', id: string, linksRequested: number, uploadsCompleted: number, isCompleted: boolean, createdAt: any, updatedAt: any } | null }>, pageInfo: { __typename?: 'PageInfoGQL', hasNextPage: boolean, endCursor?: string | null } } };
export type GetShotsQueryVariables = Exact<{
filterInput?: InputMaybe<FilterInput>;
includeCueObjectDistance?: Scalars['Boolean']['input'];
@@ -394,14 +409,17 @@ export type CreateUploadStreamMutation = { __typename?: 'Mutation', createUpload
export type GetUploadLinkMutationVariables = Exact<{
videoId: Scalars['Int']['input'];
chunkIndex: Scalars['Int']['input'];
segmentIndex: Scalars['Int']['input'];
}>;
export type GetUploadLinkMutation = { __typename?: 'Mutation', getUploadLink: { __typename?: 'GetUploadLinkReturn', uploadUrl: string, linksRequested: number } };
export type GetUploadLinkMutation = { __typename?: 'Mutation', getUploadLink: { __typename?: 'GetUploadLinkReturn', uploadUrl: string } };
export type TerminateUploadStreamMutationVariables = Exact<{
videoId: Scalars['Int']['input'];
videoName?: InputMaybe<Scalars['String']['input']>;
gameType?: InputMaybe<Scalars['String']['input']>;
tableSize?: InputMaybe<Scalars['String']['input']>;
}>;
@@ -460,6 +478,80 @@ export type GetAggregateShotsQueryHookResult = ReturnType<typeof useGetAggregate
export type GetAggregateShotsLazyQueryHookResult = ReturnType<typeof useGetAggregateShotsLazyQuery>;
export type GetAggregateShotsSuspenseQueryHookResult = ReturnType<typeof useGetAggregateShotsSuspenseQuery>;
export type GetAggregateShotsQueryResult = Apollo.QueryResult<GetAggregateShotsQuery, GetAggregateShotsQueryVariables>;
export const GetFeedDocument = gql`
query GetFeed($first: Int! = 5, $after: String = null) {
getVideoFeedForUser(first: $first, after: $after) {
videos {
id
name
totalShotsMade
totalShots
makePercentage
medianRun
averageTimeBetweenShots
createdAt
updatedAt
shots {
id
videoId
startFrame
endFrame
createdAt
updatedAt
}
startTime
endTime
elapsedTime
stream {
id
linksRequested
uploadsCompleted
isCompleted
createdAt
updatedAt
}
}
pageInfo {
hasNextPage
endCursor
}
}
}
`;
/**
* __useGetFeedQuery__
*
* To run a query within a React component, call `useGetFeedQuery` and pass it any options that fit your needs.
* When your component renders, `useGetFeedQuery` returns an object from Apollo Client that contains loading, error, and data properties
* you can use to render your UI.
*
* @param baseOptions options that will be passed into the query, supported options are listed on: https://www.apollographql.com/docs/react/api/react-hooks/#options;
*
* @example
* const { data, loading, error } = useGetFeedQuery({
* variables: {
* first: // value for 'first'
* after: // value for 'after'
* },
* });
*/
export function useGetFeedQuery(baseOptions?: Apollo.QueryHookOptions<GetFeedQuery, GetFeedQueryVariables>) {
const options = {...defaultOptions, ...baseOptions}
return Apollo.useQuery<GetFeedQuery, GetFeedQueryVariables>(GetFeedDocument, options);
}
export function useGetFeedLazyQuery(baseOptions?: Apollo.LazyQueryHookOptions<GetFeedQuery, GetFeedQueryVariables>) {
const options = {...defaultOptions, ...baseOptions}
return Apollo.useLazyQuery<GetFeedQuery, GetFeedQueryVariables>(GetFeedDocument, options);
}
export function useGetFeedSuspenseQuery(baseOptions?: Apollo.SuspenseQueryHookOptions<GetFeedQuery, GetFeedQueryVariables>) {
const options = {...defaultOptions, ...baseOptions}
return Apollo.useSuspenseQuery<GetFeedQuery, GetFeedQueryVariables>(GetFeedDocument, options);
}
export type GetFeedQueryHookResult = ReturnType<typeof useGetFeedQuery>;
export type GetFeedLazyQueryHookResult = ReturnType<typeof useGetFeedLazyQuery>;
export type GetFeedSuspenseQueryHookResult = ReturnType<typeof useGetFeedSuspenseQuery>;
export type GetFeedQueryResult = Apollo.QueryResult<GetFeedQuery, GetFeedQueryVariables>;
export const GetShotsDocument = gql`
query GetShots($filterInput: FilterInput, $includeCueObjectDistance: Boolean! = false, $includeCueObjectAngle: Boolean! = false, $includeCueBallSpeed: Boolean! = false, $includeShotDirection: Boolean! = false, $includeTargetPocketDistance: Boolean! = false, $includeMake: Boolean! = false, $includeIntendedPocketType: Boolean! = false) {
getShots(filterInput: $filterInput) {
@@ -569,10 +661,9 @@ export type CreateUploadStreamMutationHookResult = ReturnType<typeof useCreateUp
export type CreateUploadStreamMutationResult = Apollo.MutationResult<CreateUploadStreamMutation>;
export type CreateUploadStreamMutationOptions = Apollo.BaseMutationOptions<CreateUploadStreamMutation, CreateUploadStreamMutationVariables>;
export const GetUploadLinkDocument = gql`
mutation GetUploadLink($videoId: Int!, $chunkIndex: Int!) {
getUploadLink(videoId: $videoId, chunkIndex: $chunkIndex) {
mutation GetUploadLink($videoId: Int!, $segmentIndex: Int!) {
getUploadLink(videoId: $videoId, segmentIndex: $segmentIndex) {
uploadUrl
linksRequested
}
}
`;
@@ -592,7 +683,7 @@ export type GetUploadLinkMutationFn = Apollo.MutationFunction<GetUploadLinkMutat
* const [getUploadLinkMutation, { data, loading, error }] = useGetUploadLinkMutation({
* variables: {
* videoId: // value for 'videoId'
* chunkIndex: // value for 'chunkIndex'
* segmentIndex: // value for 'segmentIndex'
* },
* });
*/
@@ -604,8 +695,13 @@ export type GetUploadLinkMutationHookResult = ReturnType<typeof useGetUploadLink
export type GetUploadLinkMutationResult = Apollo.MutationResult<GetUploadLinkMutation>;
export type GetUploadLinkMutationOptions = Apollo.BaseMutationOptions<GetUploadLinkMutation, GetUploadLinkMutationVariables>;
export const TerminateUploadStreamDocument = gql`
mutation TerminateUploadStream($videoId: Int!) {
terminateUploadStream(videoId: $videoId)
mutation TerminateUploadStream($videoId: Int!, $videoName: String, $gameType: String, $tableSize: String) {
terminateUploadStream(
videoId: $videoId
videoName: $videoName
gameType: $gameType
tableSize: $tableSize
)
}
`;
export type TerminateUploadStreamMutationFn = Apollo.MutationFunction<TerminateUploadStreamMutation, TerminateUploadStreamMutationVariables>;
@@ -624,6 +720,9 @@ export type TerminateUploadStreamMutationFn = Apollo.MutationFunction<TerminateU
* const [terminateUploadStreamMutation, { data, loading, error }] = useTerminateUploadStreamMutation({
* variables: {
* videoId: // value for 'videoId'
* videoName: // value for 'videoName'
* gameType: // value for 'gameType'
* tableSize: // value for 'tableSize'
* },
* });
*/

41
src/operations/feed.gql Normal file
View File

@@ -0,0 +1,41 @@
query GetFeed(
$first: Int! = 5,
$after: String = null,
) {
getVideoFeedForUser(first: $first, after: $after) {
videos {
id
name
totalShotsMade
totalShots
makePercentage
medianRun
averageTimeBetweenShots
createdAt
updatedAt
shots {
id
videoId
startFrame
endFrame
createdAt
updatedAt
}
startTime
endTime
elapsedTime
stream {
id
linksRequested
uploadsCompleted
isCompleted
createdAt
updatedAt
}
}
pageInfo {
hasNextPage
endCursor
}
}
}

View File

@@ -1,13 +1,13 @@
mutation CreateUploadStream(
$videoName: String!,
$deviceType: DeviceTypeEnum,
$osVersion: String,
$appVersion: String,
$browserName: String,
$browserVersion: String,
$locale: String,
$timezone: String,
$networkType: String,
$videoName: String!
$deviceType: DeviceTypeEnum
$osVersion: String
$appVersion: String
$browserName: String
$browserVersion: String
$locale: String
$timezone: String
$networkType: String
$ipAddress: String
) {
createUploadStream(
@@ -28,13 +28,22 @@ mutation CreateUploadStream(
}
}
mutation GetUploadLink($videoId: Int!, $chunkIndex: Int!) {
getUploadLink(videoId: $videoId, chunkIndex: $chunkIndex) {
mutation GetUploadLink($videoId: Int!, $segmentIndex: Int!) {
getUploadLink(videoId: $videoId, segmentIndex: $segmentIndex) {
uploadUrl
linksRequested
}
}
mutation TerminateUploadStream($videoId: Int!) {
terminateUploadStream(videoId: $videoId)
mutation TerminateUploadStream(
$videoId: Int!
$videoName: String
$gameType: String
$tableSize: String
) {
terminateUploadStream(
videoId: $videoId
videoName: $videoName
gameType: $gameType
tableSize: $tableSize
)
}

View File

@@ -1,9 +1,11 @@
type Query {
getAggregateShots(bucketSets: [BucketSetInputGQL!]!): [AggregateResultGQL!]!
getUser(userId: Int!): UserGQL
getLoggedInUser: UserGQL
getVideo(videoId: Int!): VideoGQL!
getShots(filterInput: FilterInput = null): [ShotGQL!]!
getBucketSet(keyName: String!): BucketSetGQL
getVideoFeedForUser(first: Int! = 5, after: String = null): VideoFeedGQL!
}
type AggregateResultGQL {
@@ -40,6 +42,7 @@ input BucketInputGQL {
type UserGQL {
id: Int!
firebaseUid: String!
username: String!
createdAt: DateTime
updatedAt: DateTime
@@ -63,19 +66,19 @@ scalar Decimal
type VideoGQL {
id: Int!
name: String
totalShotsMade: Int!
totalShots: Int!
makePercentage: Decimal!
medianRun: Decimal!
averageTimeBetweenShots: Decimal
createdAt: DateTime!
updatedAt: DateTime!
makePercentage: Float!
medianRun: Float
averageTimeBetweenShots: Float
createdAt: DateTime
updatedAt: DateTime
shots: [ShotGQL!]!
startTime: DateTime!
endTime: DateTime!
elapsedTime: Decimal!
startTime: DateTime
endTime: DateTime
elapsedTime: Float
framesPerSecond: Int!
totalFrames: Int!
stream: UploadStreamGQL
}
@@ -222,12 +225,21 @@ type BucketSetGQL {
buckets: [BucketGQL!]!
}
type VideoFeedGQL {
videos: [VideoGQL!]!
pageInfo: PageInfoGQL!
}
type PageInfoGQL {
hasNextPage: Boolean!
endCursor: String
}
type Mutation {
createBucketSet(params: CreateBucketSetInput!): BucketSetGQL!
processVideoSource(input: ProcessVideoSourceInput!): ProcessVideoSourceReturn!
createUploadStream(uploadMetadata: UploadMetadataInput, videoName: String = null): CreateUploadStreamReturn!
getUploadLink(videoId: Int!, chunkIndex: Int!): GetUploadLinkReturn!
terminateUploadStream(videoId: Int!): Boolean!
getUploadLink(videoId: Int!, segmentIndex: Int!): GetUploadLinkReturn!
terminateUploadStream(videoId: Int!, videoName: String = null, gameType: String = null, tableSize: String = null): Boolean!
}
input CreateBucketSetInput {
@@ -236,14 +248,6 @@ input CreateBucketSetInput {
buckets: [BucketInputGQL!]!
}
type ProcessVideoSourceReturn {
val: Int!
}
input ProcessVideoSourceInput {
val: Int!
}
type CreateUploadStreamReturn {
videoId: Int!
}
@@ -262,6 +266,4 @@ input UploadMetadataInput {
type GetUploadLinkReturn {
uploadUrl: String!
linksRequested: Int!
uploadsCompleted: Int!
}