refactor: LibraryItemDto2

Author: aleksilassila

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<PaginatedResponseDto<LibraryItemDto2>> {
+  ): Promise<PaginatedResponseDto<LibraryItemDto>> {
     // const user = await this.userService.findOne(userId);
 
     const items = await this.libraryService.getLibraryItemDtos(

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 { MediaType } from 'src/common/common.dto';
 import { MovieMetadata, SeriesMetadata } from 'src/metadata/metadata.entity';
+import { TmdbMovie, TmdbSeries } from 'src/metadata/tmdb/tmdb.dto';
 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;
-}
 
 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) {

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<LibraryItemDto2[]> {
+  ): Promise<LibraryItemDto[]> {
     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,

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<SecurityDataType extends unknown> extends HttpClient<SecurityDa
 		getLibraryItems: (userId: string, params: RequestParams = {}) =>
 			this.request<
 				PaginatedResponseDto & {
-					items: LibraryItemDto2[];
+					items: LibraryItemDto[];
 				},
 				any
 			>({

src/lib/pages/LibraryPage/LibraryPage.svelte

@@ -1,5 +1,5 @@
 <script lang="ts">
-	import type { LibraryItemDto2 } from '$lib/apis/reiverr/reiverr.openapi';
+	import type { LibraryItemDto } from '$lib/apis/reiverr/reiverr.openapi';
 	import Button from '$lib/components/Button.svelte';
 	import Carousel from '$lib/components/Carousel/Carousel.svelte';
 	import Container from '$lib/components/Container.svelte';
@@ -33,9 +33,9 @@
 		[sortedLibraryItems, libraryViewSettings],
 		([items, viewSettings]) => {
 			let categorizedItems = {
-				upcoming: [] as LibraryItemDto2[],
-				main: [] as LibraryItemDto2[],
-				watched: [] as LibraryItemDto2[]
+				upcoming: [] as LibraryItemDto[],
+				main: [] as LibraryItemDto[],
+				watched: [] as LibraryItemDto[]
 			};
 
 			if (!viewSettings.separateUpcoming && !viewSettings.separateWatched) {
@@ -80,7 +80,7 @@
 	);
 
 	function sortItems(
-		items: LibraryItemDto2[] | undefined,
+		items: LibraryItemDto[] | undefined,
 		viewSettings: LibraryViewSettings,
 		category: 'all' | 'series' | 'movies'
 	) {