diff --git a/backend/src/user-data/library/library.controller.ts b/backend/src/user-data/library/library.controller.ts index 71e4baa..5010d09 100644 --- a/backend/src/user-data/library/library.controller.ts +++ b/backend/src/user-data/library/library.controller.ts @@ -20,7 +20,7 @@ import { PaginationParamsDto, SuccessResponseDto, } from 'src/common/common.dto'; -import { LibraryItemDto2 } from './library.dto'; +import { LibraryItemDto } from './library.dto'; import { LibraryService } from './library.service'; @ApiTags('users') @@ -30,11 +30,11 @@ export class LibraryController { constructor(private libraryService: LibraryService) {} @Get() - @PaginatedApiOkResponse(LibraryItemDto2) + @PaginatedApiOkResponse(LibraryItemDto) async getLibraryItems( @GetPaginationParams() pagination: PaginationParamsDto, @Param('userId') userId: string, - ): Promise> { + ): Promise> { // const user = await this.userService.findOne(userId); const items = await this.libraryService.getLibraryItemDtos( diff --git a/backend/src/user-data/library/library.dto.ts b/backend/src/user-data/library/library.dto.ts index 93cd304..c911df0 100644 --- a/backend/src/user-data/library/library.dto.ts +++ b/backend/src/user-data/library/library.dto.ts @@ -1,29 +1,8 @@ import { ApiProperty, PickType } from '@nestjs/swagger'; -import { MovieDto } from 'src/metadata/metadata.dto'; -import { MovieMetadata, SeriesMetadata } from 'src/metadata/metadata.entity'; -import { LibraryItem } from './library.entity'; -import { - TmdbMovie, - TmdbMovieFull, - TmdbSeries, -} from 'src/metadata/tmdb/tmdb.dto'; import { MediaType } from 'src/common/common.dto'; - -export class LibraryItemDto extends PickType(LibraryItem, [ - 'tmdbId', - 'mediaType', - 'playStates', - 'createdAt', -]) { - @ApiProperty({ type: MovieDto, required: false }) - movieMetadata?: MovieDto; - - @ApiProperty({ type: SeriesMetadata, required: false }) - seriesMetadata?: SeriesMetadata; - - @ApiProperty({ required: false }) - watched?: boolean; -} +import { MovieMetadata, SeriesMetadata } from 'src/metadata/metadata.entity'; +import { TmdbMovie, TmdbSeries } from 'src/metadata/tmdb/tmdb.dto'; +import { LibraryItem } from './library.entity'; class NextEpisodeToAir { @ApiProperty({ required: false }) @@ -56,7 +35,7 @@ class Season { vote_average?: number; } -export class LibraryItemDto2 +export class LibraryItemDto extends PickType(LibraryItem, [ 'tmdbId', 'mediaType', @@ -113,7 +92,7 @@ export class LibraryItemDto2 libraryItem: LibraryItem; movieMetadata?: MovieMetadata; seriesMetadata?: SeriesMetadata; - }): LibraryItemDto2 { + }): LibraryItemDto { const { libraryItem, movieMetadata, seriesMetadata } = options; if (!movieMetadata && !seriesMetadata) { diff --git a/backend/src/user-data/library/library.service.ts b/backend/src/user-data/library/library.service.ts index 51217d5..fee8c33 100644 --- a/backend/src/user-data/library/library.service.ts +++ b/backend/src/user-data/library/library.service.ts @@ -2,7 +2,7 @@ import { Inject, Injectable } from '@nestjs/common'; import { MediaType, PaginationParamsDto } from 'src/common/common.dto'; import { MetadataService } from 'src/metadata/metadata.service'; import { Repository } from 'typeorm'; -import { LibraryItemDto2 } from './library.dto'; +import { LibraryItemDto } from './library.dto'; import { LibraryItem } from './library.entity'; import { USER_LIBRARY_REPOSITORY } from './library.providers'; @@ -17,7 +17,7 @@ export class LibraryService { async getLibraryItemDtos( userId: string, pagination: PaginationParamsDto, - ): Promise { + ): Promise { const items = await this.getLibraryItems(userId, pagination); return Promise.all( @@ -31,7 +31,7 @@ export class LibraryService { ? await this.metadataService.getMovieByTmdbId(item.tmdbId) : undefined; - return LibraryItemDto2.create({ + return LibraryItemDto.create({ libraryItem: item, seriesMetadata, movieMetadata, diff --git a/src/lib/apis/reiverr/reiverr.openapi.ts b/src/lib/apis/reiverr/reiverr.openapi.ts index d2316e7..e06d993 100644 --- a/src/lib/apis/reiverr/reiverr.openapi.ts +++ b/src/lib/apis/reiverr/reiverr.openapi.ts @@ -529,7 +529,7 @@ export interface Season { vote_average?: number; } -export interface LibraryItemDto2 { +export interface LibraryItemDto { tmdbId: string; mediaType: 'Movie' | 'Series' | 'Episode'; playStates?: PlayStateDto[]; @@ -1033,7 +1033,7 @@ export class Api extends HttpClient this.request< PaginatedResponseDto & { - items: LibraryItemDto2[]; + items: LibraryItemDto[]; }, any >({ diff --git a/src/lib/pages/LibraryPage/LibraryPage.svelte b/src/lib/pages/LibraryPage/LibraryPage.svelte index aa033d9..dbf6a9e 100644 --- a/src/lib/pages/LibraryPage/LibraryPage.svelte +++ b/src/lib/pages/LibraryPage/LibraryPage.svelte @@ -1,5 +1,5 @@