AaronPo/the-biergarten-app
1
0
Fork 0
mirror of https://github.com/aaronpo97/the-biergarten-app.git synced 2026-02-16 20:13:49 +00:00
Code Issues Packages Projects 1 Releases Wiki Activity

refactor: finish extracting comment controller logic out of router

Browse Source
This commit is contained in:
Aaron William Po
2023-12-03 15:01:47 -05:00
parent b45ed857d3
commit 57c70c2292
10 changed files with 205 additions and 219 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -8,12 +8,12 @@ import { NextApiResponse } from 'next';
import { createRouter } from 'next-connect';
import { z } from 'zod';
import { CommentRequest } from '@/controllers/requestTypes';
import { CommentRequest } from '@/controllers/comments/types';
import {
checkIfBeerCommentOwner,
deleteBeerPostComment,
editBeerPostComment,
} from '@/controllers/beerComments';
} from '@/controllers/comments/beerComments';
const router = createRouter<
CommentRequest,

4
src/pages/api/beer-style-comments/[id].ts
View File

@@ -5,8 +5,8 @@ import {
checkIfBeerStyleCommentOwner,
deleteBeerStyleComment,
editBeerStyleComment,
} from '@/controllers/beerStyleComments';
import { CommentRequest } from '@/controllers/requestTypes';
} from '@/controllers/comments/beerStyleComments';
import { CommentRequest } from '@/controllers/comments/types';
import CreateCommentValidationSchema from '@/services/schema/CommentSchema/CreateCommentValidationSchema';
import APIResponseValidationSchema from '@/validation/APIResponseValidationSchema';

73
src/pages/api/beers/[id]/comments/index.ts
View File

@@ -1,78 +1,19 @@
import DBClient from '@/prisma/DBClient';
import getAllBeerComments from '@/services/BeerComment/getAllBeerComments';
import validateRequest from '@/config/nextConnect/middleware/validateRequest';
import APIResponseValidationSchema from '@/validation/APIResponseValidationSchema';
import { UserExtendedNextApiRequest } from '@/config/auth/types';
import NextConnectOptions from '@/config/nextConnect/NextConnectOptions';
import createNewBeerComment from '@/services/BeerComment/createNewBeerComment';
import { createRouter } from 'next-connect';
import { z } from 'zod';
import getCurrentUser from '@/config/nextConnect/middleware/getCurrentUser';
import { NextApiResponse } from 'next';
import CreateCommentValidationSchema from '@/services/schema/CommentSchema/CreateCommentValidationSchema';
interface CreateCommentRequest extends UserExtendedNextApiRequest {
body: z.infer<typeof CreateCommentValidationSchema>;
query: { id: string };
}
interface GetAllCommentsRequest extends UserExtendedNextApiRequest {
query: { id: string; page_size: string; page_num: string };
}
const createComment = async (
req: CreateCommentRequest,
res: NextApiResponse<z.infer<typeof APIResponseValidationSchema>>,
) => {
const { content, rating } = req.body;
const beerPostId = req.query.id;
const newBeerComment = await createNewBeerComment({
content,
rating,
beerPostId,
userId: req.user!.id,
});
res.status(201).json({
message: 'Beer comment created successfully',
statusCode: 201,
payload: newBeerComment,
success: true,
});
};
const getAll = async (
req: GetAllCommentsRequest,
res: NextApiResponse<z.infer<typeof APIResponseValidationSchema>>,
) => {
const beerPostId = req.query.id;
// eslint-disable-next-line @typescript-eslint/naming-convention
const { page_size, page_num } = req.query;
const comments = await getAllBeerComments({
beerPostId,
pageNum: parseInt(page_num, 10),
pageSize: parseInt(page_size, 10),
});
const count = await DBClient.instance.beerComment.count({ where: { beerPostId } });
res.setHeader('X-Total-Count', count);
res.status(200).json({
message: 'Beer comments fetched successfully',
statusCode: 200,
payload: comments,
success: true,
});
};
import {
createBeerPostComment,
getAllBeerPostComments,
} from '@/controllers/comments/beerComments';
const router = createRouter<
// I don't want to use any, but I can't figure out how to get the types to work
// @TODO: Fix this any type
any,
NextApiResponse<z.infer<typeof APIResponseValidationSchema>>
>();
@@ -83,7 +24,7 @@ router.post(
querySchema: z.object({ id: z.string().cuid() }),
}),
getCurrentUser,
createComment,
createBeerPostComment,
);
router.get(
@@ -94,7 +35,7 @@ router.get(
page_num: z.coerce.number().int().positive(),
}),
}),
getAll,
getAllBeerPostComments,
);
const handler = router.handler(NextConnectOptions);

