diff --git a/server/entity/Media.ts b/server/entity/Media.ts index 99801fc5..ab167dcc 100644 --- a/server/entity/Media.ts +++ b/server/entity/Media.ts @@ -100,10 +100,10 @@ class Media { @Column({ nullable: true }) @Index() - public externalServiceId?: string; + public foreignId?: string; @Column({ nullable: true }) - public externalServiceTitle?: string; + public foreignTitle?: string; @Column({ type: 'int', default: MediaStatus.UNKNOWN }) @Index() diff --git a/server/entity/MediaRequest.ts b/server/entity/MediaRequest.ts index 1172d118..5f22d040 100644 --- a/server/entity/MediaRequest.ts +++ b/server/entity/MediaRequest.ts @@ -156,7 +156,7 @@ export class MediaRequest { let media = await mediaRepository.findOne({ where: isMusicOrBook ? { - externalServiceId: requestBody.foreignId, + foreignId: requestBody.foreignId, mediaType: requestBody.mediaType, } : { @@ -170,8 +170,8 @@ export class MediaRequest { media = new Media({ tmdbId: isMusicOrBook ? 0 : tmdbMedia.id, tvdbId: isMusicOrBook ? 0 : (requestBody.tvdbId ?? tmdbMedia.external_ids?.tvdb_id), - externalServiceId: isMusicOrBook ? requestBody.foreignId : undefined, - externalServiceTitle: isMusicOrBook ? requestBody.foreignTitle : undefined, + foreignId: isMusicOrBook ? requestBody.foreignId : undefined, + foreignTitle: isMusicOrBook ? requestBody.foreignTitle : undefined, status: !requestBody.is4k ? MediaStatus.PENDING : MediaStatus.UNKNOWN, status4k: requestBody.is4k ? MediaStatus.PENDING : MediaStatus.UNKNOWN, mediaType: requestBody.mediaType, @@ -206,7 +206,7 @@ export class MediaRequest { }); if (isMusicOrBook) { - existingQuery.andWhere('media.externalServiceId = :foreignId', { + existingQuery.andWhere('media.foreignId = :foreignId', { foreignId: requestBody.foreignId, }); } else { @@ -570,7 +570,7 @@ export class MediaRequest { let media = await mediaRepository.findOne({ where: { - externalServiceId: requestBody.foreignId, + foreignId: requestBody.foreignId, mediaType: requestBody.mediaType, }, relations: ['requests'], @@ -580,8 +580,8 @@ export class MediaRequest { media = new Media({ tmdbId: 0, tvdbId: 0, - externalServiceId: requestBody.foreignId, - externalServiceTitle: requestBody.foreignTitle, + foreignId: requestBody.foreignId, + foreignTitle: requestBody.foreignTitle, status: MediaStatus.PENDING, status4k: MediaStatus.UNKNOWN, mediaType: requestBody.mediaType,