From c56d66f1a564ef443063273c0b2c8e072bf085a8 Mon Sep 17 00:00:00 2001 From: Viet Nguyen <3805254+vnugent@users.noreply.github.com> Date: Thu, 28 Nov 2024 10:02:02 -0800 Subject: [PATCH] chore: upgrade node chore: remove dead code --- src/graphql/posts/PostResolvers.ts | 5 --- src/graphql/posts/index.ts | 5 --- src/graphql/posts/mutations.ts | 63 --------------------------- src/graphql/posts/queries.ts | 13 ------ src/graphql/resolvers.ts | 13 ------ src/graphql/schema/Post.gql | 45 ------------------- src/graphql/schema/XMedia.gql | 45 ------------------- src/graphql/xmedia/XMediaResolvers.ts | 3 -- src/graphql/xmedia/index.ts | 5 --- src/graphql/xmedia/mutations.ts | 38 ---------------- src/graphql/xmedia/queries.ts | 13 ------ 11 files changed, 248 deletions(-) delete mode 100644 src/graphql/posts/PostResolvers.ts delete mode 100644 src/graphql/posts/index.ts delete mode 100644 src/graphql/posts/mutations.ts delete mode 100644 src/graphql/posts/queries.ts delete mode 100644 src/graphql/schema/Post.gql delete mode 100644 src/graphql/schema/XMedia.gql delete mode 100644 src/graphql/xmedia/XMediaResolvers.ts delete mode 100644 src/graphql/xmedia/index.ts delete mode 100644 src/graphql/xmedia/mutations.ts delete mode 100644 src/graphql/xmedia/queries.ts diff --git a/src/graphql/posts/PostResolvers.ts b/src/graphql/posts/PostResolvers.ts deleted file mode 100644 index 1118838e..00000000 --- a/src/graphql/posts/PostResolvers.ts +++ /dev/null @@ -1,5 +0,0 @@ -const PostResolvers = { - // GetPostsByAuthor -} - -export default PostResolvers diff --git a/src/graphql/posts/index.ts b/src/graphql/posts/index.ts deleted file mode 100644 index 9b4aee96..00000000 --- a/src/graphql/posts/index.ts +++ /dev/null @@ -1,5 +0,0 @@ -import PostQueries from './queries.js' -import PostMutations from './mutations.js' -import PostResolvers from './PostResolvers.js' - -export { PostQueries, PostMutations, PostResolvers } diff --git a/src/graphql/posts/mutations.ts b/src/graphql/posts/mutations.ts deleted file mode 100644 index 9025cd6e..00000000 --- a/src/graphql/posts/mutations.ts +++ /dev/null @@ -1,63 +0,0 @@ -import { AddPostInputType, RemovePostInputType } from '../../db/PostTypes' -import { getPostModel } from '../../db/PostSchema.js' -import { GQLContext } from '../../types' -import muid from 'uuid-mongodb' -import { XMediaType } from '../../db/XMediaTypes' - -const PostMutations = { - // addPost - addPost: async ( - _: any, - { input }: { input: AddPostInputType }, - { dataSources }: GQLContext - ) => { - const { xmedia, post } = dataSources - const { userId, description, photoUrls }: AddPostInputType = input - const userMMUID = muid.from(userId) - // Create new XMedia documents - const xMedia: XMediaType[] = [] - for (const photoUrl of photoUrls) { - try { - const newXMedia = await xmedia.addXMedia({ - userId: userMMUID, - mediaType: 0, // TODO: Get mediaType from input. For now only accept mediaType=0 (photos) - mediaUrl: photoUrl - }) - - if (newXMedia == null) { - console.error(`Failed to add xMedia for photoURL ${photoUrl}`) - } else { - xMedia.push(newXMedia) - } - } catch (ex) { - console.error('Error adding XMedia in addPost method: ', ex) - } - } - - // Create new Post - try { - const newPost = await post.addPost({ - userId: userMMUID, - xMedia, - description - }) - return { - userId: newPost?.userId, - xMedia: newPost?.xMedia, - description: newPost?.description - } - } catch (ex) { - console.error('Error adding new Post', ex) - return ex - } - }, - - // removePost - removePost: async (_: any, { input }: { input: RemovePostInputType }) => { - const PostModel = getPostModel() - const res = await PostModel.deleteOne({ _id: input.postId }) - return { numDeleted: res.deletedCount } - } -} - -export default PostMutations diff --git a/src/graphql/posts/queries.ts b/src/graphql/posts/queries.ts deleted file mode 100644 index 9f70e174..00000000 --- a/src/graphql/posts/queries.ts +++ /dev/null @@ -1,13 +0,0 @@ -import { getPostModel } from '../../db/PostSchema.js' -import { GetPostsInputType } from '../../db/PostTypes' - -const PostQueries = { - // Given a list of postIDs, return a list of post documents. - getPosts: async (_, { input }: { input: GetPostsInputType }) => { - const PostModel = getPostModel() - const posts = await PostModel.find({ _id: { $in: input.postIds } }) - return { posts } - } -} - -export default PostQueries diff --git a/src/graphql/resolvers.ts b/src/graphql/resolvers.ts index d397cb14..45999ffd 100644 --- a/src/graphql/resolvers.ts +++ b/src/graphql/resolvers.ts @@ -12,8 +12,6 @@ import { AreaType, CountByDisciplineType } from '../db/AreaTypes.js' import { ClimbGQLQueryType, ClimbType } from '../db/ClimbTypes.js' import AreaDataSource from '../model/AreaDataSource.js' import { MediaMutations, MediaQueries, MediaResolvers } from './media/index.js' -import { PostMutations, PostQueries, PostResolvers } from './posts/index.js' -import { XMediaMutations, XMediaQueries, XMediaResolvers } from './xmedia/index.js' import { AreaMutations, AreaQueries } from './area/index.js' import { ClimbMutations } from './climb/index.js' import { OrganizationMutations, OrganizationQueries } from './organization/index.js' @@ -42,16 +40,11 @@ const HistoryTypeDef = loadSchema('History.gql') const AreaEditTypeDef = loadSchema('AreaEdit.gql') const OrganizationEditTypeDef = loadSchema('OrganizationEdit.gql') const ClimbMutationTypeDefs = loadSchema('ClimbEdit.gql') -const PostTypeDef = loadSchema('Post.gql') - -const XMediaTypeDef = loadSchema('XMedia.gql') const TagTypeDef = loadSchema('Tag.gql') const UserTypeDef = loadSchema('User.gql') const resolvers = { Mutation: { - ...XMediaMutations, - ...PostMutations, ...MediaMutations, ...AreaMutations, ...ClimbMutations, @@ -60,8 +53,6 @@ const resolvers = { ...UserMutations }, Query: { - ...XMediaQueries, - ...PostQueries, ...MediaQueries, ...AreaQueries, ...TickQueries, @@ -126,8 +117,6 @@ const resolvers = { ...CommonResolvers, ...MediaResolvers, ...HistoryFieldResolvers, - ...PostResolvers, - ...XMediaResolvers, ...UserResolvers, JSONObject: GraphQLJSONObject, @@ -301,8 +290,6 @@ export const graphqlSchema = makeExecutableSchema({ TickTypeDef, HistoryTypeDef, ClimbMutationTypeDefs, - PostTypeDef, - XMediaTypeDef, TagTypeDef, UserTypeDef ], diff --git a/src/graphql/schema/Post.gql b/src/graphql/schema/Post.gql deleted file mode 100644 index 717817e9..00000000 --- a/src/graphql/schema/Post.gql +++ /dev/null @@ -1,45 +0,0 @@ -type Mutation { - addPost(input: AddPostInput): Post - removePost(input: RemovePostInput): RemovePostResponse -} - -type Query { - getPosts(input: GetPostsInput): GetPostsResponse -} - -"Input params for getting posts by ID" -input GetPostsInput { - postIds: [ID]! -} - -"Input params for creating a new post" -input AddPostInput { - userId: ID! - photoUrls: [String]! - description: String -} - -type AddPostResponse { - postId: String -} - -"Input params for removing an existing post" -input RemovePostInput { - postId: ID! -} - -type RemovePostResponse { - numDeleted: String -} - -type GetPostsResponse { - posts: [Post] -} - -"Posts are created by users. They are displayed on the posts page." -type Post { - _id: ID - userId: ID! - xMedia: [XMedia]! - description: String -} diff --git a/src/graphql/schema/XMedia.gql b/src/graphql/schema/XMedia.gql deleted file mode 100644 index 05250e95..00000000 --- a/src/graphql/schema/XMedia.gql +++ /dev/null @@ -1,45 +0,0 @@ -# XMedia stands for extendend media. It should support photos, links, videos, etc. -# It is used to link media to the Post documents. - -type Mutation { - addXMedia(input: AddXMediaInput): XMedia - removeXMedia(input: RemoveXMediaInput): RemoveXMediaResponse -} - -type Query { - # getXMedia - getXMedia(input: GetXMediaInput): GetXMediaResponse -} - -"Input for adding a new media input. mediaType - 0: photo" -input AddXMediaInput { - userId: ID! - mediaType: Int! - mediaUrl: String! - tagIds: [ID] -} - -input RemoveXMediaInput { - xMediaId: ID! -} - -type RemoveXMediaResponse { - numDeleted: String -} - -input GetXMediaInput { - xMediaIds: [ID]! -} - -type GetXMediaResponse { - xMedia: [XMedia] -} - -"XMedia is created as a result of a new Post. They are a child of Post documents." -type XMedia { - _id: ID - userId: ID! - mediaType: Int! - mediaUrl: String! - tagIds: [ID] -} diff --git a/src/graphql/xmedia/XMediaResolvers.ts b/src/graphql/xmedia/XMediaResolvers.ts deleted file mode 100644 index 827aa6d4..00000000 --- a/src/graphql/xmedia/XMediaResolvers.ts +++ /dev/null @@ -1,3 +0,0 @@ -const XMediaResolvers = {} - -export default XMediaResolvers diff --git a/src/graphql/xmedia/index.ts b/src/graphql/xmedia/index.ts deleted file mode 100644 index 5fbf9429..00000000 --- a/src/graphql/xmedia/index.ts +++ /dev/null @@ -1,5 +0,0 @@ -import XMediaQueries from './queries.js' -import XMediaMutations from './mutations.js' -import XMediaResolvers from './XMediaResolvers.js' - -export { XMediaQueries, XMediaMutations, XMediaResolvers } diff --git a/src/graphql/xmedia/mutations.ts b/src/graphql/xmedia/mutations.ts deleted file mode 100644 index fc121417..00000000 --- a/src/graphql/xmedia/mutations.ts +++ /dev/null @@ -1,38 +0,0 @@ -import { XMediaType, RemoveXMediaInputType } from '../../db/XMediaTypes' -import { getXMediaModel } from '../../db/XMediaSchema.js' -import { GQLContext } from '../../types' - -const XMediaMutations = { - // addXMedia - addXMedia: async ( - _: any, - { input }: { input: XMediaType }, - { dataSources }: GQLContext - ) => { - const { xmedia } = dataSources - - try { - const newXMedia = await xmedia.addXMedia({ - userId: input.userId, - mediaType: input.mediaType, - mediaUrl: input.mediaUrl - }) - if (newXMedia == null) { - console.error(`Failed to add xMedia with url: ${input.mediaUrl}`) - } - return { xMediaId: newXMedia } - } catch (ex) { - console.error('Error adding new Post', ex) - return ex - } - }, - - // removeXMedia - removeXMedia: async (_: any, { input }: { input: RemoveXMediaInputType }) => { - const XMediaModel = getXMediaModel() - const res = await XMediaModel.deleteOne({ _id: input.xMediaId }) - return { numDeleted: res.deletedCount } - } -} - -export default XMediaMutations diff --git a/src/graphql/xmedia/queries.ts b/src/graphql/xmedia/queries.ts deleted file mode 100644 index ac9bcdf6..00000000 --- a/src/graphql/xmedia/queries.ts +++ /dev/null @@ -1,13 +0,0 @@ -import { getXMediaModel } from '../../db/XMediaSchema.js' -import { GetXMediaInputType } from '../../db/XMediaTypes.js' - -const XMediaQueries = { - // Given a list of xMediaIds, return a list of xMedia documents. - getXMedia: async (_, { input }: { input: GetXMediaInputType }) => { - const xMediaModel = getXMediaModel() - const xMedia = await xMediaModel.find({ _id: { $in: input.xMediaIds } }).lean() - return { xMedia } - } -} - -export default XMediaQueries