66
src/pages/api/beers/styles/[id]/comments/index.ts
View File

@@ -1,77 +1,13 @@
import DBClient from '@/prisma/DBClient';
import validateRequest from '@/config/nextConnect/middleware/validateRequest';
import APIResponseValidationSchema from '@/validation/APIResponseValidationSchema';
import { UserExtendedNextApiRequest } from '@/config/auth/types';
import NextConnectOptions from '@/config/nextConnect/NextConnectOptions';
import { createRouter } from 'next-connect';
import { z } from 'zod';
import getCurrentUser from '@/config/nextConnect/middleware/getCurrentUser';
import { NextApiResponse } from 'next';
import CommentQueryResult from '@/services/schema/CommentSchema/CommentQueryResult';
import CreateCommentValidationSchema from '@/services/schema/CommentSchema/CreateCommentValidationSchema';
import createNewBeerStyleComment from '@/services/BeerStyleComment/createNewBeerStyleComment';
import getAllBeerStyleComments from '@/services/BeerStyleComment/getAllBeerStyleComments';
interface CreateCommentRequest extends UserExtendedNextApiRequest {
body: z.infer<typeof CreateCommentValidationSchema>;
query: { id: string };
}
interface GetAllCommentsRequest extends UserExtendedNextApiRequest {
query: { id: string; page_size: string; page_num: string };
}
const createComment = async (
req: CreateCommentRequest,
res: NextApiResponse<z.infer<typeof APIResponseValidationSchema>>,
) => {
const { content, rating } = req.body;
const newBeerStyleComment: z.infer<typeof CommentQueryResult> =
await createNewBeerStyleComment({
content,
rating,
beerStyleId: req.query.id,
userId: req.user!.id,
});
res.status(201).json({
message: 'Beer comment created successfully',
statusCode: 201,
payload: newBeerStyleComment,
success: true,
});
};
const getAll = async (
req: GetAllCommentsRequest,
res: NextApiResponse<z.infer<typeof APIResponseValidationSchema>>,
) => {
const beerStyleId = req.query.id;
// eslint-disable-next-line @typescript-eslint/naming-convention
const { page_size, page_num } = req.query;
const comments = await getAllBeerStyleComments({
beerStyleId,
pageNum: parseInt(page_num, 10),
pageSize: parseInt(page_size, 10),
});
const count = await DBClient.instance.beerStyleComment.count({
where: { beerStyleId },
});
res.setHeader('X-Total-Count', count);
res.status(200).json({
message: 'Beer comments fetched successfully',
statusCode: 200,
payload: comments,
success: true,
});
};
import { createComment, getAll } from '@/controllers/comments/beerStyleComments';
const router = createRouter<
// I don't want to use any, but I can't figure out how to get the types to work

73
src/pages/api/breweries/[id]/comments/index.ts
View File

