Refactor: move service logic out of api routes and into separate files

src/hooks/data-fetching/beer-posts/useBeerPosts.ts

@@ -49,6 +49,7 @@ const useBeerPosts = ({ pageSize }: { pageSize: number }) => {
   const { data, error, isLoading, setSize, size } = useSWRInfinite(
     (index) => `/api/beers?page_num=${index + 1}&page_size=${pageSize}`,
     fetcher,
+    { parallel: true },
   );
 
   const beerPosts = data?.flatMap((d) => d.beerPosts) ?? [];

src/hooks/data-fetching/brewery-posts/useBreweryPosts.ts

@@ -46,6 +46,7 @@ const useBreweryPosts = ({ pageSize }: { pageSize: number }) => {
   const { data, error, isLoading, setSize, size } = useSWRInfinite(
     (index) => `/api/breweries?page_num=${index + 1}&page_size=${pageSize}`,
     fetcher,
+    { parallel: true },
   );
 
   const breweryPosts = data?.flatMap((d) => d.breweryPosts) ?? [];

src/pages/api/beer-comments/[id].ts

@@ -4,8 +4,9 @@ import validateRequest from '@/config/nextConnect/middleware/validateRequest';
 import NextConnectOptions from '@/config/nextConnect/NextConnectOptions';
 import ServerError from '@/config/util/ServerError';
 import DBClient from '@/prisma/DBClient';
+import findBeerCommentById from '@/services/BeerComment/findBeerCommentById';
 import CreateCommentValidationSchema from '@/services/types/CommentSchema/CreateCommentValidationSchema';
-
+import editBeerCommentById from '@/services/BeerComment/editBeerCommentById';
 import APIResponseValidationSchema from '@/validation/APIResponseValidationSchema';
 import { NextApiResponse } from 'next';
 import { createRouter, NextHandler } from 'next-connect';
@@ -27,9 +28,7 @@ const checkIfCommentOwner = async (
 ) => {
   const { id } = req.query;
   const user = req.user!;
-  const comment = await DBClient.instance.beerComment.findUnique({
+  const comment = await findBeerCommentById(id);
-    where: { id },
-  });
 
   if (!comment) {
     throw new ServerError('Comment not found', 404);
@@ -48,13 +47,10 @@ const editComment = async (
 ) => {
   const { id } = req.query;
 
-  const updated = await DBClient.instance.beerComment.update({
+  const updated = await editBeerCommentById({
-    where: { id },
-    data: {
     content: req.body.content,
     rating: req.body.rating,
-      updatedAt: new Date(),
+    id,
-    },
   });
 
   return res.status(200).json({

src/pages/api/beers/[id]/images/index.ts

@@ -1,5 +1,3 @@
-import DBClient from '@/prisma/DBClient';
-import { BeerImage } from '@prisma/client';
 import NextConnectOptions from '@/config/nextConnect/NextConnectOptions';
 import APIResponseValidationSchema from '@/validation/APIResponseValidationSchema';
 import { UserExtendedNextApiRequest } from '@/config/auth/types';
@@ -14,6 +12,8 @@ import { NextApiResponse } from 'next';
 import { z } from 'zod';
 import ServerError from '@/config/util/ServerError';
 import validateRequest from '@/config/nextConnect/middleware/validateRequest';
+import processImageDataIntoDB from '@/services/BeerImage/processImageDataIntoDB';
+import ImageMetadataValidationSchema from '@/services/types/ImageSchema/ImageMetadataValidationSchema';
 
 const { storage } = cloudinaryConfig;
 
@@ -34,15 +34,10 @@ const uploadMiddleware = expressWrapper(
   ),
 );
 
-const BeerPostImageValidationSchema = z.object({
-  caption: z.string(),
-  alt: z.string(),
-});
-
 interface UploadBeerPostImagesRequest extends UserExtendedNextApiRequest {
   files?: Express.Multer.File[];
   query: { id: string };
-  body: z.infer<typeof BeerPostImageValidationSchema>;
+  body: z.infer<typeof ImageMetadataValidationSchema>;
 }
 
 const processImageData = async (
@@ -54,24 +49,15 @@ const processImageData = async (
   if (!files || !files.length) {
     throw new ServerError('No images uploaded', 400);
   }
-  const beerImagePromises: Promise<BeerImage>[] = [];
 
-  files.forEach((file) => {
+  const beerImages = await processImageDataIntoDB({
-    beerImagePromises.push(
-      DBClient.instance.beerImage.create({
-        data: {
     alt: body.alt,
-          postedBy: { connect: { id: user!.id } },
-          beerPost: { connect: { id: req.query.id } },
-          path: file.path,
     caption: body.caption,
-        },
+    beerPostId: req.query.id,
-      }),
+    userId: user!.id,
-    );
+    files,
   });
 
-  const beerImages = await Promise.all(beerImagePromises);
-
   res.status(200).json({
     success: true,
     message: `Successfully uploaded ${beerImages.length} image${
@@ -90,7 +76,7 @@ router.post(
   getCurrentUser,
   // @ts-expect-error
   uploadMiddleware,
-  validateRequest({ bodySchema: BeerPostImageValidationSchema }),
+  validateRequest({ bodySchema: ImageMetadataValidationSchema }),
   processImageData,
 );
 

src/pages/api/beers/[id]/like/index.ts

@@ -11,7 +11,7 @@ import removeBeerPostLikeById from '@/services/BeerPostLike/removeBeerPostLikeBy
 import findBeerPostLikeById from '@/services/BeerPostLike/findBeerPostLikeById';
 import getCurrentUser from '@/config/nextConnect/middleware/getCurrentUser';
 import NextConnectOptions from '@/config/nextConnect/NextConnectOptions';
-import DBClient from '@/prisma/DBClient';
+import getBeerPostLikeCount from '@/services/BeerPostLike/getBeerPostLikeCount';
 
 const sendLikeRequest = async (
   req: UserExtendedNextApiRequest,
@@ -25,7 +25,10 @@ const sendLikeRequest = async (
     throw new ServerError('Could not find a beer post with that id', 404);
   }
 
-  const alreadyLiked = await findBeerPostLikeById(beer.id, user.id);
+  const alreadyLiked = await findBeerPostLikeById({
+    beerPostId: beer.id,
+    likedById: user.id,
+  });
 
   const jsonResponse = {
     success: true as const,
@@ -50,9 +53,7 @@ const getLikeCount = async (
 ) => {
   const id = req.query.id as string;
 
-  const likeCount = await DBClient.instance.beerPostLike.count({
+  const likeCount = await getBeerPostLikeCount(id);
-    where: { beerPostId: id },
-  });
 
   res.status(200).json({
     success: true,

src/pages/api/beers/[id]/like/is-liked.ts

@@ -2,25 +2,20 @@ import getCurrentUser from '@/config/nextConnect/middleware/getCurrentUser';
 import { UserExtendedNextApiRequest } from '@/config/auth/types';
 import NextConnectOptions from '@/config/nextConnect/NextConnectOptions';
 import validateRequest from '@/config/nextConnect/middleware/validateRequest';
-import DBClient from '@/prisma/DBClient';
 import APIResponseValidationSchema from '@/validation/APIResponseValidationSchema';
 import { NextApiResponse } from 'next';
 import { createRouter } from 'next-connect';
 import { z } from 'zod';
+import findBeerPostLikeById from '@/services/BeerPostLike/findBeerPostLikeById';
 
 const checkIfLiked = async (
   req: UserExtendedNextApiRequest,
   res: NextApiResponse<z.infer<typeof APIResponseValidationSchema>>,
 ) => {
   const user = req.user!;
-  const id = req.query.id as string;
+  const beerPostId = req.query.id as string;
 
-  const alreadyLiked = await DBClient.instance.beerPostLike.findFirst({
+  const alreadyLiked = await findBeerPostLikeById({ beerPostId, likedById: user.id });
-    where: {
-      beerPostId: id,
-      likedById: user.id,
-    },
-  });
 
   res.status(200).json({
     success: true,
@@ -37,11 +32,7 @@ const router = createRouter<
 
 router.get(
   getCurrentUser,
-  validateRequest({
+  validateRequest({ querySchema: z.object({ id: z.string().uuid() }) }),
-    querySchema: z.object({
-      id: z.string().uuid(),
-    }),
-  }),
   checkIfLiked,
 );
 

src/services/BeerComment/editBeerCommentById.ts

@@ -0,0 +1,22 @@
+import DBClient from '@/prisma/DBClient';
+
+interface EditBeerCommentByIdArgs {
+  id: string;
+  content: string;
+  rating: number;
+}
+
+const editBeerCommentById = async ({ id, content, rating }: EditBeerCommentByIdArgs) => {
+  const updated = await DBClient.instance.beerComment.update({
+    where: { id },
+    data: {
+      content,
+      rating,
+      updatedAt: new Date(),
+    },
+  });
+
+  return updated;
+};
+
+export default editBeerCommentById;

src/services/BeerComment/findBeerCommentById.ts

@@ -0,0 +1,11 @@
+import DBClient from '@/prisma/DBClient';
+
+const findBeerCommentById = async (id: string) => {
+  const comment = await DBClient.instance.beerComment.findUnique({
+    where: { id },
+  });
+
+  return comment;
+};
+
+export default findBeerCommentById;

src/services/BeerImage/processImageDataIntoDB.ts

@@ -0,0 +1,39 @@
+import DBClient from '@/prisma/DBClient';
+import { BeerImage } from '@prisma/client';
+import { z } from 'zod';
+import ImageMetadataValidationSchema from '../types/ImageSchema/ImageMetadataValidationSchema';
+
+interface ProcessImageDataArgs {
+  files: Express.Multer.File[];
+  alt: z.infer<typeof ImageMetadataValidationSchema>['alt'];
+  caption: z.infer<typeof ImageMetadataValidationSchema>['caption'];
+  beerPostId: string;
+  userId: string;
+}
+
+const processImageDataIntoDB = ({
+  alt,
+  caption,
+  files,
+  beerPostId,
+  userId,
+}: ProcessImageDataArgs) => {
+  const beerImagePromises: Promise<BeerImage>[] = [];
+  files.forEach((file) => {
+    beerImagePromises.push(
+      DBClient.instance.beerImage.create({
+        data: {
+          alt,
+          caption,
+          postedBy: { connect: { id: userId } },
+          beerPost: { connect: { id: beerPostId } },
+          path: file.path,
+        },
+      }),
+    );
+  });
+
+  return Promise.all(beerImagePromises);
+};
+
+export default processImageDataIntoDB;

src/services/BeerPostLike/findBeerPostLikeById.ts

@@ -1,6 +1,14 @@
 import DBClient from '@/prisma/DBClient';
 
-const findBeerPostLikeById = async (beerPostId: string, likedById: string) =>
+interface FindBeerPostLikeByIdArgs {
+  beerPostId: string;
+  likedById: string;
+}
+
+const findBeerPostLikeById = async ({
+  beerPostId,
+  likedById,
+}: FindBeerPostLikeByIdArgs) =>
   DBClient.instance.beerPostLike.findFirst({ where: { beerPostId, likedById } });
 
 export default findBeerPostLikeById;

src/services/types/ImageSchema/ImageMetadataValidationSchema.ts

@@ -0,0 +1,8 @@
+import { z } from 'zod';
+
+const ImageMetadataValidationSchema = z.object({
+  caption: z.string().min(1, { message: 'Caption is required.' }),
+  alt: z.string().min(1, { message: 'Alt text is required.' }),
+});
+
+export default ImageMetadataValidationSchema;