Compare commits

...

15 Commits

Author SHA1 Message Date
c2cb411469 Return usernamesAndIds
All checks were successful
Tests / Tests (pull_request) Successful in 16s
2024-10-24 23:41:52 -06:00
44ddc732a1 Fix cache merge (#87)
Co-authored-by: Kat Huang <kkathuang@gmail.com>
Reviewed-on: #87
Co-authored-by: Volodymyr Smolianinov <voidozzer@gmail.com>
Co-committed-by: Volodymyr Smolianinov <voidozzer@gmail.com>
2024-10-24 13:50:52 -06:00
d6ef3e0487 Merge pull request 'Remove error default from operation' (#86) from loewy/remove-error-default into master
Reviewed-on: #86
2024-10-24 12:28:39 -06:00
8c191bdb90 Remove error default from operation
All checks were successful
Tests / Tests (pull_request) Successful in 15s
2024-10-24 11:27:40 -07:00
8246699915 Merge pull request 'Return ShotGQL w/ updateShotAnnotations' (#84) from loewy/annotations-return into master
Reviewed-on: #84
Reviewed-by: Ivan Malison <ivanmalison@gmail.com>
2024-10-24 10:54:05 -06:00
de9d47c289 Merge branch 'master' into loewy/annotations-return
All checks were successful
Tests / Tests (pull_request) Successful in 8s
2024-10-24 10:53:02 -06:00
39b1808cab Merge pull request 'Create get usernames and followers operation' (#85) from kat/add-get-usernames-following-operation into master
Reviewed-on: #85
2024-10-24 09:19:38 -06:00
a78f9e7b9d return shot gql with an annotation update
All checks were successful
Tests / Tests (pull_request) Successful in 16s
2024-10-23 16:39:16 -07:00
f573026853 Create get usernames and followers operation
All checks were successful
Tests / Tests (pull_request) Successful in 15s
2024-10-23 17:04:25 -06:00
f98c98ecdd Merge pull request 'Add get usernames and following response' (#83) from kat/add-usernames-response into master
Reviewed-on: #83
2024-10-23 16:53:50 -06:00
3f6314aab7 Add get usernames and following response
All checks were successful
Tests / Tests (pull_request) Successful in 9s
2024-10-23 16:53:26 -06:00
3051c155e2 Merge pull request 'Add mutation, logic needs to have better stateful solution' (#82) from loewy/add-annotations-to-operations into master
Reviewed-on: #82
2024-10-22 18:38:25 -06:00
e686be5acd add mutation, logic needs to have better stateful solution
All checks were successful
Tests / Tests (pull_request) Successful in 10s
2024-10-22 16:58:35 -07:00
d49f9b213a Merge pull request 'Add following followers to user model' (#81) from kat/following-followers into master
Reviewed-on: #81
2024-10-22 00:12:59 -06:00
163c6a4e0c Add following followers to user model
All checks were successful
Tests / Tests (pull_request) Successful in 7s
2024-10-21 12:08:42 -06:00
6 changed files with 352 additions and 28 deletions

View File

@@ -1999,11 +1999,13 @@ export type Mutation = {
editProfileImageUri: UserGql;
editUploadStream: Scalars["Boolean"]["output"];
editUser: UserGql;
followUser: UserGql;
getHlsInitUploadLink: GetUploadLinkReturn;
getProfileImageUploadLink: GetProfileUploadLinkReturn;
getUploadLink: GetUploadLinkReturn;
setLoggerLevel: Scalars["Boolean"]["output"];
setSegmentDuration: Scalars["Boolean"]["output"];
unfollowUser: UserGql;
updateShotAnnotations: UpdateShotAnnotationReturn;
};
@@ -2038,6 +2040,10 @@ export type MutationEditUserArgs = {
input: EditUserInputGql;
};
export type MutationFollowUserArgs = {
followedUserId: Scalars["Int"]["input"];
};
export type MutationGetHlsInitUploadLinkArgs = {
videoId: Scalars["Int"]["input"];
};
@@ -2062,6 +2068,10 @@ export type MutationSetSegmentDurationArgs = {
videoId: Scalars["Int"]["input"];
};
export type MutationUnfollowUserArgs = {
followedUserId: Scalars["Int"]["input"];
};
export type MutationUpdateShotAnnotationsArgs = {
annotations: Array<UpdateAnnotationInputGql>;
shotId: Scalars["Int"]["input"];
@@ -2159,6 +2169,7 @@ export type Query = {
getUserTags: Array<TagGql>;
getUserVideos: VideoHistoryGql;
getUsernames: Array<Scalars["String"]["output"]>;
getUsernamesAndFollowing: UsernamesAndFollowingResponse;
getVideo: VideoGql;
getVideoMakePercentageIntervals: Array<MakePercentageIntervalGql>;
getVideos: Array<VideoGql>;
@@ -2228,6 +2239,13 @@ export type QueryGetUsernamesArgs = {
matchString?: InputMaybe<Scalars["String"]["input"]>;
};
export type QueryGetUsernamesAndFollowingArgs = {
after?: InputMaybe<Scalars["String"]["input"]>;
limit?: InputMaybe<Scalars["Int"]["input"]>;
matchString?: InputMaybe<Scalars["String"]["input"]>;
userId: Scalars["Int"]["input"];
};
export type QueryGetVideoArgs = {
debuggingJson?: InputMaybe<Scalars["JSON"]["input"]>;
videoId: Scalars["Int"]["input"];
@@ -2394,15 +2412,6 @@ export type SuccessfulAddAddShotAnnotationErrors =
| AddShotAnnotationErrors
| SuccessfulAdd;
export type SuccessfulUpdate = {
__typename?: "SuccessfulUpdate";
value: Scalars["Boolean"]["output"];
};
export type SuccessfulUpdateUpdateShotAnnotationErrors =
| SuccessfulUpdate
| UpdateShotAnnotationErrors;
export type TagGql = {
__typename?: "TagGQL";
group?: Maybe<Scalars["String"]["output"]>;
@@ -2445,14 +2454,10 @@ export type UpdateAnnotationInputGql = {
notes?: InputMaybe<Scalars["String"]["input"]>;
};
export type UpdateShotAnnotationErrors = {
__typename?: "UpdateShotAnnotationErrors";
error?: Maybe<DoesNotOwnShotErr>;
};
export type UpdateShotAnnotationReturn = {
__typename?: "UpdateShotAnnotationReturn";
value: SuccessfulUpdateUpdateShotAnnotationErrors;
error?: Maybe<DoesNotOwnShotErr>;
shot?: Maybe<ShotGql>;
};
export type UploadLink = {
@@ -2504,6 +2509,8 @@ export type UserGql = {
createdAt?: Maybe<Scalars["DateTime"]["output"]>;
fargoRating?: Maybe<Scalars["Int"]["output"]>;
firebaseUid: Scalars["String"]["output"];
followers?: Maybe<Array<Scalars["Int"]["output"]>>;
following?: Maybe<Array<Scalars["Int"]["output"]>>;
id: Scalars["Int"]["output"];
isAdmin: Scalars["Boolean"]["output"];
profileImageUri?: Maybe<Scalars["String"]["output"]>;
@@ -2516,6 +2523,13 @@ export type UserPlayTimeGql = {
totalSeconds: Scalars["Float"]["output"];
};
export type UsernamesAndFollowingResponse = {
__typename?: "UsernamesAndFollowingResponse";
followers: Array<Scalars["Int"]["output"]>;
following: Array<Scalars["Int"]["output"]>;
usernames: Array<Scalars["String"]["output"]>;
};
export type VideoFilterInput = {
isStreamCompleted?: InputMaybe<Scalars["Boolean"]["input"]>;
requireCursorCompletion?: Scalars["Boolean"]["input"];
@@ -2686,7 +2700,11 @@ export type GetFeedQuery = {
elapsedTime?: number | null;
tableSize: number;
owner?: { __typename?: "UserGQL"; username: string } | null;
stream?: { __typename?: "UploadStreamGQL"; isCompleted: boolean } | null;
stream?: {
__typename?: "UploadStreamGQL";
id: string;
isCompleted: boolean;
} | null;
tags: Array<{
__typename?: "VideoTag";
name: string;
@@ -2747,6 +2765,37 @@ export type GetShotAnnotationTypesQuery = {
}>;
};
export type UpdateShotAnnotationsMutationVariables = Exact<{
shotId: Scalars["Int"]["input"];
annotations: Array<UpdateAnnotationInputGql> | UpdateAnnotationInputGql;
}>;
export type UpdateShotAnnotationsMutation = {
__typename?: "Mutation";
updateShotAnnotations: {
__typename?: "UpdateShotAnnotationReturn";
shot?: {
__typename?: "ShotGQL";
id: number;
annotations: Array<{
__typename?: "ShotAnnotationGQL";
shotId: number;
notes: string;
type: {
__typename?: "ShotAnnotationTypeGQL";
id: number;
name: string;
};
}>;
} | null;
error?: {
__typename?: "DoesNotOwnShotErr";
shotId: number;
msg?: string | null;
} | null;
};
};
export type GetShotsWithVideoGqlQueryVariables = Exact<{
filterInput: FilterInput;
limit?: InputMaybe<Scalars["Int"]["input"]>;
@@ -2822,6 +2871,16 @@ export type GetShotsWithMetadataFilterResultQuery = {
__typename?: "SerializedShotPathsGQL";
b64EncodedBuffer?: string | null;
} | null;
annotations: Array<{
__typename?: "ShotAnnotationGQL";
shotId: number;
notes: string;
type: {
__typename?: "ShotAnnotationTypeGQL";
id: number;
name: string;
};
}>;
}>;
};
};
@@ -2878,6 +2937,16 @@ export type GetShotsWithMetadataQuery = {
__typename?: "SerializedShotPathsGQL";
b64EncodedBuffer?: string | null;
} | null;
annotations: Array<{
__typename?: "ShotAnnotationGQL";
shotId: number;
notes: string;
type: {
__typename?: "ShotAnnotationTypeGQL";
id: number;
name: string;
};
}>;
}>;
};
};
@@ -2927,6 +2996,12 @@ export type GetShotsByIdsQuery = {
__typename?: "SerializedShotPathsGQL";
b64EncodedBuffer?: string | null;
} | null;
annotations: Array<{
__typename?: "ShotAnnotationGQL";
shotId: number;
notes: string;
type: { __typename?: "ShotAnnotationTypeGQL"; id: number; name: string };
}>;
}>;
};
@@ -2969,6 +3044,12 @@ export type ShotWithAllFeaturesFragment = {
__typename?: "SerializedShotPathsGQL";
b64EncodedBuffer?: string | null;
} | null;
annotations: Array<{
__typename?: "ShotAnnotationGQL";
shotId: number;
notes: string;
type: { __typename?: "ShotAnnotationTypeGQL"; id: number; name: string };
}>;
};
export type GetProfileImageUploadLinkMutationVariables = Exact<{
@@ -3053,6 +3134,23 @@ export type GetUsernamesQuery = {
getUsernames: Array<string>;
};
export type GetUsernamesAndFollowingQueryVariables = Exact<{
userId: Scalars["Int"]["input"];
matchString: Scalars["String"]["input"];
limit?: InputMaybe<Scalars["Int"]["input"]>;
after?: InputMaybe<Scalars["String"]["input"]>;
}>;
export type GetUsernamesAndFollowingQuery = {
__typename?: "Query";
getUsernamesAndFollowing: {
__typename?: "UsernamesAndFollowingResponse";
followers: Array<number>;
following: Array<number>;
usernames: Array<string>;
};
};
export type GetUserTagsQueryVariables = Exact<{ [key: string]: never }>;
export type GetUserTagsQuery = {
@@ -3101,6 +3199,7 @@ export type GetStreamMonitoringDetailsQuery = {
} | null;
stream?: {
__typename?: "UploadStreamGQL";
id: string;
linksRequested: number;
uploadsCompleted: number;
segmentProcessingCursor: number;
@@ -3314,6 +3413,7 @@ export type GetVideoQuery = {
}>;
stream?: {
__typename?: "UploadStreamGQL";
id: string;
streamSegmentType: StreamSegmentTypeEnum;
segments: Array<{
__typename?: "UploadSegmentGQL";
@@ -3696,6 +3796,14 @@ export const ShotWithAllFeaturesFragmentDoc = gql`
serializedShotPaths {
b64EncodedBuffer
}
annotations {
shotId
type {
id
name
}
notes
}
}
`;
export const VideoStreamMetadataFragmentDoc = gql`
@@ -3949,6 +4057,7 @@ export const GetFeedDocument = gql`
elapsedTime
screenshotUri
stream {
id
isCompleted
}
tableSize
@@ -4260,6 +4369,74 @@ export type GetShotAnnotationTypesQueryResult = Apollo.QueryResult<
GetShotAnnotationTypesQuery,
GetShotAnnotationTypesQueryVariables
>;
export const UpdateShotAnnotationsDocument = gql`
mutation UpdateShotAnnotations(
$shotId: Int!
$annotations: [UpdateAnnotationInputGQL!]!
) {
updateShotAnnotations(shotId: $shotId, annotations: $annotations) {
shot {
id
annotations {
shotId
type {
id
name
}
notes
}
}
error {
shotId
msg
}
}
}
`;
export type UpdateShotAnnotationsMutationFn = Apollo.MutationFunction<
UpdateShotAnnotationsMutation,
UpdateShotAnnotationsMutationVariables
>;
/**
* __useUpdateShotAnnotationsMutation__
*
* To run a mutation, you first call `useUpdateShotAnnotationsMutation` within a React component and pass it any options that fit your needs.
* When your component renders, `useUpdateShotAnnotationsMutation` returns a tuple that includes:
* - A mutate function that you can call at any time to execute the mutation
* - An object with fields that represent the current status of the mutation's execution
*
* @param baseOptions options that will be passed into the mutation, supported options are listed on: https://www.apollographql.com/docs/react/api/react-hooks/#options-2;
*
* @example
* const [updateShotAnnotationsMutation, { data, loading, error }] = useUpdateShotAnnotationsMutation({
* variables: {
* shotId: // value for 'shotId'
* annotations: // value for 'annotations'
* },
* });
*/
export function useUpdateShotAnnotationsMutation(
baseOptions?: Apollo.MutationHookOptions<
UpdateShotAnnotationsMutation,
UpdateShotAnnotationsMutationVariables
>,
) {
const options = { ...defaultOptions, ...baseOptions };
return Apollo.useMutation<
UpdateShotAnnotationsMutation,
UpdateShotAnnotationsMutationVariables
>(UpdateShotAnnotationsDocument, options);
}
export type UpdateShotAnnotationsMutationHookResult = ReturnType<
typeof useUpdateShotAnnotationsMutation
>;
export type UpdateShotAnnotationsMutationResult =
Apollo.MutationResult<UpdateShotAnnotationsMutation>;
export type UpdateShotAnnotationsMutationOptions = Apollo.BaseMutationOptions<
UpdateShotAnnotationsMutation,
UpdateShotAnnotationsMutationVariables
>;
export const GetShotsWithVideoGqlDocument = gql`
query GetShotsWithVideoGql($filterInput: FilterInput!, $limit: Int) {
getShotsWithMetadata(filterInput: $filterInput, limit: $limit) {
@@ -4947,6 +5124,94 @@ export type GetUsernamesQueryResult = Apollo.QueryResult<
GetUsernamesQuery,
GetUsernamesQueryVariables
>;
export const GetUsernamesAndFollowingDocument = gql`
query getUsernamesAndFollowing(
$userId: Int!
$matchString: String!
$limit: Int = null
$after: String = null
) {
getUsernamesAndFollowing(
userId: $userId
matchString: $matchString
limit: $limit
after: $after
) {
followers
following
usernames
}
}
`;
/**
* __useGetUsernamesAndFollowingQuery__
*
* To run a query within a React component, call `useGetUsernamesAndFollowingQuery` and pass it any options that fit your needs.
* When your component renders, `useGetUsernamesAndFollowingQuery` 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 } = useGetUsernamesAndFollowingQuery({
* variables: {
* userId: // value for 'userId'
* matchString: // value for 'matchString'
* limit: // value for 'limit'
* after: // value for 'after'
* },
* });
*/
export function useGetUsernamesAndFollowingQuery(
baseOptions: Apollo.QueryHookOptions<
GetUsernamesAndFollowingQuery,
GetUsernamesAndFollowingQueryVariables
>,
) {
const options = { ...defaultOptions, ...baseOptions };
return Apollo.useQuery<
GetUsernamesAndFollowingQuery,
GetUsernamesAndFollowingQueryVariables
>(GetUsernamesAndFollowingDocument, options);
}
export function useGetUsernamesAndFollowingLazyQuery(
baseOptions?: Apollo.LazyQueryHookOptions<
GetUsernamesAndFollowingQuery,
GetUsernamesAndFollowingQueryVariables
>,
) {
const options = { ...defaultOptions, ...baseOptions };
return Apollo.useLazyQuery<
GetUsernamesAndFollowingQuery,
GetUsernamesAndFollowingQueryVariables
>(GetUsernamesAndFollowingDocument, options);
}
export function useGetUsernamesAndFollowingSuspenseQuery(
baseOptions?: Apollo.SuspenseQueryHookOptions<
GetUsernamesAndFollowingQuery,
GetUsernamesAndFollowingQueryVariables
>,
) {
const options = { ...defaultOptions, ...baseOptions };
return Apollo.useSuspenseQuery<
GetUsernamesAndFollowingQuery,
GetUsernamesAndFollowingQueryVariables
>(GetUsernamesAndFollowingDocument, options);
}
export type GetUsernamesAndFollowingQueryHookResult = ReturnType<
typeof useGetUsernamesAndFollowingQuery
>;
export type GetUsernamesAndFollowingLazyQueryHookResult = ReturnType<
typeof useGetUsernamesAndFollowingLazyQuery
>;
export type GetUsernamesAndFollowingSuspenseQueryHookResult = ReturnType<
typeof useGetUsernamesAndFollowingSuspenseQuery
>;
export type GetUsernamesAndFollowingQueryResult = Apollo.QueryResult<
GetUsernamesAndFollowingQuery,
GetUsernamesAndFollowingQueryVariables
>;
export const GetUserTagsDocument = gql`
query GetUserTags {
getUserTags {
@@ -5066,6 +5331,7 @@ export const GetStreamMonitoringDetailsDocument = gql`
}
}
stream {
id
linksRequested
uploadsCompleted
segmentProcessingCursor
@@ -5573,6 +5839,7 @@ export const GetVideoDocument = gql`
}
}
stream {
id
streamSegmentType
segments {
segmentIndex

View File

@@ -21,6 +21,7 @@ query GetFeed(
elapsedTime
screenshotUri
stream {
id
isCompleted
}
tableSize

View File

@@ -17,6 +17,29 @@ query GetShotAnnotationTypes {
}
}
mutation UpdateShotAnnotations(
$shotId: Int!
$annotations: [UpdateAnnotationInputGQL!]!
) {
updateShotAnnotations(shotId: $shotId, annotations: $annotations) {
shot {
id
annotations {
shotId
type {
id
name
}
notes
}
}
error {
shotId
msg
}
}
}
query GetShotsWithVideoGql($filterInput: FilterInput!, $limit: Int) {
getShotsWithMetadata(filterInput: $filterInput, limit: $limit) {
ids
@@ -115,4 +138,12 @@ fragment ShotWithAllFeatures on ShotGQL {
serializedShotPaths {
b64EncodedBuffer
}
annotations {
shotId
type {
id
name
}
notes
}
}

View File

@@ -57,6 +57,24 @@ query getUsernames(
getUsernames(matchString: $matchString, limit: $limit, after: $after)
}
query getUsernamesAndFollowing(
$userId: Int!
$matchString: String!
$limit: Int = null
$after: String = null
) {
getUsernamesAndFollowing(
userId: $userId
matchString: $matchString
limit: $limit
after: $after
) {
followers
following
usernamesAndIds
}
}
query GetUserTags {
getUserTags {
id

View File

@@ -45,6 +45,7 @@ query GetStreamMonitoringDetails($videoId: Int!, $debuggingJson: JSON) {
}
}
stream {
id
linksRequested
uploadsCompleted
segmentProcessingCursor
@@ -194,6 +195,7 @@ query GetVideo($videoId: Int!) {
}
}
stream {
id
streamSegmentType
segments {
segmentIndex

View File

@@ -35,6 +35,12 @@ type Query {
limit: Int = null
after: String = null
): [String!]!
getUsernamesAndFollowing(
userId: Int!
matchString: String = null
limit: Int = 100
after: String = null
): UsernamesAndFollowingResponse!
getPlayTime(userId: Int!): UserPlayTimeGQL!
getUserVideos(
userId: Int = null
@@ -343,6 +349,8 @@ type UserGQL {
profileImageUri: String
createdAt: DateTime
updatedAt: DateTime
following: [Int!]
followers: [Int!]
}
type ShotAnnotationGQL {
@@ -546,6 +554,12 @@ input CreatedAfter @oneOf {
createdAt: DateTime
}
type UsernamesAndFollowingResponse {
usernames: [String!]!
following: [Int!]!
followers: [Int!]!
}
type UserPlayTimeGQL {
totalSeconds: Float!
}
@@ -596,6 +610,8 @@ type Mutation {
): GetProfileUploadLinkReturn!
editProfileImageUri(profileImageUri: String!): UserGQL!
editUser(input: EditUserInputGQL!): UserGQL!
followUser(followedUserId: Int!): UserGQL!
unfollowUser(followedUserId: Int!): UserGQL!
createUploadStream(
videoMetadata: VideoMetadataInput!
): CreateUploadStreamReturn!
@@ -646,18 +662,7 @@ type OtherErrorNeedsNote {
}
type UpdateShotAnnotationReturn {
value: SuccessfulUpdateUpdateShotAnnotationErrors!
}
union SuccessfulUpdateUpdateShotAnnotationErrors =
SuccessfulUpdate
| UpdateShotAnnotationErrors
type SuccessfulUpdate {
value: Boolean!
}
type UpdateShotAnnotationErrors {
shot: ShotGQL
error: DoesNotOwnShotErr
}