From fb1cb1d6b076657498f2384e3fafa3389bf38790 Mon Sep 17 00:00:00 2001 From: nobswebdev Date: Mon, 5 Oct 2026 22:14:26 +0200 Subject: [PATCH] add migration and entities for uploads upload_zk upload_hotlink. --- backend/src/AppModule.ts | 4 +- backend/src/database/migrations/.gitkeep | 0 .../1791230839246-add-upload-table.ts | 33 ++++++++++++++ backend/src/modules/upload/UploadModule.ts | 10 +++++ backend/src/modules/upload/entities/Upload.ts | 43 +++++++++++++++++++ .../modules/upload/entities/UploadHotlink.ts | 15 +++++++ .../src/modules/upload/entities/UploadZk.ts | 24 +++++++++++ .../src/modules/upload/types/UploadMode.ts | 4 ++ 8 files changed, 132 insertions(+), 1 deletion(-) delete mode 100644 backend/src/database/migrations/.gitkeep create mode 100644 backend/src/database/migrations/1791230839246-add-upload-table.ts create mode 100644 backend/src/modules/upload/UploadModule.ts create mode 100644 backend/src/modules/upload/entities/Upload.ts create mode 100644 backend/src/modules/upload/entities/UploadHotlink.ts create mode 100644 backend/src/modules/upload/entities/UploadZk.ts create mode 100644 backend/src/modules/upload/types/UploadMode.ts diff --git a/backend/src/AppModule.ts b/backend/src/AppModule.ts index b95f46b..ab62659 100644 --- a/backend/src/AppModule.ts +++ b/backend/src/AppModule.ts @@ -3,6 +3,7 @@ import { ConfigModule, ConfigService, registerAs } from '@nestjs/config'; import { TypeOrmModule } from '@nestjs/typeorm'; import { getAppConfig, getPostgresConfig } from './config'; import { HealthCheckModule } from './modules/healthCheck/HealthCheckModule'; +import { UploadModule } from './modules/upload/UploadModule'; import { Config } from './types/Config'; @Module({ @@ -15,7 +16,8 @@ import { Config } from './types/Config'; useFactory: (configService: ConfigService) => configService.get('postgres') as Config['postgres'], inject: [ConfigService] }), - HealthCheckModule + HealthCheckModule, + UploadModule ] }) export class AppModule {} diff --git a/backend/src/database/migrations/.gitkeep b/backend/src/database/migrations/.gitkeep deleted file mode 100644 index e69de29..0000000 diff --git a/backend/src/database/migrations/1791230839246-add-upload-table.ts b/backend/src/database/migrations/1791230839246-add-upload-table.ts new file mode 100644 index 0000000..67a739f --- /dev/null +++ b/backend/src/database/migrations/1791230839246-add-upload-table.ts @@ -0,0 +1,33 @@ +import { MigrationInterface, QueryRunner } from 'typeorm'; + +export class AddUploadTable1791230839246 implements MigrationInterface { + name = 'AddUploadTable1791230839246'; + + public async up(queryRunner: QueryRunner): Promise { + await queryRunner.query( + `CREATE TABLE "upload_zk" ("id" uuid NOT NULL DEFAULT uuid_generate_v4(), "passwordProtected" boolean NOT NULL DEFAULT false, "wrappedDek" bytea, "wrapIv" bytea, "salt" bytea, "uploadId" uuid, CONSTRAINT "REL_690bb5d62da9aed77980cb1106" UNIQUE ("uploadId"), CONSTRAINT "PK_8e9c09159715a88387bc8a1fa4a" PRIMARY KEY ("id"))` + ); + await queryRunner.query(`CREATE TYPE "public"."uploads_mode_enum" AS ENUM('zk', 'hotlink')`); + await queryRunner.query( + `CREATE TABLE "uploads" ("id" uuid NOT NULL DEFAULT uuid_generate_v4(), "mode" "public"."uploads_mode_enum" NOT NULL, "storagePath" text NOT NULL, "iv" bytea NOT NULL, "maxViews" integer, "viewCount" integer NOT NULL DEFAULT '0', "lastViewedAt" TIMESTAMP WITH TIME ZONE, "deleteTokenHash" character varying NOT NULL, "expiresAt" TIMESTAMP WITH TIME ZONE, "createdAt" TIMESTAMP WITH TIME ZONE NOT NULL DEFAULT now(), CONSTRAINT "PK_d1781d1eedd7459314f60f39bd3" PRIMARY KEY ("id"))` + ); + await queryRunner.query( + `CREATE TABLE "upload_hotlink" ("id" uuid NOT NULL DEFAULT uuid_generate_v4(), "mimeType" character varying NOT NULL, "uploadId" uuid, CONSTRAINT "REL_05156f9756799f6aecfcc14c10" UNIQUE ("uploadId"), CONSTRAINT "PK_abe0f3d297ad4c63773135691a4" PRIMARY KEY ("id"))` + ); + await queryRunner.query( + `ALTER TABLE "upload_zk" ADD CONSTRAINT "FK_690bb5d62da9aed77980cb11067" FOREIGN KEY ("uploadId") REFERENCES "uploads"("id") ON DELETE CASCADE ON UPDATE NO ACTION` + ); + await queryRunner.query( + `ALTER TABLE "upload_hotlink" ADD CONSTRAINT "FK_05156f9756799f6aecfcc14c108" FOREIGN KEY ("uploadId") REFERENCES "uploads"("id") ON DELETE CASCADE ON UPDATE NO ACTION` + ); + } + + public async down(queryRunner: QueryRunner): Promise { + await queryRunner.query(`ALTER TABLE "upload_hotlink" DROP CONSTRAINT "FK_05156f9756799f6aecfcc14c108"`); + await queryRunner.query(`ALTER TABLE "upload_zk" DROP CONSTRAINT "FK_690bb5d62da9aed77980cb11067"`); + await queryRunner.query(`DROP TABLE "upload_hotlink"`); + await queryRunner.query(`DROP TABLE "uploads"`); + await queryRunner.query(`DROP TYPE "public"."uploads_mode_enum"`); + await queryRunner.query(`DROP TABLE "upload_zk"`); + } +} diff --git a/backend/src/modules/upload/UploadModule.ts b/backend/src/modules/upload/UploadModule.ts new file mode 100644 index 0000000..788ff16 --- /dev/null +++ b/backend/src/modules/upload/UploadModule.ts @@ -0,0 +1,10 @@ +import { Module } from '@nestjs/common'; +import { TypeOrmModule } from '@nestjs/typeorm'; +import { Upload } from './entities/Upload'; +import { UploadHotlink } from './entities/UploadHotlink'; +import { UploadZk } from './entities/UploadZk'; + +@Module({ + imports: [TypeOrmModule.forFeature([Upload, UploadZk, UploadHotlink])] +}) +export class UploadModule {} diff --git a/backend/src/modules/upload/entities/Upload.ts b/backend/src/modules/upload/entities/Upload.ts new file mode 100644 index 0000000..3d45923 --- /dev/null +++ b/backend/src/modules/upload/entities/Upload.ts @@ -0,0 +1,43 @@ +import { Column, CreateDateColumn, Entity, OneToOne, PrimaryGeneratedColumn } from 'typeorm'; +import { UploadMode } from '../types/UploadMode'; +import { UploadHotlink } from './UploadHotlink'; +import { UploadZk } from './UploadZk'; + +@Entity('uploads') +export class Upload { + @PrimaryGeneratedColumn('uuid') + id: string; + + @Column({ type: 'enum', enum: UploadMode }) + mode: UploadMode; + + @Column({ type: 'text' }) + storagePath: string; + + @Column({ type: 'bytea' }) + iv: Buffer; + + @Column({ type: 'int', nullable: true }) + maxViews: number | null; + + @Column({ type: 'int', default: 0 }) + viewCount: number; + + @Column() + deleteTokenHash: string; + + @OneToOne(() => UploadZk, zk => zk.upload) + zk: UploadZk | null; + + @OneToOne(() => UploadHotlink, hotlink => hotlink.upload) + hotlink: UploadHotlink | null; + + @Column({ type: 'timestamptz', nullable: true }) + lastViewedAt: Date | null; + + @Column({ type: 'timestamptz', nullable: true }) + expiresAt: Date | null; + + @CreateDateColumn({ type: 'timestamptz' }) + createdAt: Date; +} diff --git a/backend/src/modules/upload/entities/UploadHotlink.ts b/backend/src/modules/upload/entities/UploadHotlink.ts new file mode 100644 index 0000000..3b7bf74 --- /dev/null +++ b/backend/src/modules/upload/entities/UploadHotlink.ts @@ -0,0 +1,15 @@ +import { Column, Entity, JoinColumn, OneToOne, PrimaryGeneratedColumn } from 'typeorm'; +import { Upload } from './Upload'; + +@Entity('upload_hotlink') +export class UploadHotlink { + @PrimaryGeneratedColumn('uuid') + id: string; + + @Column() + mimeType: string; + + @OneToOne(() => Upload, upload => upload.hotlink, { onDelete: 'CASCADE' }) + @JoinColumn() + upload: Upload; +} diff --git a/backend/src/modules/upload/entities/UploadZk.ts b/backend/src/modules/upload/entities/UploadZk.ts new file mode 100644 index 0000000..504dd0d --- /dev/null +++ b/backend/src/modules/upload/entities/UploadZk.ts @@ -0,0 +1,24 @@ +import { Column, Entity, JoinColumn, OneToOne, PrimaryGeneratedColumn } from 'typeorm'; +import { Upload } from './Upload'; + +@Entity('upload_zk') +export class UploadZk { + @PrimaryGeneratedColumn('uuid') + id: string; + + @Column({ type: 'boolean', default: false }) + passwordProtected: boolean; + + @Column({ type: 'bytea', nullable: true }) + wrappedDek: Buffer | null; + + @Column({ type: 'bytea', nullable: true }) + wrapIv: Buffer | null; + + @Column({ type: 'bytea', nullable: true }) + salt: Buffer | null; + + @OneToOne(() => Upload, upload => upload.zk, { onDelete: 'CASCADE' }) + @JoinColumn() + upload: Upload; +} diff --git a/backend/src/modules/upload/types/UploadMode.ts b/backend/src/modules/upload/types/UploadMode.ts new file mode 100644 index 0000000..0ebf739 --- /dev/null +++ b/backend/src/modules/upload/types/UploadMode.ts @@ -0,0 +1,4 @@ +export enum UploadMode { + Zk = 'zk', + Hotlink = 'hotlink' +}