@@ -1,11 +1,5 @@
/* eslint-disable @typescript-eslint/no-unused-vars */
import DBClient from '@/prisma/DBClient';
import createNewBeerComment from '@/services/BeerComment/createNewBeerComment';
import validateRequest from '@/config/nextConnect/middleware/validateRequest';
import APIResponseValidationSchema from '@/validation/APIResponseValidationSchema';
import { UserExtendedNextApiRequest } from '@/config/auth/types';
import NextConnectOptions from '@/config/nextConnect/NextConnectOptions';
import { createRouter } from 'next-connect';
@@ -13,73 +7,8 @@ import { z } from 'zod';
import getCurrentUser from '@/config/nextConnect/middleware/getCurrentUser';
import { NextApiResponse } from 'next';
import CommentQueryResult from '@/services/schema/CommentSchema/CommentQueryResult';
import getAllBreweryComments from '@/services/BreweryComment/getAllBreweryComments';
import CreateCommentValidationSchema from '@/services/schema/CommentSchema/CreateCommentValidationSchema';
import createNewBreweryComment from '@/services/BreweryComment/createNewBreweryComment';
interface CreateCommentRequest extends UserExtendedNextApiRequest {
body: z.infer<typeof CreateCommentValidationSchema>;
query: { id: string };
}
interface GetAllCommentsRequest extends UserExtendedNextApiRequest {
query: { id: string; page_size: string; page_num: string };
}
const createComment = async (
req: CreateCommentRequest,
res: NextApiResponse<z.infer<typeof APIResponseValidationSchema>>,
) => {
const { content, rating } = req.body;
const breweryPostId = req.query.id;
const user = req.user!;
const newBreweryComment: z.infer<typeof CommentQueryResult> =
await createNewBreweryComment({
content,
rating,
breweryPostId,
userId: user.id,
});
res.status(201).json({
message: 'Beer comment created successfully',
statusCode: 201,
payload: newBreweryComment,
success: true,
});
};
const getAll = async (
req: GetAllCommentsRequest,
res: NextApiResponse<z.infer<typeof APIResponseValidationSchema>>,
) => {
const breweryPostId = req.query.id;
// eslint-disable-next-line @typescript-eslint/naming-convention
const { page_size, page_num } = req.query;
const comments = await getAllBreweryComments({
id: breweryPostId,
pageNum: parseInt(page_num, 10),
pageSize: parseInt(page_size, 10),
});
const count = await DBClient.instance.breweryComment.count({
where: { breweryPostId },
});
res.setHeader('X-Total-Count', count);
res.status(200).json({
message: 'Beer comments fetched successfully',
statusCode: 200,
payload: comments,
success: true,
});
};
import { createComment, getAll } from '@/controllers/comments/breweryComments';
const router = createRouter<
// I don't want to use any, but I can't figure out how to get the types to work

11
src/pages/api/brewery-comments/[id].ts
View File

@@ -1,12 +1,13 @@
import getCurrentUser from '@/config/nextConnect/middleware/getCurrentUser';
import validateRequest from '@/config/nextConnect/middleware/validateRequest';
import NextConnectOptions from '@/config/nextConnect/NextConnectOptions';
import { checkIfBeerCommentOwner } from '@/controllers/beerComments';
import {
checkIfBreweryCommentOwner,
deleteBreweryPostComment,
editBreweryPostComment,
} from '@/controllers/breweryComments';
import { CommentRequest } from '@/controllers/requestTypes';
} from '@/controllers/comments/breweryComments';
import { CommentRequest } from '@/controllers/comments/types';
import CreateCommentValidationSchema from '@/services/schema/CommentSchema/CreateCommentValidationSchema';
@@ -26,7 +27,7 @@ router
querySchema: z.object({ id: z.string().cuid() }),
}),
getCurrentUser,
checkIfBeerCommentOwner,
checkIfBreweryCommentOwner,
deleteBreweryPostComment,
)
.put(
@@ -35,7 +36,7 @@ router
bodySchema: CreateCommentValidationSchema,
}),
getCurrentUser,
checkIfBeerCommentOwner,
checkIfBreweryCommentOwner,
editBreweryPostComment,
);