mirror of
https://github.com/fallenbagel/jellyseerr.git
synced 2025-12-24 02:39:18 -05:00
* fix(entity): use TIMESTAMPTZ in Postgres and sort issue comments oldest-first Switch key datetime columns to TIMESTAMPTZ for proper UTC handling (“just now”) and sort issue comments on load so the original description stays first and in proper sorted order in fix-pgsql-timezone fixes #1569, fixes #1568 * refactor(migration): manually rewrite pgsql migration to preserve existing data Typeorm generated migration was dropping the entire column thus leading to data loss so this is an attempt at manually rewriting the migration to preserve the data * refactor(migrations): rename to be consistent with other migration files * fix: use id to order instead of createdAt to avoid non-existant createdAt --------- Co-authored-by: Gauthier <mail@gauthierth.fr>
105 lines
2.6 KiB
TypeScript
105 lines
2.6 KiB
TypeScript
import { MediaStatus, type MediaType } from '@server/constants/media';
|
|
import dataSource from '@server/datasource';
|
|
import Media from '@server/entity/Media';
|
|
import { User } from '@server/entity/User';
|
|
import type { BlacklistItem } from '@server/interfaces/api/blacklistInterfaces';
|
|
import { DbAwareColumn } from '@server/utils/DbColumnHelper';
|
|
import type { EntityManager } from 'typeorm';
|
|
import {
|
|
Column,
|
|
Entity,
|
|
Index,
|
|
JoinColumn,
|
|
ManyToOne,
|
|
OneToOne,
|
|
PrimaryGeneratedColumn,
|
|
Unique,
|
|
} from 'typeorm';
|
|
import type { ZodNumber, ZodOptional, ZodString } from 'zod';
|
|
|
|
@Entity()
|
|
@Unique(['tmdbId'])
|
|
export class Blacklist implements BlacklistItem {
|
|
@PrimaryGeneratedColumn()
|
|
public id: number;
|
|
|
|
@Column({ type: 'varchar' })
|
|
public mediaType: MediaType;
|
|
|
|
@Column({ nullable: true, type: 'varchar' })
|
|
title?: string;
|
|
|
|
@Column()
|
|
@Index()
|
|
public tmdbId: number;
|
|
|
|
@ManyToOne(() => User, (user) => user.id, {
|
|
eager: true,
|
|
})
|
|
user?: User;
|
|
|
|
@OneToOne(() => Media, (media) => media.blacklist, {
|
|
onDelete: 'CASCADE',
|
|
})
|
|
@JoinColumn()
|
|
public media: Media;
|
|
|
|
@Column({ nullable: true, type: 'varchar' })
|
|
public blacklistedTags?: string;
|
|
|
|
@DbAwareColumn({ type: 'datetime', default: () => 'CURRENT_TIMESTAMP' })
|
|
public createdAt: Date;
|
|
|
|
constructor(init?: Partial<Blacklist>) {
|
|
Object.assign(this, init);
|
|
}
|
|
|
|
public static async addToBlacklist(
|
|
{
|
|
blacklistRequest,
|
|
}: {
|
|
blacklistRequest: {
|
|
mediaType: MediaType;
|
|
title?: ZodOptional<ZodString>['_output'];
|
|
tmdbId: ZodNumber['_output'];
|
|
blacklistedTags?: string;
|
|
};
|
|
},
|
|
entityManager?: EntityManager
|
|
): Promise<void> {
|
|
const em = entityManager ?? dataSource;
|
|
const blacklist = new this({
|
|
...blacklistRequest,
|
|
});
|
|
|
|
const mediaRepository = em.getRepository(Media);
|
|
let media = await mediaRepository.findOne({
|
|
where: {
|
|
tmdbId: blacklistRequest.tmdbId,
|
|
},
|
|
});
|
|
|
|
const blacklistRepository = em.getRepository(this);
|
|
|
|
await blacklistRepository.save(blacklist);
|
|
|
|
if (!media) {
|
|
media = new Media({
|
|
tmdbId: blacklistRequest.tmdbId,
|
|
status: MediaStatus.BLACKLISTED,
|
|
status4k: MediaStatus.BLACKLISTED,
|
|
mediaType: blacklistRequest.mediaType,
|
|
blacklist: Promise.resolve(blacklist),
|
|
});
|
|
|
|
await mediaRepository.save(media);
|
|
} else {
|
|
media.blacklist = Promise.resolve(blacklist);
|
|
media.status = MediaStatus.BLACKLISTED;
|
|
media.status4k = MediaStatus.BLACKLISTED;
|
|
|
|
await mediaRepository.save(media);
|
|
}
|
|
}
|
|
}
|