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

Refactor paginated query response schema

Browse Source
This commit is contained in:
Aaron William Po
2023-12-18 13:24:22 -05:00
parent 736e8ebf10
commit 386556bb41
9 changed files with 18 additions and 42 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -11,6 +11,7 @@ import {
createBeerPostComment,
getAllBeerPostComments,
} from '@/controllers/comments/beer-comments';
import PaginatedQueryResponseSchema from '@/services/schema/PaginatedQueryResponseSchema';
const router = createRouter<
// @TODO: Fix this any type
@@ -29,11 +30,7 @@ router.post(
router.get(
validateRequest({
querySchema: z.object({
id: z.string().cuid(),
page_size: z.coerce.number().int().positive(),
page_num: z.coerce.number().int().positive(),
}),
querySchema: PaginatedQueryResponseSchema.extend({ id: z.string().cuid() }),
}),
getAllBeerPostComments,
);

7
src/pages/api/beers/[id]/recommendations.ts
View File

@@ -2,6 +2,7 @@ import NextConnectOptions from '@/config/nextConnect/NextConnectOptions';
import validateRequest from '@/config/nextConnect/middleware/validateRequest';
import { getBeerPostRecommendations } from '@/controllers/posts/beer-posts';
import { GetBeerRecommendationsRequest } from '@/controllers/posts/beer-posts/types';
import PaginatedQueryResponseSchema from '@/services/schema/PaginatedQueryResponseSchema';
import APIResponseValidationSchema from '@/validation/APIResponseValidationSchema';
import { NextApiResponse } from 'next';
import { createRouter } from 'next-connect';
@@ -14,11 +15,7 @@ const router = createRouter<
router.get(
validateRequest({
querySchema: z.object({
id: z.string().cuid(),
page_num: z.string().regex(/^[0-9]+$/),
page_size: z.string().regex(/^[0-9]+$/),
}),
querySchema: PaginatedQueryResponseSchema.extend({ id: z.string().cuid() }),
}),
getBeerPostRecommendations,
);

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

@@ -1,6 +1,7 @@
import NextConnectOptions from '@/config/nextConnect/NextConnectOptions';
import validateRequest from '@/config/nextConnect/middleware/validateRequest';
import { getAllBeersByBeerStyle } from '@/controllers/posts/beer-styles';
import PaginatedQueryResponseSchema from '@/services/schema/PaginatedQueryResponseSchema';
import APIResponseValidationSchema from '@/validation/APIResponseValidationSchema';
import { NextApiRequest, NextApiResponse } from 'next';
@@ -18,11 +19,7 @@ const router = createRouter<
router.get(
validateRequest({
querySchema: z.object({
page_size: z.string().min(1),
page_num: z.string().min(1),
id: z.string().min(1),
}),
querySchema: PaginatedQueryResponseSchema.extend({ id: z.string().cuid() }),
}),
getAllBeersByBeerStyle,
);

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

@@ -8,6 +8,7 @@ import getCurrentUser from '@/config/nextConnect/middleware/getCurrentUser';
import { NextApiResponse } from 'next';
import CreateCommentValidationSchema from '@/services/schema/CommentSchema/CreateCommentValidationSchema';
import { createComment, getAll } from '@/controllers/comments/beer-style-comments';
import PaginatedQueryResponseSchema from '@/services/schema/PaginatedQueryResponseSchema';
const router = createRouter<
// I don't want to use any, but I can't figure out how to get the types to work
@@ -26,11 +27,7 @@ router.post(
router.get(
validateRequest({
querySchema: z.object({
id: z.string().cuid(),
page_size: z.coerce.number().int().positive(),
page_num: z.coerce.number().int().positive(),
}),
querySchema: PaginatedQueryResponseSchema.extend({ id: z.string().cuid() }),
}),
getAll,
);

7
src/pages/api/breweries/[id]/beers/index.ts
View File

@@ -2,6 +2,7 @@ import NextConnectOptions from '@/config/nextConnect/NextConnectOptions';
import validateRequest from '@/config/nextConnect/middleware/validateRequest';
import { getAllBeersByBrewery } from '@/controllers/posts/breweries';
import { GetAllPostsByConnectedPostId } from '@/controllers/posts/types';
import PaginatedQueryResponseSchema from '@/services/schema/PaginatedQueryResponseSchema';
import APIResponseValidationSchema from '@/validation/APIResponseValidationSchema';
import { NextApiResponse } from 'next';
import { createRouter } from 'next-connect';
@@ -14,11 +15,7 @@ const router = createRouter<
router.get(
validateRequest({
querySchema: z.object({
page_size: z.string().nonempty(),
page_num: z.string().nonempty(),
id: z.string().nonempty(),
}),
querySchema: PaginatedQueryResponseSchema.extend({ id: z.string().cuid() }),
}),
getAllBeersByBrewery,
);

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

@@ -9,6 +9,7 @@ import { NextApiResponse } from 'next';
import CreateCommentValidationSchema from '@/services/schema/CommentSchema/CreateCommentValidationSchema';
import { createComment, getAll } from '@/controllers/comments/brewery-comments';
import PaginatedQueryResponseSchema from '@/services/schema/PaginatedQueryResponseSchema';
const router = createRouter<
// I don't want to use any, but I can't figure out how to get the types to work
@@ -27,11 +28,7 @@ router.post(
router.get(
validateRequest({
querySchema: z.object({
id: z.string().cuid(),
page_size: z.coerce.number().int().positive(),
page_num: z.coerce.number().int().positive(),
}),
querySchema: PaginatedQueryResponseSchema.extend({ id: z.string().cuid() }),
}),
getAll,
);

7
src/pages/api/users/[id]/followers.ts
View File

@@ -2,6 +2,7 @@ import NextConnectOptions from '@/config/nextConnect/NextConnectOptions';
import validateRequest from '@/config/nextConnect/middleware/validateRequest';
import { getUserFollowers } from '@/controllers/users/profile';
import { GetUserFollowInfoRequest } from '@/controllers/users/profile/types';
import PaginatedQueryResponseSchema from '@/services/schema/PaginatedQueryResponseSchema';
import APIResponseValidationSchema from '@/validation/APIResponseValidationSchema';
import { NextApiResponse } from 'next';
@@ -15,11 +16,7 @@ const router = createRouter<
router.get(
validateRequest({
querySchema: z.object({
id: z.string().cuid(),
page_size: z.string().regex(/^\d+$/),
page_num: z.string().regex(/^\d+$/),
}),
querySchema: PaginatedQueryResponseSchema.extend({ id: z.string().cuid() }),
}),
getUserFollowers,
);

7
src/pages/api/users/[id]/following.ts
View File

@@ -2,6 +2,7 @@ import { UserExtendedNextApiRequest } from '@/config/auth/types';
import NextConnectOptions from '@/config/nextConnect/NextConnectOptions';
import validateRequest from '@/config/nextConnect/middleware/validateRequest';
import { getUsersFollowed } from '@/controllers/users/profile';
import PaginatedQueryResponseSchema from '@/services/schema/PaginatedQueryResponseSchema';
import APIResponseValidationSchema from '@/validation/APIResponseValidationSchema';
import { NextApiResponse } from 'next';
@@ -19,11 +20,7 @@ const router = createRouter<
router.get(
validateRequest({
querySchema: z.object({
id: z.string().cuid(),
page_size: z.string().regex(/^\d+$/),
page_num: z.string().regex(/^\d+$/),
}),
querySchema: PaginatedQueryResponseSchema.extend({ id: z.string().cuid() }),
}),
getUsersFollowed,
);

4
src/services/schema/PaginatedQueryResponseSchema.ts
View File

@@ -1,8 +1,8 @@
import { z } from 'zod';
const PaginatedQueryResponseSchema = z.object({
page_num: z.string(),
page_size: z.string(),
page_num: z.string().regex(/^\d+$/),
page_size: z.string().regex(/^\d+$/),
});
export default PaginatedQueryResponseSchema;