Update new library item API endpoint to handle collapse series

This commit is contained in:
advplyr 2023-07-30 17:51:44 -05:00
parent 11120a3765
commit eeaf012cdc
6 changed files with 232 additions and 16 deletions

View file

@ -17,7 +17,7 @@ module.exports = (sequelize) => {
}
static getOldFeed(feedExpanded) {
const episodes = feedExpanded.feedEpisodes.map((feedEpisode) => feedEpisode.getOldEpisode())
const episodes = feedExpanded.feedEpisodes?.map((feedEpisode) => feedEpisode.getOldEpisode())
return new oldFeed({
id: feedExpanded.id,
slug: feedExpanded.slug,
@ -42,7 +42,7 @@ module.exports = (sequelize) => {
},
serverAddress: feedExpanded.serverAddress,
feedUrl: feedExpanded.feedURL,
episodes,
episodes: episodes || [],
createdAt: feedExpanded.createdAt.valueOf(),
updatedAt: feedExpanded.updatedAt.valueOf()
})

View file

@ -400,10 +400,22 @@ module.exports = (sequelize) => {
})
}
static async getByFilterAndSort(libraryId, userId, { filterBy, sortBy, sortDesc, limit, offset }) {
const { libraryItems, count } = await libraryFilters.getFilteredLibraryItems(libraryId, filterBy, sortBy, sortDesc, limit, offset, userId)
static async getByFilterAndSort(libraryId, userId, options) {
const { libraryItems, count } = await libraryFilters.getFilteredLibraryItems(libraryId, userId, options)
return {
libraryItems: libraryItems.map(ti => this.getOldLibraryItem(ti)),
libraryItems: libraryItems.map(li => {
const oldLibraryItem = this.getOldLibraryItem(li).toJSONMinified()
if (li.collapsedSeries) {
oldLibraryItem.collapsedSeries = li.collapsedSeries
}
if (li.series) {
oldLibraryItem.media.metadata.series = li.series
}
if (li.rssFeed) {
oldLibraryItem.rssFeed = sequelize.models.feed.getOldFeed(li.rssFeed).toJSONMinified()
}
return oldLibraryItem
}),
count
}
}