Merge branch 'main' into beer-styles-dev

This commit is contained in:
Aaron William Po
2023-10-01 18:21:19 -04:00
30 changed files with 254 additions and 141 deletions

View File

@@ -53,10 +53,11 @@ const getAll = async (
// eslint-disable-next-line @typescript-eslint/naming-convention
const { page_size, page_num } = req.query;
const comments = await getAllBeerComments(
{ id: beerPostId },
{ pageSize: parseInt(page_size, 10), pageNum: parseInt(page_num, 10) },
);
const comments = await getAllBeerComments({
beerPostId,
pageNum: parseInt(page_num, 10),
pageSize: parseInt(page_size, 10),
});
const pageCount = await DBClient.instance.beerComment.count({ where: { beerPostId } });

View File

@@ -37,7 +37,7 @@ const sendLikeRequest = async (
};
if (alreadyLiked) {
await removeBeerPostLikeById(alreadyLiked.id);
await removeBeerPostLikeById({ beerLikeId: alreadyLiked.id });
jsonResponse.message = 'Successfully unliked beer post';
} else {
await createBeerPostLike({ id, user });
@@ -53,7 +53,7 @@ const getLikeCount = async (
) => {
const id = req.query.id as string;
const likeCount = await getBeerPostLikeCount(id);
const likeCount = await getBeerPostLikeCount({ beerPostId: id });
res.status(200).json({
success: true,