From 09e26a9e564e4540bff44633a31a82d048937c4d Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Rasmus=20Kr=C3=A4mer?= Date: Tue, 14 May 2024 10:51:50 +0200 Subject: [PATCH] Use new database models, fix function name and use optional path parameter --- server/controllers/MeController.js | 8 ++++---- server/routers/ApiRouter.js | 3 +-- 2 files changed, 5 insertions(+), 6 deletions(-) diff --git a/server/controllers/MeController.js b/server/controllers/MeController.js index d14c07e354..735728cab5 100644 --- a/server/controllers/MeController.js +++ b/server/controllers/MeController.js @@ -34,11 +34,11 @@ class MeController { } // GET: api/me/item/listening-sessions/:libraryItemId/:episodeId - async getListeningSessions(req, res) { - const libraryItem = await Database.libraryItemModel.getOldById(req.params.libraryItemId) - const episode = (req.params.episodeId && libraryItem && libraryItem.isPodcast) ? libraryItem.media.getEpisode(req.params.episodeId) : null + async getItemListeningSessions(req, res) { + const libraryItem = await Database.libraryItemModel.findByPk(req.params.libraryItemId) + const episode = await Database.podcastEpisodeModel.findByPk(req.params.episodeId) - if (!libraryItem || (libraryItem.isPodcast && !episode)) { + if (!libraryItem || (libraryItem.mediaType === "podcast" && !episode)) { Logger.error(`[PlaybackSessionManager] listening-sessions: Media item not found for library item id "${req.params.id}"`) return { success: false, diff --git a/server/routers/ApiRouter.js b/server/routers/ApiRouter.js index fc5d6a294c..2b7adacc4d 100644 --- a/server/routers/ApiRouter.js +++ b/server/routers/ApiRouter.js @@ -166,8 +166,7 @@ class ApiRouter { // this.router.get('/me', MeController.getCurrentUser.bind(this)) this.router.get('/me/listening-sessions', MeController.getListeningSessions.bind(this)) - this.router.get('/me/item/listening-sessions/:libraryItemId', MeController.getListeningSessions.bind(this)) - this.router.get('/me/item/listening-sessions/:libraryItemId/:episodeId', MeController.getListeningSessions.bind(this)) + this.router.get('/me/item/listening-sessions/:libraryItemId/:episodeId?', MeController.getItemListeningSessions.bind(this)) this.router.get('/me/listening-stats', MeController.getListeningStats.bind(this)) this.router.get('/me/progress/:id/remove-from-continue-listening', MeController.removeItemFromContinueListening.bind(this)) this.router.get('/me/progress/:id/:episodeId?', MeController.getMediaProgress.bind(this))