diff --git a/src/controllers/likes/beer-style-likes/index.ts b/src/controllers/likes/beer-style-likes/index.ts index f8f75dc..fd2499d 100644 --- a/src/controllers/likes/beer-style-likes/index.ts +++ b/src/controllers/likes/beer-style-likes/index.ts @@ -1,6 +1,5 @@ import ServerError from '@/config/util/ServerError'; -import getBeerStyleById from '@/services/posts/beer-style-post/getBeerStyleById'; import APIResponseValidationSchema from '@/validation/APIResponseValidationSchema'; import { NextApiResponse, NextApiRequest } from 'next'; import { z } from 'zod'; @@ -11,6 +10,7 @@ import { getBeerStyleLikeCountService, removeBeerStyleLikeService, } from '@/services/likes/beer-style-like'; +import { getBeerStyleByIdService } from '@/services/posts/beer-style-post'; import { LikeRequest } from '../types'; export const sendBeerStyleLikeRequest = async ( @@ -20,7 +20,7 @@ export const sendBeerStyleLikeRequest = async ( const user = req.user!; const { id } = req.query; - const beerStyle = await getBeerStyleById(id); + const beerStyle = await getBeerStyleByIdService({ beerStyleId: id }); if (!beerStyle) { throw new ServerError('Could not find a beer style with that id.', 404); } diff --git a/src/controllers/posts/beer-posts/index.ts b/src/controllers/posts/beer-posts/index.ts index 44ff03b..76cacf7 100644 --- a/src/controllers/posts/beer-posts/index.ts +++ b/src/controllers/posts/beer-posts/index.ts @@ -1,5 +1,17 @@ import ServerError from '@/config/util/ServerError'; +import APIResponseValidationSchema from '@/validation/APIResponseValidationSchema'; +import { NextApiResponse } from 'next'; +import { NextHandler } from 'next-connect'; +import { z } from 'zod'; +import { GetAllPostsByConnectedPostId } from '@/controllers/posts/types'; +import { + BeerPostRequest, + CreateBeerPostRequest, + EditBeerPostRequest, + GetAllBeerPostsRequest, + GetBeerRecommendationsRequest, +} from '@/controllers/posts/beer-posts/types'; import { getBeerPostById, editBeerPostByIdService, @@ -9,18 +21,6 @@ import { createNewBeerPost, getBeerPostsByPostedByIdService, } from '@/services/posts/beer-post'; -import APIResponseValidationSchema from '@/validation/APIResponseValidationSchema'; -import { NextApiResponse } from 'next'; -import { NextHandler } from 'next-connect'; -import { z } from 'zod'; -import { - BeerPostRequest, - CreateBeerPostRequest, - EditBeerPostRequest, - GetAllBeerPostsRequest, - GetBeerRecommendationsRequest, -} from './types'; -import { GetAllPostsByConnectedPostId } from '../types'; export const checkIfBeerPostOwner = async ( req: BeerPostRequestType, diff --git a/src/controllers/posts/beer-styles/index.ts b/src/controllers/posts/beer-styles/index.ts index 657b3dc..e5676a1 100644 --- a/src/controllers/posts/beer-styles/index.ts +++ b/src/controllers/posts/beer-styles/index.ts @@ -1,16 +1,16 @@ import { NextApiResponse } from 'next'; import { z } from 'zod'; -import DBClient from '@/prisma/DBClient'; import APIResponseValidationSchema from '@/validation/APIResponseValidationSchema'; -import getBeerStyleById from '@/services/posts/beer-style-post/getBeerStyleById'; -import getAllBeerStyles from '@/services/posts/beer-style-post/getAllBeerStyles'; - -import ServerError from '@/config/util/ServerError'; - import { getBeerPostsByBeerStyleIdService } from '@/services/posts/beer-post'; +import { + createBeerStyleService, + getAllBeerStylesService, + getBeerStyleByIdService, +} from '@/services/posts/beer-style-post'; + import { CreateBeerStyleRequest, GetBeerStyleByIdRequest } from './types'; import { GetAllPostsByConnectedPostId, GetAllPostsRequest } from '../types'; @@ -20,7 +20,9 @@ export const getBeerStyle = async ( ) => { const { id } = req.query; - const beerStyle = await getBeerStyleById(id); + const beerStyle = await getBeerStyleByIdService({ + beerStyleId: id, + }); res.status(200).json({ message: 'Beer style retrieved successfully.', @@ -37,20 +39,18 @@ export const getAllBeersByBeerStyle = async ( // eslint-disable-next-line @typescript-eslint/naming-convention const { page_size, page_num, id } = req.query; - const beers = await getBeerPostsByBeerStyleIdService({ + const { beerPosts, count } = await getBeerPostsByBeerStyleIdService({ pageNum: parseInt(page_num, 10), pageSize: parseInt(page_size, 10), styleId: id, }); - const count = await DBClient.instance.beerPost.count({ where: { styleId: id } }); - res.setHeader('X-Total-Count', count); res.status(200).json({ message: `Beers with style id ${id} retrieved successfully.`, statusCode: 200, - payload: beers, + payload: beerPosts, success: true, }); }; @@ -62,8 +62,10 @@ export const getBeerStyles = async ( const pageNum = parseInt(req.query.page_num, 10); const pageSize = parseInt(req.query.page_size, 10); - const beerStyles = await getAllBeerStyles({ pageNum, pageSize }); - const beerStyleCount = await DBClient.instance.beerStyle.count(); + const { beerStyles, beerStyleCount } = await getAllBeerStylesService({ + pageNum, + pageSize, + }); res.setHeader('X-Total-Count', beerStyleCount); @@ -83,23 +85,14 @@ export const createBeerStyle = async ( const user = req.user!; - const glassware = await DBClient.instance.glassware.findUnique({ - where: { id: glasswareId }, - select: { id: true }, - }); - - if (!glassware) { - throw new ServerError('Glassware not found.', 404); - } - - const beerStyle = await DBClient.instance.beerStyle.create({ - data: { + const beerStyle = await createBeerStyleService({ + glasswareId, + postedById: user.id, + body: { abvRange, description, - glassware: { connect: { id: glasswareId } }, ibuRange, name, - postedBy: { connect: { id: user.id } }, }, }); diff --git a/src/controllers/posts/breweries/index.ts b/src/controllers/posts/breweries/index.ts index 67fbd97..658cb50 100644 --- a/src/controllers/posts/breweries/index.ts +++ b/src/controllers/posts/breweries/index.ts @@ -1,15 +1,27 @@ -import DBClient from '@/prisma/DBClient'; -import getAllBreweryPostsByPostedById from '@/services/posts/brewery-post/getAllBreweryPostsByPostedById'; import APIResponseValidationSchema from '@/validation/APIResponseValidationSchema'; import { NextApiResponse } from 'next'; import { z } from 'zod'; -import getAllBreweryPosts from '@/services/posts/brewery-post/getAllBreweryPosts'; -import createNewBreweryPost from '@/services/posts/brewery-post/createNewBreweryPost'; + import geocode from '@/config/mapbox/geocoder'; import ServerError from '@/config/util/ServerError'; -import BreweryPostMapQueryResult from '@/services/posts/brewery-post/schema/BreweryPostMapQueryResult'; -import BeerPostQueryResult from '@/services/posts/beer-post/schema/BeerPostQueryResult'; -import { CreateBreweryPostRequest, GetBreweryPostsRequest } from './types'; + +import { + getAllBreweryPostsByPostedByIdService, + getAllBreweryPostsService, + createNewBreweryPostService, + createBreweryPostLocationService, + getMapBreweryPostsService, + getBreweryPostByIdService, +} from '@/services/posts/brewery-post'; +import { getBeerPostsByBreweryIdService } from '@/services/posts/beer-post'; +import { NextHandler } from 'next-connect'; +import DBClient from '@/prisma/DBClient'; +import { + BreweryPostRequest, + CreateBreweryPostRequest, + EditBreweryPostRequest, + GetBreweryPostsRequest, +} from './types'; import { GetAllPostsByConnectedPostId } from '../types'; export const getBreweryPostsByUserId = async ( @@ -21,17 +33,13 @@ export const getBreweryPostsByUserId = async ( const { id } = req.query; - const breweryPosts = await getAllBreweryPostsByPostedById({ + const { breweryPosts, count } = await getAllBreweryPostsByPostedByIdService({ pageNum, pageSize, postedById: id, }); - const breweryPostCount = await DBClient.instance.breweryPost.count({ - where: { postedBy: { id } }, - }); - - res.setHeader('X-Total-Count', breweryPostCount); + res.setHeader('X-Total-Count', count); res.status(200).json({ message: `Brewery posts by user ${id} fetched successfully`, @@ -48,10 +56,9 @@ export const getBreweryPosts = async ( const pageNum = parseInt(req.query.page_num, 10); const pageSize = parseInt(req.query.page_size, 10); - const breweryPosts = await getAllBreweryPosts({ pageNum, pageSize }); - const breweryPostCount = await DBClient.instance.breweryPost.count(); + const { breweryPosts, count } = await getAllBreweryPostsService({ pageNum, pageSize }); - res.setHeader('X-Total-Count', breweryPostCount); + res.setHeader('X-Total-Count', count); res.status(200).json({ message: 'Brewery posts retrieved successfully', statusCode: 200, @@ -77,19 +84,18 @@ export const createBreweryPost = async ( const [latitude, longitude] = geocoded.center; - const location = await DBClient.instance.breweryLocation.create({ - data: { + const location = await createBreweryPostLocationService({ + body: { address, city, country, stateOrProvince: region, coordinates: [latitude, longitude], - postedBy: { connect: { id: userId } }, }, - select: { id: true }, + postedById: userId, }); - const newBreweryPost = await createNewBreweryPost({ + const newBreweryPost = await createNewBreweryPostService({ name, description, locationId: location.id, @@ -112,24 +118,12 @@ export const getMapBreweryPosts = async ( const pageNum = parseInt(req.query.page_num, 10); const pageSize = parseInt(req.query.page_size, 10); - const skip = (pageNum - 1) * pageSize; - const take = pageSize; + const { breweryPosts, count } = await getMapBreweryPostsService({ + pageNum, + pageSize, + }); - const breweryPosts: z.infer[] = - await DBClient.instance.breweryPost.findMany({ - select: { - location: { - select: { coordinates: true, city: true, country: true, stateOrProvince: true }, - }, - id: true, - name: true, - }, - skip, - take, - }); - const breweryPostCount = await DBClient.instance.breweryPost.count(); - - res.setHeader('X-Total-Count', breweryPostCount); + res.setHeader('X-Total-Count', count); res.status(200).json({ message: 'Brewery posts retrieved successfully', @@ -149,37 +143,10 @@ export const getAllBeersByBrewery = async ( const pageNum = parseInt(page_num, 10); const pageSize = parseInt(page_size, 10); - const beers: z.infer[] = - await DBClient.instance.beerPost.findMany({ - where: { breweryId: id }, - skip: (pageNum - 1) * pageSize, - take: pageSize, - select: { - id: true, - name: true, - ibu: true, - abv: true, - createdAt: true, - updatedAt: true, - description: true, - postedBy: { select: { username: true, id: true } }, - brewery: { select: { name: true, id: true } }, - style: { select: { name: true, id: true, description: true } }, - beerImages: { - select: { - alt: true, - path: true, - caption: true, - id: true, - createdAt: true, - updatedAt: true, - }, - }, - }, - }); - - const count = await DBClient.instance.beerPost.count({ - where: { breweryId: id }, + const { beerPosts, count } = await getBeerPostsByBreweryIdService({ + pageNum, + pageSize, + breweryId: id, }); res.setHeader('X-Total-Count', count); @@ -187,7 +154,69 @@ export const getAllBeersByBrewery = async ( res.status(200).json({ message: 'Beers fetched successfully', statusCode: 200, - payload: beers, + payload: beerPosts, success: true, }); }; + +export const checkIfBreweryPostOwner = async ( + req: BreweryPostRequest, + res: NextApiResponse, + next: NextHandler, +) => { + const user = req.user!; + const { id } = req.query; + + const breweryPost = await getBreweryPostByIdService({ breweryPostId: id }); + if (!breweryPost) { + throw new ServerError('Brewery post not found', 404); + } + + if (breweryPost.postedBy.id !== user.id) { + throw new ServerError('You are not the owner of this brewery post', 403); + } + + return next(); +}; + +export const editBreweryPost = async ( + req: EditBreweryPostRequest, + res: NextApiResponse>, +) => { + const { + body, + query: { id }, + } = req; + + await DBClient.instance.breweryPost.update({ + where: { id }, + data: body, + }); + + res.status(200).json({ + message: 'Brewery post updated successfully', + success: true, + statusCode: 200, + }); +}; + +export const deleteBreweryPost = async ( + req: BreweryPostRequest, + res: NextApiResponse, +) => { + const { + query: { id }, + } = req; + + const deleted = await DBClient.instance.breweryPost.delete({ where: { id } }); + + if (!deleted) { + throw new ServerError('Brewery post not found', 404); + } + + res.status(200).json({ + message: 'Brewery post deleted successfully', + success: true, + statusCode: 200, + }); +}; diff --git a/src/controllers/posts/breweries/types/index.ts b/src/controllers/posts/breweries/types/index.ts index f20425f..85dd30a 100644 --- a/src/controllers/posts/breweries/types/index.ts +++ b/src/controllers/posts/breweries/types/index.ts @@ -1,5 +1,6 @@ import { UserExtendedNextApiRequest } from '@/config/auth/types'; import CreateBreweryPostSchema from '@/services/posts/brewery-post/schema/CreateBreweryPostSchema'; +import EditBreweryPostValidationSchema from '@/services/posts/brewery-post/schema/EditBreweryPostValidationSchema'; import PaginatedQueryResponseSchema from '@/services/schema/PaginatedQueryResponseSchema'; import { NextApiRequest } from 'next'; import { z } from 'zod'; @@ -11,3 +12,11 @@ export interface GetBreweryPostsRequest extends NextApiRequest { export interface CreateBreweryPostRequest extends UserExtendedNextApiRequest { body: z.infer; } + +export interface BreweryPostRequest extends UserExtendedNextApiRequest { + query: { id: string }; +} + +export interface EditBreweryPostRequest extends BreweryPostRequest { + body: z.infer; +} diff --git a/src/pages/api/breweries/[id]/index.ts b/src/pages/api/breweries/[id]/index.ts index 8366698..f71a7a5 100644 --- a/src/pages/api/breweries/[id]/index.ts +++ b/src/pages/api/breweries/[id]/index.ts @@ -1,81 +1,17 @@ import getCurrentUser from '@/config/nextConnect/middleware/getCurrentUser'; -import { UserExtendedNextApiRequest } from '@/config/auth/types'; import NextConnectOptions from '@/config/nextConnect/NextConnectOptions'; import APIResponseValidationSchema from '@/validation/APIResponseValidationSchema'; import { NextApiResponse } from 'next'; -import { createRouter, NextHandler } from 'next-connect'; +import { createRouter } from 'next-connect'; import { z } from 'zod'; -import ServerError from '@/config/util/ServerError'; -import DBClient from '@/prisma/DBClient'; -import getBreweryPostById from '@/services/posts/brewery-post/getBreweryPostById'; -import EditBreweryPostValidationSchema from '@/services/posts/brewery-post/schema/EditBreweryPostValidationSchema'; -interface BreweryPostRequest extends UserExtendedNextApiRequest { - query: { id: string }; -} +import { + checkIfBreweryPostOwner, + editBreweryPost, + deleteBreweryPost, +} from '@/controllers/posts/breweries'; +import { EditBreweryPostRequest } from '@/controllers/posts/breweries/types'; -interface EditBreweryPostRequest extends BreweryPostRequest { - body: z.infer; -} - -const checkIfBreweryPostOwner = async ( - req: BreweryPostRequest, - res: NextApiResponse, - next: NextHandler, -) => { - const user = req.user!; - const { id } = req.query; - - const breweryPost = await getBreweryPostById(id); - if (!breweryPost) { - throw new ServerError('Brewery post not found', 404); - } - - if (breweryPost.postedBy.id !== user.id) { - throw new ServerError('You are not the owner of this brewery post', 403); - } - - return next(); -}; - -const editBreweryPost = async ( - req: EditBreweryPostRequest, - res: NextApiResponse>, -) => { - const { - body, - query: { id }, - } = req; - - await DBClient.instance.breweryPost.update({ - where: { id }, - data: body, - }); - - res.status(200).json({ - message: 'Brewery post updated successfully', - success: true, - statusCode: 200, - }); -}; - -const deleteBreweryPost = async (req: BreweryPostRequest, res: NextApiResponse) => { - const { - query: { id }, - } = req; - - const deleted = await DBClient.instance.breweryPost.delete({ where: { id } }); - - if (!deleted) { - throw new ServerError('Brewery post not found', 404); - } - - res.status(200).json({ - message: 'Brewery post deleted successfully', - success: true, - statusCode: 200, - }); -}; const router = createRouter< EditBreweryPostRequest, NextApiResponse> diff --git a/src/pages/api/breweries/create.ts b/src/pages/api/breweries/create.ts index 275b467..6c935ef 100644 --- a/src/pages/api/breweries/create.ts +++ b/src/pages/api/breweries/create.ts @@ -6,56 +6,9 @@ import { z } from 'zod'; import NextConnectOptions from '@/config/nextConnect/NextConnectOptions'; import getCurrentUser from '@/config/nextConnect/middleware/getCurrentUser'; import CreateBreweryPostSchema from '@/services/posts/brewery-post/schema/CreateBreweryPostSchema'; -import createNewBreweryPost from '@/services/posts/brewery-post/createNewBreweryPost'; -import geocode from '@/config/mapbox/geocoder'; -import ServerError from '@/config/util/ServerError'; -import DBClient from '@/prisma/DBClient'; + import { CreateBreweryPostRequest } from '@/controllers/posts/breweries/types'; - -const createBreweryPost = async ( - req: CreateBreweryPostRequest, - res: NextApiResponse>, -) => { - const { name, description, dateEstablished, address, city, country, region } = req.body; - const userId = req.user!.id; - - const fullAddress = `${address}, ${city}, ${region}, ${country}`; - - const geocoded = await geocode(fullAddress); - - if (!geocoded) { - throw new ServerError('Address is not valid', 400); - } - - const [latitude, longitude] = geocoded.center; - - const location = await DBClient.instance.breweryLocation.create({ - data: { - address, - city, - country, - stateOrProvince: region, - coordinates: [latitude, longitude], - postedBy: { connect: { id: userId } }, - }, - select: { id: true }, - }); - - const newBreweryPost = await createNewBreweryPost({ - name, - description, - locationId: location.id, - dateEstablished, - userId, - }); - - res.status(201).json({ - message: 'Brewery post created successfully', - statusCode: 201, - payload: newBreweryPost, - success: true, - }); -}; +import { createBreweryPost } from '@/controllers/posts/breweries'; const router = createRouter< CreateBreweryPostRequest, diff --git a/src/pages/api/breweries/map/index.ts b/src/pages/api/breweries/map/index.ts index a31579b..185cd3f 100644 --- a/src/pages/api/breweries/map/index.ts +++ b/src/pages/api/breweries/map/index.ts @@ -1,51 +1,15 @@ import validateRequest from '@/config/nextConnect/middleware/validateRequest'; -import DBClient from '@/prisma/DBClient'; -import BreweryPostMapQueryResult from '@/services/posts/brewery-post/schema/BreweryPostMapQueryResult'; +import { getMapBreweryPosts } from '@/controllers/posts/breweries'; +import { GetBreweryPostsRequest } from '@/controllers/posts/breweries/types'; + import PaginatedQueryResponseSchema from '@/services/schema/PaginatedQueryResponseSchema'; import APIResponseValidationSchema from '@/validation/APIResponseValidationSchema'; -import { NextApiRequest, NextApiResponse } from 'next'; +import { NextApiResponse } from 'next'; + import { createRouter } from 'next-connect'; import { z } from 'zod'; -interface GetBreweryPostsRequest extends NextApiRequest { - query: z.infer; -} - -const getMapBreweryPosts = async ( - req: GetBreweryPostsRequest, - res: NextApiResponse>, -) => { - const pageNum = parseInt(req.query.page_num, 10); - const pageSize = parseInt(req.query.page_size, 10); - - const skip = (pageNum - 1) * pageSize; - const take = pageSize; - - const breweryPosts: z.infer[] = - await DBClient.instance.breweryPost.findMany({ - select: { - location: { - select: { coordinates: true, city: true, country: true, stateOrProvince: true }, - }, - id: true, - name: true, - }, - skip, - take, - }); - const breweryPostCount = await DBClient.instance.breweryPost.count(); - - res.setHeader('X-Total-Count', breweryPostCount); - - res.status(200).json({ - message: 'Brewery posts retrieved successfully', - statusCode: 200, - payload: breweryPosts, - success: true, - }); -}; - const router = createRouter< GetBreweryPostsRequest, NextApiResponse> diff --git a/src/pages/beers/styles/[id]/index.tsx b/src/pages/beers/styles/[id]/index.tsx index 69b7e16..58d96b4 100644 --- a/src/pages/beers/styles/[id]/index.tsx +++ b/src/pages/beers/styles/[id]/index.tsx @@ -5,11 +5,12 @@ import { z } from 'zod'; import useMediaQuery from '@/hooks/utilities/useMediaQuery'; import { Tab } from '@headlessui/react'; -import getBeerStyleById from '@/services/posts/beer-style-post/getBeerStyleById'; + import BeerStyleHeader from '@/components/BeerStyleById/BeerStyleHeader'; import BeerStyleQueryResult from '@/services/posts/beer-style-post/schema/BeerStyleQueryResult'; import BeerStyleCommentSection from '@/components/BeerStyleById/BeerStyleCommentSection'; import BeerStyleBeerSection from '@/components/BeerStyleById/BeerStyleBeerSection'; +import { getBeerStyleByIdService } from '@/services/posts/beer-style-post'; interface BeerStylePageProps { beerStyle: z.infer; @@ -69,7 +70,7 @@ export default BeerStyleByIdPage; export const getServerSideProps: GetServerSideProps = async ({ params }) => { const id = params!.id as string; - const beerStyle = await getBeerStyleById(id); + const beerStyle = await getBeerStyleByIdService({ beerStyleId: id }); if (!beerStyle) { return { notFound: true }; } diff --git a/src/pages/breweries/[id]/beers/create.tsx b/src/pages/breweries/[id]/beers/create.tsx index eb3f45c..e1f7d73 100644 --- a/src/pages/breweries/[id]/beers/create.tsx +++ b/src/pages/breweries/[id]/beers/create.tsx @@ -8,7 +8,7 @@ import { BeerStyle } from '@prisma/client'; import { NextPage } from 'next'; import { BiBeer } from 'react-icons/bi'; import { z } from 'zod'; -import getBreweryPostById from '@/services/posts/brewery-post/getBreweryPostById'; +import { getBreweryPostByIdService } from '@/services/posts/brewery-post'; interface CreateBeerPageProps { brewery: z.infer; @@ -32,7 +32,7 @@ export const getServerSideProps = withPageAuthRequired( async (context) => { const id = context.params?.id as string; - const breweryPost = await getBreweryPostById(id); + const breweryPost = await getBreweryPostByIdService({ breweryPostId: id }); const beerStyles = await DBClient.instance.beerStyle.findMany(); return { diff --git a/src/pages/breweries/[id]/edit.tsx b/src/pages/breweries/[id]/edit.tsx index d1f6aae..5f2c493 100644 --- a/src/pages/breweries/[id]/edit.tsx +++ b/src/pages/breweries/[id]/edit.tsx @@ -5,7 +5,8 @@ import FormPageLayout from '@/components/ui/forms/FormPageLayout'; import FormSegment from '@/components/ui/forms/FormSegment'; import FormTextArea from '@/components/ui/forms/FormTextArea'; import FormTextInput from '@/components/ui/forms/FormTextInput'; -import getBreweryPostById from '@/services/posts/brewery-post/getBreweryPostById'; +import { getBreweryPostByIdService } from '@/services/posts/brewery-post'; + import BreweryPostQueryResult from '@/services/posts/brewery-post/schema/BreweryPostQueryResult'; import EditBreweryPostValidationSchema from '@/services/posts/brewery-post/schema/EditBreweryPostValidationSchema'; import withPageAuthRequired from '@/util/withPageAuthRequired'; @@ -143,7 +144,7 @@ export default EditBreweryPostPage; export const getServerSideProps = withPageAuthRequired( async (context, session) => { const breweryPostId = context.params?.id as string; - const breweryPost = await getBreweryPostById(breweryPostId); + const breweryPost = await getBreweryPostByIdService({ breweryPostId }); const { id: userId } = session; diff --git a/src/pages/breweries/[id]/index.tsx b/src/pages/breweries/[id]/index.tsx index ae2b281..a081fe4 100644 --- a/src/pages/breweries/[id]/index.tsx +++ b/src/pages/breweries/[id]/index.tsx @@ -1,4 +1,3 @@ -import getBreweryPostById from '@/services/posts/brewery-post/getBreweryPostById'; import BreweryPostQueryResult from '@/services/posts/brewery-post/schema/BreweryPostQueryResult'; import { GetServerSideProps, NextPage } from 'next'; @@ -13,6 +12,7 @@ import { Tab } from '@headlessui/react'; import dynamic from 'next/dynamic'; import { MAPBOX_ACCESS_TOKEN } from '@/config/env'; import { CldImage } from 'next-cloudinary'; +import { getBreweryPostByIdService } from '@/services/posts/brewery-post'; const [BreweryInfoHeader, BreweryBeersSection, BreweryCommentsSection, BreweryPostMap] = [ dynamic(() => import('@/components/BreweryById/BreweryInfoHeader')), @@ -114,7 +114,9 @@ const BreweryByIdPage: NextPage = ({ breweryPost, mapboxToken export const getServerSideProps: GetServerSideProps = async ( context, ) => { - const breweryPost = await getBreweryPostById(context.params!.id! as string); + const breweryPost = await getBreweryPostByIdService({ + breweryPostId: context.params?.id as string, + }); const mapboxToken = MAPBOX_ACCESS_TOKEN; return !breweryPost diff --git a/src/services/posts/beer-style-post/deleteBeerStyleById.ts b/src/services/posts/beer-style-post/deleteBeerStyleById.ts deleted file mode 100644 index 5d169ae..0000000 --- a/src/services/posts/beer-style-post/deleteBeerStyleById.ts +++ /dev/null @@ -1,34 +0,0 @@ -import { z } from 'zod'; -import DBClient from '@/prisma/DBClient'; -import BeerStyleQueryResult from './schema/BeerStyleQueryResult'; - -interface DeleteBeerStyleByIdArgs { - beerStyleId: string; -} - -const deleteBeerStyleById = async ({ - beerStyleId, -}: DeleteBeerStyleByIdArgs): Promise | null> => { - const deleted = await DBClient.instance.beerStyle.delete({ - where: { id: beerStyleId }, - select: { - id: true, - name: true, - createdAt: true, - updatedAt: true, - abvRange: true, - ibuRange: true, - description: true, - postedBy: { select: { id: true, username: true } }, - glassware: { select: { id: true, name: true } }, - }, - }); - - /** - * Prisma does not support tuples, so we have to typecast the ibuRange and abvRange - * fields to [number, number] in order to satisfy the zod schema. - */ - return deleted as Awaited>; -}; - -export default deleteBeerStyleById; diff --git a/src/services/posts/beer-style-post/editBeerStyleById.ts b/src/services/posts/beer-style-post/editBeerStyleById.ts deleted file mode 100644 index 07adb3f..0000000 --- a/src/services/posts/beer-style-post/editBeerStyleById.ts +++ /dev/null @@ -1,30 +0,0 @@ -import DBClient from '@/prisma/DBClient'; -import { z } from 'zod'; -import BeerStyleQueryResult from './schema/BeerStyleQueryResult'; - -const editBeerStyleById = async ( - id: string, -): Promise | null> => { - const beerStyle = await DBClient.instance.beerStyle.findUnique({ - where: { id }, - select: { - id: true, - name: true, - postedBy: { select: { id: true, username: true } }, - createdAt: true, - updatedAt: true, - abvRange: true, - ibuRange: true, - description: true, - glassware: { select: { id: true, name: true } }, - }, - }); - - /** - * Prisma does not support tuples, so we have to typecast the ibuRange and abvRange - * fields to [number, number] in order to satisfy the zod schema. - */ - return beerStyle as Awaited>; -}; - -export default editBeerStyleById; diff --git a/src/services/posts/beer-style-post/getAllBeerStyles.ts b/src/services/posts/beer-style-post/getAllBeerStyles.ts deleted file mode 100644 index 65df57b..0000000 --- a/src/services/posts/beer-style-post/getAllBeerStyles.ts +++ /dev/null @@ -1,37 +0,0 @@ -import DBClient from '@/prisma/DBClient'; -import { z } from 'zod'; -import BeerStyleQueryResult from './schema/BeerStyleQueryResult'; - -interface GetAllBeerStylesArgs { - pageNum: number; - pageSize: number; -} - -const getAllBeerStyles = async ({ - pageNum, - pageSize, -}: GetAllBeerStylesArgs): Promise[]> => { - const beerStyles = await DBClient.instance.beerStyle.findMany({ - take: pageSize, - skip: (pageNum - 1) * pageSize, - select: { - id: true, - name: true, - postedBy: { select: { id: true, username: true } }, - createdAt: true, - updatedAt: true, - abvRange: true, - ibuRange: true, - description: true, - glassware: { select: { id: true, name: true } }, - }, - }); - - /** - * Prisma does not support tuples, so we have to typecast the ibuRange and abvRange - * fields to [number, number] in order to satisfy the zod schema. - */ - return beerStyles as Awaited>; -}; - -export default getAllBeerStyles; diff --git a/src/services/posts/beer-style-post/getBeerStyleById.ts b/src/services/posts/beer-style-post/getBeerStyleById.ts deleted file mode 100644 index 688fcda..0000000 --- a/src/services/posts/beer-style-post/getBeerStyleById.ts +++ /dev/null @@ -1,30 +0,0 @@ -import DBClient from '@/prisma/DBClient'; -import { z } from 'zod'; -import BeerStyleQueryResult from './schema/BeerStyleQueryResult'; - -const getBeerStyleById = async ( - id: string, -): Promise | null> => { - const beerStyle = await DBClient.instance.beerStyle.findUnique({ - where: { id }, - select: { - id: true, - name: true, - postedBy: { select: { id: true, username: true } }, - createdAt: true, - updatedAt: true, - abvRange: true, - ibuRange: true, - description: true, - glassware: { select: { id: true, name: true } }, - }, - }); - - /** - * Prisma does not support tuples, so we have to typecast the ibuRange and abvRange - * fields to [number, number] in order to satisfy the zod schema. - */ - return beerStyle as Awaited>; -}; - -export default getBeerStyleById; diff --git a/src/services/posts/beer-style-post/index.ts b/src/services/posts/beer-style-post/index.ts new file mode 100644 index 0000000..0a18b28 --- /dev/null +++ b/src/services/posts/beer-style-post/index.ts @@ -0,0 +1,182 @@ +import DBClient from '@/prisma/DBClient'; +import ServerError from '@/config/util/ServerError'; +import type { + CreateBeerStyle, + DeleteBeerStyleById, + EditBeerStyleById, + GetAllBeerStyles, + GetBeerStyleById, +} from '@/services/posts/beer-style-post/types'; + +/** + * The select object for retrieving beer styles. + * + * Satisfies the BeerStyleQueryResult zod schema. + * + * @remarks + * Prisma does not support tuples, so we have to typecast the ibuRange and abvRange fields + * to satisfy the zod schema. + * @example + * const beerStyles = await DBClient.instance.beerStyle.findMany({ + * select: beerStyleSelect, + * }); + */ +const beerStyleSelect = { + id: true, + name: true, + createdAt: true, + updatedAt: true, + abvRange: true, + ibuRange: true, + description: true, + postedBy: { select: { id: true, username: true } }, + glassware: { select: { id: true, name: true } }, +} as const; + +/** + * Deletes a beer style by id. + * + * @param args - The arguments for the service. + * @param args.beerStyleId - The id of the beer style to delete. + * @returns The deleted beer style. + */ +export const deleteBeerStyleService: DeleteBeerStyleById = async ({ beerStyleId }) => { + const deleted = await DBClient.instance.beerStyle.delete({ + where: { id: beerStyleId }, + select: beerStyleSelect, + }); + + return deleted as Awaited>; +}; + +/** + * Edits a beer style by id. + * + * @param args - The arguments for the service. + * @param args.beerStyleId - The id of the beer style to edit. + * @param args.body - The data to update the beer style with. + * @param args.body.abvRange - The abv range of the beer style. + * @param args.body.description - The description of the beer style. + * @param args.body.glasswareId - The id of the glassware to connect to the beer style. + * @param args.body.ibuRange - The ibu range of the beer style. + * @param args.body.name - The name of the beer style. + * @returns The updated beer style. + */ +export const editBeerStyleService: EditBeerStyleById = async ({ beerStyleId, body }) => { + const { abvRange, description, glasswareId, ibuRange, name } = body; + + const glassware = await DBClient.instance.glassware.findUnique({ + where: { id: glasswareId }, + select: { id: true }, + }); + + if (!glassware) { + throw new ServerError( + 'A glassware with that id does not exist and cannot be connected.', + 404, + ); + } + + const updated = await DBClient.instance.beerStyle.update({ + where: { id: beerStyleId }, + data: { + abvRange, + description, + ibuRange, + name, + glassware: { connect: { id: glasswareId } }, + }, + select: beerStyleSelect, + }); + + return updated as Awaited>; +}; + +/** + * Gets all beer styles with pagination. + * + * @param args - The arguments for the service. + * @param args.pageNum - The page number of the results. + * @param args.pageSize - The page size of the results. + * @returns The beer styles and the total count of beer styles. + */ +export const getAllBeerStylesService: GetAllBeerStyles = async ({ + pageNum, + pageSize, +}) => { + const beerStyles = await DBClient.instance.beerStyle.findMany({ + take: pageSize, + skip: (pageNum - 1) * pageSize, + select: beerStyleSelect, + }); + + const beerStyleCount = await DBClient.instance.beerStyle.count(); + + return { + beerStyles: beerStyles as Awaited< + ReturnType + >['beerStyles'], + beerStyleCount, + }; +}; + +/** + * Gets a beer style by id. + * + * @param args - The arguments for the service. + * @param args.beerStyleId - The id of the beer style to get. + * @returns The beer style. + */ +export const getBeerStyleByIdService: GetBeerStyleById = async ({ beerStyleId }) => { + const beerStyle = await DBClient.instance.beerStyle.findUnique({ + where: { id: beerStyleId }, + select: beerStyleSelect, + }); + + return beerStyle as Awaited>; +}; + +/** + * Creates a beer style. + * + * @param args - The arguments for the service. + * @param args.body - The data to create the beer style with. + * @param args.body.abvRange - The abv range of the beer style. + * @param args.body.description - The description of the beer style. + * @param args.body.glasswareId - The id of the glassware to connect to the beer style. + * @param args.body.ibuRange - The ibu range of the beer style. + * @param args.body.name - The name of the beer style. + * @param args.glasswareId - The id of the glassware to connect to the beer style. + * @param args.postedById - The id of the user who posted the beer style. + */ +export const createBeerStyleService: CreateBeerStyle = async ({ + body: { abvRange, description, ibuRange, name }, + glasswareId, + postedById, +}) => { + const glassware = await DBClient.instance.glassware.findUnique({ + where: { id: glasswareId }, + select: { id: true }, + }); + + if (!glassware) { + throw new ServerError( + 'A glassware with that id does not exist and cannot be connected.', + 404, + ); + } + + const beerStyle = await DBClient.instance.beerStyle.create({ + data: { + name, + description, + abvRange, + ibuRange, + glassware: { connect: { id: glasswareId } }, + postedBy: { connect: { id: postedById } }, + }, + select: beerStyleSelect, + }); + + return beerStyle as Awaited>; +}; diff --git a/src/services/posts/beer-style-post/types/index.ts b/src/services/posts/beer-style-post/types/index.ts new file mode 100644 index 0000000..9790bf7 --- /dev/null +++ b/src/services/posts/beer-style-post/types/index.ts @@ -0,0 +1,39 @@ +import { z } from 'zod'; +import BeerStyleQueryResult from '../schema/BeerStyleQueryResult'; + +type BeerStyle = z.infer; + +export type GetBeerStyleById = (args: { + beerStyleId: string; +}) => Promise; + +export type DeleteBeerStyleById = (args: { + beerStyleId: string; +}) => Promise; + +export type EditBeerStyleById = (args: { + beerStyleId: string; + body: { + name: string; + description: string; + abvRange: [number, number]; + ibuRange: [number, number]; + glasswareId: string; + }; +}) => Promise; + +export type GetAllBeerStyles = (args: { pageNum: number; pageSize: number }) => Promise<{ + beerStyles: BeerStyle[]; + beerStyleCount: number; +}>; + +export type CreateBeerStyle = (args: { + body: { + name: string; + description: string; + abvRange: [number, number]; + ibuRange: [number, number]; + }; + glasswareId: string; + postedById: string; +}) => Promise; diff --git a/src/services/posts/brewery-post/createNewBreweryPost.ts b/src/services/posts/brewery-post/createNewBreweryPost.ts deleted file mode 100644 index cdcc66a..0000000 --- a/src/services/posts/brewery-post/createNewBreweryPost.ts +++ /dev/null @@ -1,64 +0,0 @@ -import DBClient from '@/prisma/DBClient'; -import { z } from 'zod'; -import CreateBreweryPostSchema from './schema/CreateBreweryPostSchema'; -import BreweryPostQueryResult from './schema/BreweryPostQueryResult'; - -const CreateNewBreweryPostWithUserAndLocationSchema = CreateBreweryPostSchema.omit({ - address: true, - city: true, - country: true, - stateOrProvince: true, -}).extend({ - userId: z.string().cuid(), - locationId: z.string().cuid(), -}); - -const createNewBreweryPost = async ({ - dateEstablished, - description, - locationId, - name, - userId, -}: z.infer): Promise< - z.infer -> => { - const post = (await DBClient.instance.breweryPost.create({ - data: { - name, - description, - dateEstablished, - location: { connect: { id: locationId } }, - postedBy: { connect: { id: userId } }, - }, - select: { - id: true, - name: true, - description: true, - createdAt: true, - dateEstablished: true, - postedBy: { select: { id: true, username: true } }, - breweryImages: { - select: { - path: true, - caption: true, - id: true, - alt: true, - createdAt: true, - updatedAt: true, - }, - }, - location: { - select: { - city: true, - address: true, - coordinates: true, - country: true, - stateOrProvince: true, - }, - }, - }, - })) as Awaited>; - - return post; -}; -export default createNewBreweryPost; diff --git a/src/services/posts/brewery-post/getAllBreweryPosts.ts b/src/services/posts/brewery-post/getAllBreweryPosts.ts deleted file mode 100644 index b3540f5..0000000 --- a/src/services/posts/brewery-post/getAllBreweryPosts.ts +++ /dev/null @@ -1,55 +0,0 @@ -import DBClient from '@/prisma/DBClient'; -import BreweryPostQueryResult from '@/services/posts/brewery-post/schema/BreweryPostQueryResult'; - -import { z } from 'zod'; - -const prisma = DBClient.instance; - -const getAllBreweryPosts = async ({ - pageNum, - pageSize, -}: { - pageNum: number; - pageSize: number; -}): Promise[]> => { - const breweryPosts = await prisma.breweryPost.findMany({ - take: pageSize, - skip: (pageNum - 1) * pageSize, - select: { - id: true, - location: { - select: { - city: true, - address: true, - coordinates: true, - country: true, - stateOrProvince: true, - }, - }, - description: true, - name: true, - postedBy: { select: { username: true, id: true } }, - breweryImages: { - select: { - path: true, - caption: true, - id: true, - alt: true, - createdAt: true, - updatedAt: true, - }, - }, - createdAt: true, - dateEstablished: true, - }, - orderBy: { createdAt: 'desc' }, - }); - - /** - * Prisma does not support tuples, so we have to typecast the coordinates field to - * [number, number] in order to satisfy the zod schema. - */ - return breweryPosts as Awaited>; -}; - -export default getAllBreweryPosts; diff --git a/src/services/posts/brewery-post/getAllBreweryPostsByPostedById.ts b/src/services/posts/brewery-post/getAllBreweryPostsByPostedById.ts deleted file mode 100644 index b4820d1..0000000 --- a/src/services/posts/brewery-post/getAllBreweryPostsByPostedById.ts +++ /dev/null @@ -1,58 +0,0 @@ -import DBClient from '@/prisma/DBClient'; -import BreweryPostQueryResult from '@/services/posts/brewery-post/schema/BreweryPostQueryResult'; - -import { z } from 'zod'; - -const prisma = DBClient.instance; - -const getAllBreweryPostsByPostedById = async ({ - pageNum, - pageSize, - postedById, -}: { - pageNum: number; - pageSize: number; - postedById: string; -}): Promise[]> => { - const breweryPosts = await prisma.breweryPost.findMany({ - where: { postedBy: { id: postedById } }, - take: pageSize, - skip: (pageNum - 1) * pageSize, - select: { - id: true, - location: { - select: { - city: true, - address: true, - coordinates: true, - country: true, - stateOrProvince: true, - }, - }, - description: true, - name: true, - postedBy: { select: { username: true, id: true } }, - breweryImages: { - select: { - path: true, - caption: true, - id: true, - alt: true, - createdAt: true, - updatedAt: true, - }, - }, - createdAt: true, - dateEstablished: true, - }, - orderBy: { createdAt: 'desc' }, - }); - - /** - * Prisma does not support tuples, so we have to typecast the coordinates field to - * [number, number] in order to satisfy the zod schema. - */ - return breweryPosts as Awaited>; -}; - -export default getAllBreweryPostsByPostedById; diff --git a/src/services/posts/brewery-post/getBreweryPostById.ts b/src/services/posts/brewery-post/getBreweryPostById.ts deleted file mode 100644 index 46886fe..0000000 --- a/src/services/posts/brewery-post/getBreweryPostById.ts +++ /dev/null @@ -1,46 +0,0 @@ -import DBClient from '@/prisma/DBClient'; -import BreweryPostQueryResult from '@/services/posts/brewery-post/schema/BreweryPostQueryResult'; -import { z } from 'zod'; - -const prisma = DBClient.instance; - -const getBreweryPostById = async (id: string) => { - const breweryPost = await prisma.breweryPost.findFirst({ - select: { - id: true, - location: { - select: { - city: true, - address: true, - coordinates: true, - country: true, - stateOrProvince: true, - }, - }, - description: true, - name: true, - breweryImages: { - select: { - path: true, - caption: true, - id: true, - alt: true, - createdAt: true, - updatedAt: true, - }, - }, - postedBy: { select: { username: true, id: true } }, - createdAt: true, - dateEstablished: true, - }, - where: { id }, - }); - - /** - * Prisma does not support tuples, so we have to typecast the coordinates field to - * [number, number] in order to satisfy the zod schema. - */ - return breweryPost as z.infer | null; -}; - -export default getBreweryPostById; diff --git a/src/services/posts/brewery-post/index.ts b/src/services/posts/brewery-post/index.ts new file mode 100644 index 0000000..a055c68 --- /dev/null +++ b/src/services/posts/brewery-post/index.ts @@ -0,0 +1,207 @@ +import DBClient from '@/prisma/DBClient'; + +import { + CreateBreweryPostLocation, + CreateNewBreweryPost, + GetAllBreweryPosts, + GetAllBreweryPostsByPostedById, + GetBreweryPostById, + GetMapBreweryPosts, +} from './types'; + +/** + * The select object to use when querying for brewery posts. + * + * @remarks + * Prisma does not support tuples, so we have to typecast the coordinates field to + * [number, number] in order to satisfy the zod schema. + */ +const breweryPostSelect = { + id: true, + name: true, + description: true, + createdAt: true, + dateEstablished: true, + postedBy: { select: { id: true, username: true } }, + breweryImages: { + select: { + path: true, + caption: true, + id: true, + alt: true, + createdAt: true, + updatedAt: true, + }, + }, + location: { + select: { + city: true, + address: true, + coordinates: true, + country: true, + stateOrProvince: true, + }, + }, +} as const; + +/** + * Creates a new brewery post. + * + * @param args - The arguments to create a new brewery post. + * @param args.name - The name of the brewery. + * @param args.description - The description of the brewery. + * @param args.dateEstablished - The date the brewery was established. + * @param args.userId - The id of the user who created the brewery post. + * @param args.locationId - The id of the location of the brewery. + * @returns The newly created brewery post. + */ +export const createNewBreweryPostService: CreateNewBreweryPost = async ({ + dateEstablished, + description, + locationId, + name, + userId, +}) => { + const post = (await DBClient.instance.breweryPost.create({ + data: { + name, + description, + dateEstablished, + location: { connect: { id: locationId } }, + postedBy: { connect: { id: userId } }, + }, + select: breweryPostSelect, + })) as Awaited>; + + return post; +}; + +/** + * Retrieves all brewery posts paginated. + * + * @param args - The arguments to get all brewery posts. + * @param args.pageNum - The page number of the brewery posts to get. + * @param args.pageSize - The number of brewery posts to get per page. + * @returns All brewery posts. + */ +export const getAllBreweryPostsService: GetAllBreweryPosts = async ({ + pageNum, + pageSize, +}) => { + const breweryPosts = (await DBClient.instance.breweryPost.findMany({ + take: pageSize, + skip: (pageNum - 1) * pageSize, + select: breweryPostSelect, + orderBy: { createdAt: 'desc' }, + })) as Awaited>['breweryPosts']; + + const count = await DBClient.instance.breweryPost.count(); + return { breweryPosts, count }; +}; + +/** + * Retrieves a brewery post by ID. + * + * @param args - The arguments to get a brewery post by ID. + * @param args.breweryPostId - The ID of the brewery post to get. + * @returns The brewery post. + */ +export const getBreweryPostByIdService: GetBreweryPostById = async ({ + breweryPostId, +}) => { + const breweryPost = await DBClient.instance.breweryPost.findFirst({ + select: breweryPostSelect, + where: { id: breweryPostId }, + }); + + return breweryPost as Awaited>; +}; + +/** + * Retrieves all brewery posts by posted by ID. + * + * @param args - The arguments to get all brewery posts by posted by ID. + * @param args.pageNum - The page number of the brewery posts to get. + * @param args.pageSize - The number of brewery posts to get per page. + * @param args.postedById - The ID of the user who posted the brewery posts. + */ +export const getAllBreweryPostsByPostedByIdService: GetAllBreweryPostsByPostedById = + async ({ pageNum, pageSize, postedById }) => { + const breweryPosts = (await DBClient.instance.breweryPost.findMany({ + where: { postedBy: { id: postedById } }, + take: pageSize, + skip: (pageNum - 1) * pageSize, + select: breweryPostSelect, + orderBy: { createdAt: 'desc' }, + })) as Awaited< + ReturnType + >['breweryPosts']; + + const count = await DBClient.instance.breweryPost.count({ + where: { postedBy: { id: postedById } }, + }); + + return { breweryPosts, count }; + }; + +/** + * Creates a brewery post location. + * + * @param args - The arguments to create a brewery post location. + * @param args.body - The body of the request. + * @param args.body.address - The address of the brewery. + * @param args.body.city - The city of the brewery. + * @param args.body.country - The country of the brewery. + * @param args.body.stateOrProvince - The state or province of the brewery. + * @param args.body.coordinates - The coordinates of the brewery in an array of [latitude, + * longitude]. + * @param args.postedById - The ID of the user who posted the brewery post. + * @returns The newly created brewery post location. + */ +export const createBreweryPostLocationService: CreateBreweryPostLocation = async ({ + body: { address, city, country, stateOrProvince, coordinates }, + postedById, +}) => { + const [latitude, longitude] = coordinates; + + return DBClient.instance.breweryLocation.create({ + data: { + address, + city, + country, + stateOrProvince, + coordinates: [latitude, longitude], + postedBy: { connect: { id: postedById } }, + }, + select: { id: true }, + }); +}; + +/** + * Gets all brewery posts for the post map. + * + * @param args - The arguments to get all brewery posts for the post map. + * @param args.pageNum - The page number of the brewery posts to get. + * @param args.pageSize - The number of brewery posts to get per page. + * @returns All brewery posts for the post map. + */ +export const getMapBreweryPostsService: GetMapBreweryPosts = async ({ + pageNum, + pageSize, +}) => { + const breweryPosts = await DBClient.instance.breweryPost.findMany({ + take: pageSize, + skip: (pageNum - 1) * pageSize, + select: { + id: true, + name: true, + location: { + select: { coordinates: true, city: true, country: true, stateOrProvince: true }, + }, + }, + orderBy: { createdAt: 'desc' }, + }); + + const count = await DBClient.instance.breweryPost.count(); + return { breweryPosts, count }; +}; diff --git a/src/services/posts/brewery-post/schema/CreateNewBreweryPostWithoutLocationSchema.ts b/src/services/posts/brewery-post/schema/CreateNewBreweryPostWithoutLocationSchema.ts new file mode 100644 index 0000000..7eca3c7 --- /dev/null +++ b/src/services/posts/brewery-post/schema/CreateNewBreweryPostWithoutLocationSchema.ts @@ -0,0 +1,14 @@ +import { z } from 'zod'; +import CreateBreweryPostSchema from './CreateBreweryPostSchema'; + +const CreateNewBreweryPostWithoutLocationSchema = CreateBreweryPostSchema.omit({ + address: true, + city: true, + country: true, + stateOrProvince: true, +}).extend({ + userId: z.string().cuid(), + locationId: z.string().cuid(), +}); + +export default CreateNewBreweryPostWithoutLocationSchema; diff --git a/src/services/posts/brewery-post/schema/GetMapBreweryPostsSchema.ts b/src/services/posts/brewery-post/schema/GetMapBreweryPostsSchema.ts new file mode 100644 index 0000000..93ced18 --- /dev/null +++ b/src/services/posts/brewery-post/schema/GetMapBreweryPostsSchema.ts @@ -0,0 +1,14 @@ +import { z } from 'zod'; + +const GetMapBreweryPostsSchema = z.object({ + name: z.string(), + id: z.string().cuid(), + location: z.object({ + city: z.string(), + country: z.string().nullable(), + stateOrProvince: z.string().nullable(), + coordinates: z.array(z.number(), z.number()), + }), +}); + +export default GetMapBreweryPostsSchema; diff --git a/src/services/posts/brewery-post/types/index.ts b/src/services/posts/brewery-post/types/index.ts new file mode 100644 index 0000000..92f5221 --- /dev/null +++ b/src/services/posts/brewery-post/types/index.ts @@ -0,0 +1,48 @@ +import { z } from 'zod'; +import BreweryPostQueryResult from '../schema/BreweryPostQueryResult'; +import CreateNewBreweryPostWithoutLocationSchema from '../schema/CreateNewBreweryPostWithoutLocationSchema'; +import BreweryPostMapQueryResult from '../schema/BreweryPostMapQueryResult'; + +export type CreateNewBreweryPost = ( + args: z.infer, +) => Promise>; + +export type GetAllBreweryPosts = (args: { + pageNum: number; + pageSize: number; +}) => Promise<{ + breweryPosts: z.infer[]; + count: number; +}>; + +export type GetBreweryPostById = (args: { + breweryPostId: string; +}) => Promise | null>; + +export type GetAllBreweryPostsByPostedById = (args: { + pageNum: number; + pageSize: number; + postedById: string; +}) => Promise<{ + breweryPosts: z.infer[]; + count: number; +}>; + +export type CreateBreweryPostLocation = (args: { + body: { + address: string; + city: string; + country?: string; + stateOrProvince?: string; + coordinates: [number, number]; + }; + postedById: string; +}) => Promise<{ id: string }>; + +export type GetMapBreweryPosts = (args: { + pageNum: number; + pageSize: number; +}) => Promise<{ + breweryPosts: z.infer[]; + count: number; +}>;