Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

fix(watchlist): correctly load more than 20 watchlist items #3351

Merged
merged 2 commits into from
Feb 24, 2023
Merged

fix(watchlist): correctly load more than 20 watchlist items #3351

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
38e8c5e
fix(discover): correctly load additional watchlist items pages
danshilm Feb 24, 2023
9212ec9
chore(discover): remove unused params types
danshilm Feb 24, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
8 changes: 4 additions & 4 deletions server/routes/discover.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -800,12 +800,12 @@ discoverRoutes.get<{ language: string }, GenreSliderItem[]>(
}
);

discoverRoutes.get<{ page?: number }, WatchlistResponse>(
discoverRoutes.get<Record<string, unknown>, WatchlistResponse>(
'/watchlist',
async (req, res) => {
const userRepository = getRepository(User);
const itemsPerPage = 20;
const page = req.params.page ?? 1;
const page = Number(req.query.page) ?? 1;
const offset = (page - 1) * itemsPerPage;

const activeUser = await userRepository.findOne({
Expand All @@ -829,8 +829,8 @@ discoverRoutes.get<{ page?: number }, WatchlistResponse>(

return res.json({
page,
totalPages: Math.ceil(watchlist.size / itemsPerPage),
totalResults: watchlist.size,
totalPages: Math.ceil(watchlist.totalSize / itemsPerPage),
totalResults: watchlist.totalSize,
results: watchlist.items.map((item) => ({
ratingKey: item.ratingKey,
title: item.title,
Expand Down
8 changes: 4 additions & 4 deletions server/routes/user/index.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -607,7 +607,7 @@ router.get<{ id: string }, UserWatchDataResponse>(
}
);

router.get<{ id: string; page?: number }, WatchlistResponse>(
router.get<{ id: string }, WatchlistResponse>(
'/:id/watchlist',
async (req, res, next) => {
if (
Expand All @@ -627,7 +627,7 @@ router.get<{ id: string; page?: number }, WatchlistResponse>(
}

const itemsPerPage = 20;
const page = req.params.page ?? 1;
const page = Number(req.query.page) ?? 1;
const offset = (page - 1) * itemsPerPage;

const user = await getRepository(User).findOneOrFail({
Expand All @@ -651,8 +651,8 @@ router.get<{ id: string; page?: number }, WatchlistResponse>(

return res.json({
page,
totalPages: Math.ceil(watchlist.size / itemsPerPage),
totalResults: watchlist.size,
totalPages: Math.ceil(watchlist.totalSize / itemsPerPage),
totalResults: watchlist.totalSize,
results: watchlist.items.map((item) => ({
ratingKey: item.ratingKey,
title: item.title,
Expand Down