chrisryn/requestarr
1
0
Fork 0
Code Issues Pull Requests Actions 2 Packages Projects Releases Wiki Activity

Fix duplicate identifier: rename externalServiceId to foreignId

Browse Source 
- Rename to avoid collision with existing externalServiceId column
- Update all references in MediaRequest entity
This commit is contained in:
root
2026-04-03 22:03:19 -05:00
parent 9a63f4a4dd
commit 2acb4fc4a4
2 changed files with 9 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
server/entity/Media.ts
View File

@@ -100,10 +100,10 @@ class Media {
@Column({ nullable: true }) @Column({ nullable: true })
@Index() @Index()
public externalServiceId?: string; public foreignId?: string;
@Column({ nullable: true }) @Column({ nullable: true })
public externalServiceTitle?: string; public foreignTitle?: string;
@Column({ type: 'int', default: MediaStatus.UNKNOWN }) @Column({ type: 'int', default: MediaStatus.UNKNOWN })
@Index() @Index()

14
server/entity/MediaRequest.ts
View File

@@ -156,7 +156,7 @@ export class MediaRequest {
let media = await mediaRepository.findOne({ let media = await mediaRepository.findOne({
where: isMusicOrBook where: isMusicOrBook
? { ? {
externalServiceId: requestBody.foreignId, foreignId: requestBody.foreignId,
mediaType: requestBody.mediaType, mediaType: requestBody.mediaType,
} }
: { : {
@@ -170,8 +170,8 @@ export class MediaRequest {
media = new Media({ media = new Media({
tmdbId: isMusicOrBook ? 0 : tmdbMedia.id, tmdbId: isMusicOrBook ? 0 : tmdbMedia.id,
tvdbId: isMusicOrBook ? 0 : (requestBody.tvdbId ?? tmdbMedia.external_ids?.tvdb_id), tvdbId: isMusicOrBook ? 0 : (requestBody.tvdbId ?? tmdbMedia.external_ids?.tvdb_id),
externalServiceId: isMusicOrBook ? requestBody.foreignId : undefined, foreignId: isMusicOrBook ? requestBody.foreignId : undefined,
externalServiceTitle: isMusicOrBook ? requestBody.foreignTitle : undefined, foreignTitle: isMusicOrBook ? requestBody.foreignTitle : undefined,
status: !requestBody.is4k ? MediaStatus.PENDING : MediaStatus.UNKNOWN, status: !requestBody.is4k ? MediaStatus.PENDING : MediaStatus.UNKNOWN,
status4k: requestBody.is4k ? MediaStatus.PENDING : MediaStatus.UNKNOWN, status4k: requestBody.is4k ? MediaStatus.PENDING : MediaStatus.UNKNOWN,
mediaType: requestBody.mediaType, mediaType: requestBody.mediaType,
@@ -206,7 +206,7 @@ export class MediaRequest {
}); });
if (isMusicOrBook) { if (isMusicOrBook) {
existingQuery.andWhere('media.externalServiceId = :foreignId', { existingQuery.andWhere('media.foreignId = :foreignId', {
foreignId: requestBody.foreignId, foreignId: requestBody.foreignId,
}); });
} else { } else {
@@ -570,7 +570,7 @@ export class MediaRequest {
let media = await mediaRepository.findOne({ let media = await mediaRepository.findOne({
where: { where: {
externalServiceId: requestBody.foreignId, foreignId: requestBody.foreignId,
mediaType: requestBody.mediaType, mediaType: requestBody.mediaType,
}, },
relations: ['requests'], relations: ['requests'],
@@ -580,8 +580,8 @@ export class MediaRequest {
media = new Media({ media = new Media({
tmdbId: 0, tmdbId: 0,
tvdbId: 0, tvdbId: 0,
externalServiceId: requestBody.foreignId, foreignId: requestBody.foreignId,
externalServiceTitle: requestBody.foreignTitle, foreignTitle: requestBody.foreignTitle,
status: MediaStatus.PENDING, status: MediaStatus.PENDING,
status4k: MediaStatus.UNKNOWN, status4k: MediaStatus.UNKNOWN,
mediaType: requestBody.mediaType, mediaType: requestBody.mediaType,