refactor: removed unnecessary import

V1.7.0/postgresql dev merge

.github/ISSUE_TEMPLATE/bug.yml

@@ -55,6 +55,14 @@ body:
         - tablet
     validations:
       required: true
+  - type: dropdown
+    id: database
+    attributes:
+      options:
+        - SQLite (default)
+        - PostgreSQL
+      label: Database
+      description: Which database backend are you using?
   - type: input
     id: device
     attributes:

docker-compose.postgres.yaml

@@ -0,0 +1,38 @@
+---
+version: '3.8'
+services:
+  jellyseerr:
+    build:
+      context: .
+      dockerfile: Dockerfile.local
+    ports:
+      - '5055:5055'
+    environment:
+      DB_TYPE: 'postgres' # Which DB engine to use. The default is "sqlite". To use postgres, this needs to be set to "postgres"
+      DB_HOST: 'postgres' # The host (url) of the database
+      DB_PORT: '5432' # The port to connect to
+      DB_USER: 'jellyseerr' # Username used to connect to the database
+      DB_PASS: 'jellyseerr' # Password of the user used to connect to the database
+      DB_NAME: 'jellyseerr' # The name of the database to connect to
+      DB_LOG_QUERIES: 'false' # Whether to log the DB queries for debugging
+      DB_USE_SSL: 'false' # Whether to enable ssl for database connection
+    volumes:
+      - .:/app:rw,cached
+      - /app/node_modules
+      - /app/.next
+    depends_on:
+      - postgres
+    links:
+      - postgres
+  postgres:
+    image: postgres
+    environment:
+      POSTGRES_USER: jellyseerr
+      POSTGRES_PASSWORD: jellyseerr
+      POSTGRES_DB: jellyseerr
+    ports:
+      - '5432:5432'
+    volumes:
+      - postgres:/var/lib/postgresql/data
+volumes:
+  postgres:

docs/README.md

@@ -17,6 +17,7 @@ Welcome to the Jellyseerr Documentation.
 - **Mobile-friendly design**, for when you need to approve requests on the go.
 - Granular permission system.
 - Localization into other languages.
+- Support for PostgreSQL and SQLite databases.
 - More features to come!
 
 ## Motivation

docs/extending-jellyseerr/database-config.mdx

@@ -0,0 +1,56 @@
+---
+title: Configuring the Database (Advanced)
+description: Configure the database for Jellyseerr
+sidebar_position: 2
+---
+# Configuring the Database
+
+Jellyseerr supports SQLite and PostgreSQL. The database connection can be configured using the following environment variables:
+
+## SQLite Options
+
+```dotenv
+DB_TYPE="sqlite" # Which DB engine to use, either "sqlite" or "postgres". The default is "sqlite".
+CONFIG_DIRECTORY="config" # (optional) The path to the config directory where the db file is stored. The default is "config".
+DB_LOG_QUERIES="false" # (optional) Whether to log the DB queries for debugging. The default is "false".
+```
+
+## PostgreSQL Options
+
+```dotenv
+DB_TYPE="postgres" # Which DB engine to use, either "sqlite" or "postgres". The default is "sqlite". To use postgres, this needs to be set to "postgres"
+DB_HOST="localhost" # (optional) The host (url) of the database. The default is "localhost".
+DB_PORT="5432" # (optional) The port to connect to. The default is "5432".
+DB_USER= # (required) Username used to connect to the database
+DB_PASS= # (required) Password of the user used to connect to the database
+DB_NAME="jellyseerr" # (optional) The name of the database to connect to. The default is "jellyseerr".
+DB_LOG_QUERIES="false" # (optional) Whether to log the DB queries for debugging. The default is "false".
+```
+
+### SSL configuration
+The following options can be used to further configure ssl. Certificates can be provided as a string or a file path, with the string version taking precedence.
+
+```dotenv
+DB_USE_SSL="false" # (optional) Whether to enable ssl for database connection. This must be "true" to use the other ssl options. The default is "false".
+DB_SSL_REJECT_UNAUTHORIZED="true" # (optional) Whether to reject ssl connections with unverifiable certificates i.e. self-signed certificates without providing the below settings. The default is "true".
+DB_SSL_CA= # (optional) The CA certificate to verify the connection, provided as a string. The default is "".
+DB_SSL_CA_FILE= # (optional) The path to a CA certificate to verify the connection. The default is "".
+DB_SSL_KEY= # (optional) The private key for the connection in PEM format, provided as a string. The default is "".
+DB_SSL_KEY_FILE= # (optinal) Path to the private key for the connection in PEM format. The default is "".
+DB_SSL_CERT= # (optional) Certificate chain in pem format for the private key, provided as a string. The default is "".
+DB_SSL_CERT_FILE= # (optional) Path to certificate chain in pem format for the private key. The default is "".
+```
+
+### Migrating from SQLite to PostgreSQL
+
+1. Set up your PostgreSQL database and configure Jellyseerr to use it
+2. Run Jellyseerr to create the tables in the PostgreSQL database
+3. Stop Jellyseerr
+4. Run the following command to export the data from the SQLite database and import it into the PostgreSQL database:
+- Edit the postgres connection string to match your setup
+- WARNING: The most recent release of pgloader has an issue quoting the table columns. Use the version in the docker container to avoid this issue.
+- "I don't have or don't want to use docker" - You can build the working pgloader version [in this PR](https://github.com/dimitri/pgloader/pull/1531) from source and use the same options as below.
+```bash
+docker run --rm -v config/db.sqlite3:/db.sqlite3:ro -v pgloader/pgloader.load:/pgloader.load ghcr.io/ralgar/pgloader:pr-1531 pgloader --with "quote identifiers" --with "data only" /db.sqlite3 postgresql://{{DB_USER}}:{{DB_PASS}}@{{DB_HOST}}:{{DB_PORT}}/{{DB_NAME}}
+   ```
+5. Start Jellyseerr

package.json

@@ -69,6 +69,7 @@
     "node-schedule": "2.1.1",
     "nodemailer": "6.9.1",
     "openpgp": "5.7.0",
+    "pg": "8.11.0",
     "plex-api": "5.3.2",
     "pug": "3.0.2",
     "react": "^18.3.1",

pnpm-lock.yaml

@@ -49,7 +49,7 @@ importers:
         version: 2.11.0
       connect-typeorm:
         specifier: 1.1.4
-        version: 1.1.4(typeorm@0.3.11(sqlite3@5.1.4(encoding@0.1.13))(ts-node@10.9.1(@swc/core@1.6.5(@swc/helpers@0.5.11))(@types/node@20.14.8)(typescript@4.9.5)))
+        version: 1.1.4(typeorm@0.3.11(pg@8.11.0)(sqlite3@5.1.4(encoding@0.1.13))(ts-node@10.9.1(@swc/core@1.6.5(@swc/helpers@0.5.11))(@types/node@20.14.8)(typescript@4.9.5)))
       cookie-parser:
         specifier: 1.4.6
         version: 1.4.6
@@ -119,6 +119,9 @@ importers:
       openpgp:
         specifier: 5.7.0
         version: 5.7.0
+      pg:
+        specifier: 8.11.0
+        version: 8.11.0
       plex-api:
         specifier: 5.3.2
         version: 5.3.2
@@ -193,7 +196,7 @@ importers:
         version: 2.2.5(react@18.3.1)
       typeorm:
         specifier: 0.3.11
-        version: 0.3.11(sqlite3@5.1.4(encoding@0.1.13))(ts-node@10.9.1(@swc/core@1.6.5(@swc/helpers@0.5.11))(@types/node@20.14.8)(typescript@4.9.5))
+        version: 0.3.11(pg@8.11.0)(sqlite3@5.1.4(encoding@0.1.13))(ts-node@10.9.1(@swc/core@1.6.5(@swc/helpers@0.5.11))(@types/node@20.14.8)(typescript@4.9.5))
       undici:
         specifier: ^6.20.1
         version: 6.20.1
@@ -3530,6 +3533,10 @@ packages:
   buffer-from@1.1.2:
     resolution: {integrity: sha512-E+XQCRwSbaaiChtv6k6Dwgc+bx+Bs6vuKJHHl5kox/BaKbhiXzqQOwK4cO22yElGp2OCmjwVhT3HmxgyPGnJfQ==}
 
+  buffer-writer@2.0.0:
+    resolution: {integrity: sha512-a7ZpuTZU1TRtnwyCNW3I5dc0wWNC3VR9S++Ewyk2HHZdrO3CQJqSpd+95Us590V6AL7JqUAH2IwZ/398PmNFgw==}
+    engines: {node: '>=4'}
+
   buffer@5.7.1:
     resolution: {integrity: sha512-EHcyIPBQ4BSGlvjB16k5KgAJ27CIsHY/2JBmCRReo48y9rQ3MaUzWX3KVlBa4U7MyX02HdVj0K7C3WaB3ju7FQ==}
 
@@ -7050,6 +7057,9 @@ packages:
     resolution: {integrity: sha512-wpgERjNkLrBiFmkMEjuZJEWKKDrNfHCKA1OhyN1wg1FrLkULbviEy6py1AyJUgZ72YWFbZ38FIpnqvVqAlDUwA==}
     engines: {node: '>=8'}
 
+  packet-reader@1.0.0:
+    resolution: {integrity: sha512-HAKu/fG3HpHFO0AA8WE8q2g+gBJaZ9MG7fcKk+IJPLTGAD6Psw4443l+9DGRbOIh3/aXr7Phy0TjilYivJo5XQ==}
+
   parent-module@1.0.1:
     resolution: {integrity: sha512-GQ2EWRpQV8/o+Aw8YqtfZZPfNRWZYkbidE9k5rpl/hC3vtHHBfGm2Ifi6qWV+coDGkrUKZAxE3Lot5kcsRlh+g==}
     engines: {node: '>=6'}
@@ -7141,6 +7151,40 @@ packages:
   performance-now@2.1.0:
     resolution: {integrity: sha512-7EAHlyLHI56VEIdK57uwHdHKIaAGbnXPiw0yWbarQZOKaKpvUIgW0jWRVLiatnM+XXlSwsanIBH/hzGMJulMow==}
 
+  pg-cloudflare@1.1.1:
+    resolution: {integrity: sha512-xWPagP/4B6BgFO+EKz3JONXv3YDgvkbVrGw2mTo3D6tVDQRh1e7cqVGvyR3BE+eQgAvx1XhW/iEASj4/jCWl3Q==}
+
+  pg-connection-string@2.7.0:
+    resolution: {integrity: sha512-PI2W9mv53rXJQEOb8xNR8lH7Hr+EKa6oJa38zsK0S/ky2er16ios1wLKhZyxzD7jUReiWokc9WK5nxSnC7W1TA==}
+
+  pg-int8@1.0.1:
+    resolution: {integrity: sha512-WCtabS6t3c8SkpDBUlb1kjOs7l66xsGdKpIPZsg4wR+B3+u9UAum2odSsF9tnvxg80h4ZxLWMy4pRjOsFIqQpw==}
+    engines: {node: '>=4.0.0'}
+
+  pg-pool@3.7.0:
+    resolution: {integrity: sha512-ZOBQForurqh4zZWjrgSwwAtzJ7QiRX0ovFkZr2klsen3Nm0aoh33Ls0fzfv3imeH/nw/O27cjdz5kzYJfeGp/g==}
+    peerDependencies:
+      pg: '>=8.0'
+
+  pg-protocol@1.7.0:
+    resolution: {integrity: sha512-hTK/mE36i8fDDhgDFjy6xNOG+LCorxLG3WO17tku+ij6sVHXh1jQUJ8hYAnRhNla4QVD2H8er/FOjc/+EgC6yQ==}
+
+  pg-types@2.2.0:
+    resolution: {integrity: sha512-qTAAlrEsl8s4OiEQY69wDvcMIdQN6wdz5ojQiOy6YRMuynxenON0O5oCpJI6lshc6scgAY8qvJ2On/p+CXY0GA==}
+    engines: {node: '>=4'}
+
+  pg@8.11.0:
+    resolution: {integrity: sha512-meLUVPn2TWgJyLmy7el3fQQVwft4gU5NGyvV0XbD41iU9Jbg8lCH4zexhIkihDzVHJStlt6r088G6/fWeNjhXA==}
+    engines: {node: '>= 8.0.0'}
+    peerDependencies:
+      pg-native: '>=3.0.1'
+    peerDependenciesMeta:
+      pg-native:
+        optional: true
+
+  pgpass@1.0.5:
+    resolution: {integrity: sha512-FdW9r/jQZhSeohs1Z3sI1yxFQNFvMcnmfuj4WBMUTxOrAyLMaTcE1aAMBiTlbMNaXvBCQuVi0R7hd8udDSP7ug==}
+
   picocolors@1.0.1:
     resolution: {integrity: sha512-anP1Z8qwhkbmu7MFP5iTt+wQKXgwzf7zTyGlcdzabySa9vd0Xt392U0rVmz9poOaBj0uHJKyyo9/upk0HrEQew==}
 
@@ -7246,6 +7290,22 @@ packages:
     resolution: {integrity: sha512-PS08Iboia9mts/2ygV3eLpY5ghnUcfLV/EXTOW1E2qYxJKGGBUtNjN76FYHnMs36RmARn41bC0AZmn+rR0OVpQ==}
     engines: {node: ^10 || ^12 || >=14}
 
+  postgres-array@2.0.0:
+    resolution: {integrity: sha512-VpZrUqU5A69eQyW2c5CA1jtLecCsN2U/bD6VilrFDWq5+5UIEVO7nazS3TEcHf1zuPYO/sqGvUvW62g86RXZuA==}
+    engines: {node: '>=4'}
+
+  postgres-bytea@1.0.0:
+    resolution: {integrity: sha512-xy3pmLuQqRBZBXDULy7KbaitYqLcmxigw14Q5sj8QBVLqEwXfeybIKVWiqAXTlcvdvb0+xkOtDbfQMOf4lST1w==}
+    engines: {node: '>=0.10.0'}
+
+  postgres-date@1.0.7:
+    resolution: {integrity: sha512-suDmjLVQg78nMK2UZ454hAG+OAW+HQPZ6n++TNDUX+L0+uUlLywnoxJKDou51Zm+zTCjrCl0Nq6J9C5hP9vK/Q==}
+    engines: {node: '>=0.10.0'}
+
+  postgres-interval@1.2.0:
+    resolution: {integrity: sha512-9ZhXKM/rw350N1ovuWHbGxnGh/SNJ4cnxHiM0rxE4VN41wsg8P8zWn9hv/buK00RP4WvlOyr/RBDiptyxVbkZQ==}
+    engines: {node: '>=0.10.0'}
+
   prelude-ls@1.2.1:
     resolution: {integrity: sha512-vkcDPrRZo1QZLbn5RLGPpg/WmIQ65qoWWhcGKf/b5eplkkarX0m9z8ppCat4mlOqUsWpyNuYgO3VRyrYHSzX5g==}
     engines: {node: '>= 0.8.0'}
@@ -8156,6 +8216,10 @@ packages:
   split2@3.2.2:
     resolution: {integrity: sha512-9NThjpgZnifTkJpzTZ7Eue85S49QwpNhZTq6GRJwObb6jnLFNGB7Qm73V5HewTROPyxD0C29xqmaI68bQtV+hg==}
 
+  split2@4.2.0:
+    resolution: {integrity: sha512-UcjcJOWknrNkF6PLX83qcHM6KHgVKNkV62Y8a5uYDVv9ydGQVwAHMKqHdJje1VTWpljG0WYpCDhrCdAOYH4TWg==}
+    engines: {node: '>= 10.x'}
+
   split@1.0.1:
     resolution: {integrity: sha512-mTyOoPbrivtXnwnIxZRFYRrPNtEFKlpB2fvjSnCQUiAA6qAZzqwna5envK4uk6OIeP17CsdF3rSBGYVBsU0Tkg==}
 
@@ -13429,6 +13493,8 @@ snapshots:
 
   buffer-from@1.1.2: {}
 
+  buffer-writer@2.0.0: {}
+
   buffer@5.7.1:
     dependencies:
       base64-js: 1.5.1
@@ -13819,13 +13885,13 @@ snapshots:
       ini: 1.3.8
       proto-list: 1.2.4
 
-  connect-typeorm@1.1.4(typeorm@0.3.11(sqlite3@5.1.4(encoding@0.1.13))(ts-node@10.9.1(@swc/core@1.6.5(@swc/helpers@0.5.11))(@types/node@20.14.8)(typescript@4.9.5))):
+  connect-typeorm@1.1.4(typeorm@0.3.11(pg@8.11.0)(sqlite3@5.1.4(encoding@0.1.13))(ts-node@10.9.1(@swc/core@1.6.5(@swc/helpers@0.5.11))(@types/node@20.14.8)(typescript@4.9.5))):
     dependencies:
       '@types/debug': 0.0.31
       '@types/express-session': 1.17.6
       debug: 4.3.5(supports-color@8.1.1)
       express-session: 1.18.0
-      typeorm: 0.3.11(sqlite3@5.1.4(encoding@0.1.13))(ts-node@10.9.1(@swc/core@1.6.5(@swc/helpers@0.5.11))(@types/node@20.14.8)(typescript@4.9.5))
+      typeorm: 0.3.11(pg@8.11.0)(sqlite3@5.1.4(encoding@0.1.13))(ts-node@10.9.1(@swc/core@1.6.5(@swc/helpers@0.5.11))(@types/node@20.14.8)(typescript@4.9.5))
     transitivePeerDependencies:
       - supports-color
 
@@ -17578,6 +17644,8 @@ snapshots:
     dependencies:
       p-timeout: 3.2.0
 
+  packet-reader@1.0.0: {}
+
   parent-module@1.0.1:
     dependencies:
       callsites: 3.1.0
@@ -17656,6 +17724,43 @@ snapshots:
 
   performance-now@2.1.0: {}
 
+  pg-cloudflare@1.1.1:
+    optional: true
+
+  pg-connection-string@2.7.0: {}
+
+  pg-int8@1.0.1: {}
+
+  pg-pool@3.7.0(pg@8.11.0):
+    dependencies:
+      pg: 8.11.0
+
+  pg-protocol@1.7.0: {}
+
+  pg-types@2.2.0:
+    dependencies:
+      pg-int8: 1.0.1
+      postgres-array: 2.0.0
+      postgres-bytea: 1.0.0
+      postgres-date: 1.0.7
+      postgres-interval: 1.2.0
+
+  pg@8.11.0:
+    dependencies:
+      buffer-writer: 2.0.0
+      packet-reader: 1.0.0
+      pg-connection-string: 2.7.0
+      pg-pool: 3.7.0(pg@8.11.0)
+      pg-protocol: 1.7.0
+      pg-types: 2.2.0
+      pgpass: 1.0.5
+    optionalDependencies:
+      pg-cloudflare: 1.1.1
+
+  pgpass@1.0.5:
+    dependencies:
+      split2: 4.2.0
+
   picocolors@1.0.1: {}
 
   picomatch@2.3.1: {}
@@ -17753,6 +17858,16 @@ snapshots:
       picocolors: 1.0.1
       source-map-js: 1.2.0
 
+  postgres-array@2.0.0: {}
+
+  postgres-bytea@1.0.0: {}
+
+  postgres-date@1.0.7: {}
+
+  postgres-interval@1.2.0:
+    dependencies:
+      xtend: 4.0.2
+
   prelude-ls@1.2.1: {}
 
   prettier-linter-helpers@1.0.0:
@@ -18882,6 +18997,8 @@ snapshots:
     dependencies:
       readable-stream: 3.6.2
 
+  split2@4.2.0: {}
+
   split@1.0.1:
     dependencies:
       through: 2.3.8
@@ -19418,7 +19535,7 @@ snapshots:
 
   typedarray@0.0.6: {}
 
-  typeorm@0.3.11(sqlite3@5.1.4(encoding@0.1.13))(ts-node@10.9.1(@swc/core@1.6.5(@swc/helpers@0.5.11))(@types/node@20.14.8)(typescript@4.9.5)):
+  typeorm@0.3.11(pg@8.11.0)(sqlite3@5.1.4(encoding@0.1.13))(ts-node@10.9.1(@swc/core@1.6.5(@swc/helpers@0.5.11))(@types/node@20.14.8)(typescript@4.9.5)):
     dependencies:
       '@sqltools/formatter': 1.2.5
       app-root-path: 3.1.0
@@ -19438,6 +19555,7 @@ snapshots:
       xml2js: 0.4.23
       yargs: 17.7.2
     optionalDependencies:
+      pg: 8.11.0
       sqlite3: 5.1.4(encoding@0.1.13)
       ts-node: 10.9.1(@swc/core@1.6.5(@swc/helpers@0.5.11))(@types/node@20.14.8)(typescript@4.9.5)
     transitivePeerDependencies:

server/datasource.ts

@@ -1,7 +1,43 @@
-import 'reflect-metadata';
+import fs from 'fs';
+import type { TlsOptions } from 'tls';
 import type { DataSourceOptions, EntityTarget, Repository } from 'typeorm';
 import { DataSource } from 'typeorm';
 
+const DB_SSL_PREFIX = 'DB_SSL_';
+
+function boolFromEnv(envVar: string, defaultVal = false) {
+  if (process.env[envVar]) {
+    return process.env[envVar]?.toLowerCase() === 'true';
+  }
+  return defaultVal;
+}
+
+function stringOrReadFileFromEnv(envVar: string): Buffer | string | undefined {
+  if (process.env[envVar]) {
+    return process.env[envVar];
+  }
+  const filePath = process.env[`${envVar}_FILE`];
+  if (filePath) {
+    return fs.readFileSync(filePath);
+  }
+  return undefined;
+}
+
+function buildSslConfig(): TlsOptions | undefined {
+  if (process.env.DB_USE_SSL?.toLowerCase() !== 'true') {
+    return undefined;
+  }
+  return {
+    rejectUnauthorized: boolFromEnv(
+      `${DB_SSL_PREFIX}REJECT_UNAUTHORIZED`,
+      true
+    ),
+    ca: stringOrReadFileFromEnv(`${DB_SSL_PREFIX}CA`),
+    key: stringOrReadFileFromEnv(`${DB_SSL_PREFIX}KEY`),
+    cert: stringOrReadFileFromEnv(`${DB_SSL_PREFIX}CERT`),
+  };
+}
+
 const devConfig: DataSourceOptions = {
   type: 'sqlite',
   database: process.env.CONFIG_DIRECTORY
@@ -9,10 +45,10 @@ const devConfig: DataSourceOptions = {
     : 'config/db/db.sqlite3',
   synchronize: true,
   migrationsRun: false,
-  logging: false,
+  logging: boolFromEnv('DB_LOG_QUERIES'),
   enableWAL: true,
   entities: ['server/entity/**/*.ts'],
-  migrations: ['server/migration/**/*.ts'],
+  migrations: ['server/migration/sqlite/**/*.ts'],
   subscribers: ['server/subscriber/**/*.ts'],
 };
 
@@ -23,16 +59,56 @@ const prodConfig: DataSourceOptions = {
     : 'config/db/db.sqlite3',
   synchronize: false,
   migrationsRun: false,
-  logging: false,
+  logging: boolFromEnv('DB_LOG_QUERIES'),
   enableWAL: true,
   entities: ['dist/entity/**/*.js'],
-  migrations: ['dist/migration/**/*.js'],
+  migrations: ['dist/migration/sqlite/**/*.js'],
   subscribers: ['dist/subscriber/**/*.js'],
 };
 
-const dataSource = new DataSource(
+const postgresDevConfig: DataSourceOptions = {
-  process.env.NODE_ENV !== 'production' ? devConfig : prodConfig
+  type: 'postgres',
-);
+  host: process.env.DB_HOST,
+  port: parseInt(process.env.DB_PORT ?? '5432'),
+  username: process.env.DB_USER,
+  password: process.env.DB_PASS,
+  database: process.env.DB_NAME ?? 'jellyseerr',
+  ssl: buildSslConfig(),
+  synchronize: false,
+  migrationsRun: true,
+  logging: boolFromEnv('DB_LOG_QUERIES'),
+  entities: ['server/entity/**/*.ts'],
+  migrations: ['server/migration/postgres/**/*.ts'],
+  subscribers: ['server/subscriber/**/*.ts'],
+};
+
+const postgresProdConfig: DataSourceOptions = {
+  type: 'postgres',
+  host: process.env.DB_HOST,
+  port: parseInt(process.env.DB_PORT ?? '5432'),
+  username: process.env.DB_USER,
+  password: process.env.DB_PASS,
+  database: process.env.DB_NAME ?? 'jellyseerr',
+  ssl: buildSslConfig(),
+  synchronize: false,
+  migrationsRun: false,
+  logging: boolFromEnv('DB_LOG_QUERIES'),
+  entities: ['dist/entity/**/*.js'],
+  migrations: ['dist/migration/postgres/**/*.js'],
+  subscribers: ['dist/subscriber/**/*.js'],
+};
+
+export const isPgsql = process.env.DB_TYPE === 'postgres';
+
+function getDataSource(): DataSourceOptions {
+  if (process.env.NODE_ENV === 'production') {
+    return isPgsql ? postgresProdConfig : prodConfig;
+  } else {
+    return isPgsql ? postgresDevConfig : devConfig;
+  }
+}
+
+const dataSource = new DataSource(getDataSource());
 
 export const getRepository = <Entity extends object>(
   target: EntityTarget<Entity>

server/entity/Media.ts

@@ -10,6 +10,7 @@ import type { DownloadingItem } from '@server/lib/downloadtracker';
 import downloadTracker from '@server/lib/downloadtracker';
 import { getSettings } from '@server/lib/settings';
 import logger from '@server/logger';
+import { DbAwareColumn } from '@server/utils/DbColumnHelper';
 import { getHostname } from '@server/utils/getHostname';
 import {
   AfterLoad,
@@ -42,6 +43,10 @@ class Media {
         finalIds = tmdbIds;
       }
 
+      if (finalIds.length === 0) {
+        return [];
+      }
+
       const media = await mediaRepository
         .createQueryBuilder('media')
         .leftJoinAndSelect(
@@ -127,10 +132,23 @@ class Media {
   @UpdateDateColumn()
   public updatedAt: Date;
 
-  @Column({ type: 'datetime', default: () => 'CURRENT_TIMESTAMP' })
+  /**
+   * The `lastSeasonChange` column stores the date and time when the media was added to the library.
+   * It needs to be database-aware because SQLite supports `datetime` while PostgreSQL supports `timestamp with timezone (timestampz)`.
+   */
+  @DbAwareColumn({ type: 'datetime', default: () => 'CURRENT_TIMESTAMP' })
   public lastSeasonChange: Date;
 
-  @Column({ type: 'datetime', nullable: true })
+  /**
+   * The `mediaAddedAt` column stores the date and time when the media was added to the library.
+   * It needs to be database-aware because SQLite supports `datetime` while PostgreSQL supports `timestamp with timezone (timestampz)`.
+   * This column is nullable because it can be null when the media is not yet synced to the library.
+   */
+  @DbAwareColumn({
+    type: 'datetime',
+    default: () => 'CURRENT_TIMESTAMP',
+    nullable: true,
+  })
   public mediaAddedAt: Date;
 
   @Column({ nullable: true, type: 'int' })

server/entity/MediaRequest.ts

@@ -385,6 +385,7 @@ export class MediaRequest {
   @ManyToOne(() => Media, (media) => media.requests, {
     eager: true,
     onDelete: 'CASCADE',
+    nullable: false,
   })
   public media: Media;
 
@@ -857,7 +858,7 @@ export class MediaRequest {
             const requestRepository = getRepository(MediaRequest);
 
             this.status = MediaRequestStatus.FAILED;
-            requestRepository.save(this);
+            await requestRepository.save(this);
 
             logger.warn(
               'Something went wrong sending movie request to Radarr, marking status as FAILED',
@@ -1132,13 +1133,14 @@ export class MediaRequest {
             media[this.is4k ? 'externalServiceSlug4k' : 'externalServiceSlug'] =
               sonarrSeries.titleSlug;
             media[this.is4k ? 'serviceId4k' : 'serviceId'] = sonarrSettings?.id;
+
             await mediaRepository.save(media);
           })
           .catch(async () => {
             const requestRepository = getRepository(MediaRequest);
 
             this.status = MediaRequestStatus.FAILED;
-            requestRepository.save(this);
+            await requestRepository.save(this);
 
             logger.warn(
               'Something went wrong sending series request to Sonarr, marking status as FAILED',

server/entity/Season.ts

@@ -23,7 +23,10 @@ class Season {
   @Column({ type: 'int', default: MediaStatus.UNKNOWN })
   public status4k: MediaStatus;
 
-  @ManyToOne(() => Media, (media) => media.seasons, { onDelete: 'CASCADE' })
+  @ManyToOne(() => Media, (media) => media.seasons, {
+    onDelete: 'CASCADE',
+    nullable: false,
+  })
   public media: Promise<Media>;
 
   @CreateDateColumn()

server/entity/Watchlist.ts

@@ -53,6 +53,7 @@ export class Watchlist implements WatchlistItem {
   @ManyToOne(() => Media, (media) => media.watchlists, {
     eager: true,
     onDelete: 'CASCADE',
+    nullable: false,
   })
   public media: Media;
 

server/index.ts

@@ -1,5 +1,5 @@
 import PlexAPI from '@server/api/plexapi';
-import dataSource, { getRepository } from '@server/datasource';
+import dataSource, { getRepository, isPgsql } from '@server/datasource';
 import DiscoverSlider from '@server/entity/DiscoverSlider';
 import { Session } from '@server/entity/Session';
 import { User } from '@server/entity/User';
@@ -66,9 +66,13 @@ app
 
     // Run migrations in production
     if (process.env.NODE_ENV === 'production') {
-      await dbConnection.query('PRAGMA foreign_keys=OFF');
+      if (isPgsql) {
-      await dbConnection.runMigrations();
+        await dbConnection.runMigrations();
-      await dbConnection.query('PRAGMA foreign_keys=ON');
+      } else {
+        await dbConnection.query('PRAGMA foreign_keys=OFF');
+        await dbConnection.runMigrations();
+        await dbConnection.query('PRAGMA foreign_keys=ON');
+      }
     }
 
     // Load Settings

server/migration/postgres/1705599190375-InitialMigration.ts

@@ -0,0 +1,304 @@
+import type { MigrationInterface, QueryRunner } from 'typeorm';
+
+export class InitialMigration1705599190375 implements MigrationInterface {
+  name = 'InitialMigration1705599190375';
+
+  public async up(queryRunner: QueryRunner): Promise<void> {
+    await queryRunner.query(
+      `create table if not exists session
+       (
+         "expiredAt" bigint,
+         id          text,
+         json        text
+       );`
+    );
+    await queryRunner.query(
+      `create index if not exists "idx_194703_IDX_28c5d1d16da7908c97c9bc2f74"
+        on session ("expiredAt");`
+    );
+    await queryRunner.query(
+      `create unique index if not exists idx_194703_sqlite_autoindex_session_1
+        on session (id);`
+    );
+    await queryRunner.query(
+      `create table if not exists media
+       (
+         id                      serial,
+         "mediaType"             text,
+         "tmdbId"                int,
+         "tvdbId"                int,
+         "imdbId"                text,
+         status                  int default '1'::int,
+         status4k                int default '1'::int,
+         "createdAt"             timestamp with time zone default CURRENT_TIMESTAMP,
+         "updatedAt"             timestamp with time zone default CURRENT_TIMESTAMP,
+         "lastSeasonChange"      timestamp with time zone default CURRENT_TIMESTAMP,
+         "mediaAddedAt"          timestamp with time zone,
+         "serviceId"             int,
+         "serviceId4k"           int,
+         "externalServiceId"     int,
+         "externalServiceId4k"   int,
+         "externalServiceSlug"   text,
+         "externalServiceSlug4k" text,
+         "ratingKey"             text,
+         "ratingKey4k"           text,
+         "jellyfinMediaId"       text,
+         "jellyfinMediaId4k"     text,
+         constraint idx_194722_media_pkey
+           primary key (id)
+       );`
+    );
+    await queryRunner.query(
+      `create table if not exists season
+       (
+         id             serial,
+         "seasonNumber" int,
+         status         int default '1'::int,
+         "createdAt"    timestamp with time zone  default CURRENT_TIMESTAMP,
+         "updatedAt"    timestamp with time zone  default CURRENT_TIMESTAMP,
+         "mediaId"      int not null,
+         status4k       int default '1'::int,
+         constraint idx_194715_season_pkey
+           primary key (id),
+         foreign key ("mediaId") references media
+           on delete cascade
+       );`
+    );
+    await queryRunner.query(
+      `create index if not exists "idx_194722_IDX_7ff2d11f6a83cb52386eaebe74"
+        on media ("imdbId");`
+    );
+    await queryRunner.query(
+      `create index if not exists "idx_194722_IDX_41a289eb1fa489c1bc6f38d9c3"
+        on media ("tvdbId");`
+    );
+    await queryRunner.query(
+      `create index if not exists "idx_194722_IDX_7157aad07c73f6a6ae3bbd5ef5"
+        on media ("tmdbId");`
+    );
+    await queryRunner.query(
+      `create unique index if not exists idx_194722_sqlite_autoindex_media_1
+        on media ("tvdbId");`
+    );
+    await queryRunner.query(
+      `create table if not exists "user"
+       (
+         id                           serial,
+         email                        text,
+         username                     text,
+         "plexId"                     int,
+         "plexToken"                  text,
+         permissions                  int default '0'::int,
+         avatar                       text,
+         "createdAt"                  timestamp with time zone  default CURRENT_TIMESTAMP,
+         "updatedAt"                  timestamp with time zone  default CURRENT_TIMESTAMP,
+         password                     text,
+         "userType"                   int default '1'::int,
+         "plexUsername"               text,
+         "resetPasswordGuid"          text,
+         "recoveryLinkExpirationDate" date,
+         "movieQuotaLimit"            int,
+         "movieQuotaDays"             int,
+         "tvQuotaLimit"               int,
+         "tvQuotaDays"                int,
+         "jellyfinUsername"           text,
+         "jellyfinAuthToken"          text,
+         "jellyfinUserId"             text,
+         "jellyfinDeviceId"           text,
+         constraint idx_194731_user_pkey
+           primary key (id)
+       );`
+    );
+    await queryRunner.query(
+      `create unique index if not exists idx_194731_sqlite_autoindex_user_1
+        on "user" (email);`
+    );
+    await queryRunner.query(
+      `create table if not exists user_push_subscription
+       (
+         id       serial,
+         endpoint text,
+         p256dh   text,
+         auth     text,
+         "userId" int,
+         constraint idx_194740_user_push_subscription_pkey
+           primary key (id),
+         foreign key ("userId") references "user"
+           on delete cascade
+       );`
+    );
+    await queryRunner.query(
+      `create unique index if not exists idx_194740_sqlite_autoindex_user_push_subscription_1
+        on user_push_subscription (auth);`
+    );
+    await queryRunner.query(
+      `create table if not exists issue
+       (
+         id               serial,
+         "issueType"      int,
+         status           int default '1'::int,
+         "problemSeason"  int default '0'::int,
+         "problemEpisode" int default '0'::int,
+         "createdAt"      timestamp with time zone  default CURRENT_TIMESTAMP,
+         "updatedAt"      timestamp with time zone  default CURRENT_TIMESTAMP,
+         "mediaId"        int not null,
+         "createdById"    int,
+         "modifiedById"   int,
+         constraint idx_194747_issue_pkey
+           primary key (id),
+         foreign key ("modifiedById") references "user"
+           on delete cascade,
+         foreign key ("createdById") references "user"
+           on delete cascade,
+         foreign key ("mediaId") references media
+           on delete cascade
+       );`
+    );
+    await queryRunner.query(
+      `create table if not exists issue_comment
+       (
+         id          serial,
+         message     text,
+         "createdAt" timestamp with time zone default CURRENT_TIMESTAMP,
+         "updatedAt" timestamp with time zone default CURRENT_TIMESTAMP,
+         "userId"    int,
+         "issueId"   int,
+         constraint idx_194755_issue_comment_pkey
+           primary key (id),
+         foreign key ("issueId") references issue
+           on delete cascade,
+         foreign key ("userId") references "user"
+           on delete cascade
+       );`
+    );
+    await queryRunner.query(
+      `create table if not exists user_settings
+       (
+           id                         serial,
+           "notificationTypes"        text,
+           "discordId"                text,
+           "userId"                   int,
+           region                     text,
+           "originalLanguage"         text,
+           "telegramChatId"           text,
+           "telegramSendSilently"     boolean,
+           "pgpKey"                   text,
+           locale                     text default ''::text,
+           "pushbulletAccessToken"    text,
+           "pushoverApplicationToken" text,
+           "pushoverUserKey"          text,
+           "watchlistSyncMovies"      boolean,
+           "watchlistSyncTv"          boolean,
+           "pushoverSound"            varchar,
+           constraint idx_194762_user_settings_pkey
+               primary key (id),
+           foreign key ("userId") references "user"
+               on delete cascade
+       );`
+    );
+    await queryRunner.query(
+      `create unique index if not exists idx_194762_sqlite_autoindex_user_settings_1
+        on user_settings ("userId");`
+    );
+    await queryRunner.query(
+      `create table if not exists media_request
+       (
+         id                  serial,
+         status              int,
+         "createdAt"         timestamp with time zone  default CURRENT_TIMESTAMP,
+         "updatedAt"         timestamp with time zone  default CURRENT_TIMESTAMP,
+         type                text,
+         "mediaId"           int not null,
+         "requestedById"     int,
+         "modifiedById"      int,
+         is4k                boolean default false,
+         "serverId"          int,
+         "profileId"         int,
+         "rootFolder"        text,
+         "languageProfileId" int,
+         tags                text,
+         "isAutoRequest"     boolean default false,
+         constraint idx_194770_media_request_pkey
+           primary key (id),
+         foreign key ("modifiedById") references "user"
+           on delete set null,
+         foreign key ("requestedById") references "user"
+           on delete cascade,
+         foreign key ("mediaId") references media
+           on delete cascade
+       );`
+    );
+    await queryRunner.query(
+      `create table if not exists season_request
+       (
+         id             serial NOT NULL,
+         "seasonNumber" int,
+         status         int                      default '1'::int,
+         "createdAt"    timestamp with time zone default now(),
+         "updatedAt"    timestamp with time zone default now(),
+         "requestId"    int,
+         constraint idx_194709_season_request_pkey
+           primary key (id),
+         foreign key ("requestId") references media_request
+           on delete cascade
+       );`
+    );
+    await queryRunner.query(
+      `create table if not exists discover_slider
+       (
+         id          serial,
+         type        integer,
+         "order"     integer,
+         "isBuiltIn" boolean default false,
+         enabled     boolean default true,
+         title       text,
+         data        text,
+         "createdAt" timestamp with time zone default CURRENT_TIMESTAMP,
+         "updatedAt" timestamp with time zone default CURRENT_TIMESTAMP,
+         constraint idx_194779_discover_slider_pkey
+           primary key (id)
+       );`
+    );
+    await queryRunner.query(
+      `create table if not exists watchlist
+       (
+         id              serial,
+         "ratingKey"     text,
+         "mediaType"     text,
+         title           text,
+         "tmdbId"        int,
+         "createdAt"     timestamp with time zone default CURRENT_TIMESTAMP,
+         "updatedAt"     timestamp with time zone default CURRENT_TIMESTAMP,
+         "requestedById" int,
+         "mediaId"       int not null,
+         constraint idx_194788_watchlist_pkey
+           primary key (id)
+       );`
+    );
+    await queryRunner.query(
+      `create index if not exists "idx_194788_IDX_939f205946256cc0d2a1ac51a8"
+        on watchlist ("tmdbId");`
+    );
+    await queryRunner.query(
+      `create unique index if not exists idx_194788_sqlite_autoindex_watchlist_1
+        on watchlist ("tmdbId", "requestedById");`
+    );
+  }
+
+  public async down(queryRunner: QueryRunner): Promise<void> {
+    await queryRunner.query(`drop table if exists session cascade`);
+    await queryRunner.query(`drop table if exists season_request cascade`);
+    await queryRunner.query(`drop table if exists season cascade`);
+    await queryRunner.query(
+      `drop table if exists user_push_subscription cascade`
+    );
+    await queryRunner.query(`drop table if exists issue_comment cascade`);
+    await queryRunner.query(`drop table if exists issue cascade`);
+    await queryRunner.query(`drop table if exists user_settings cascade`);
+    await queryRunner.query(`drop table if exists media_request cascade`);
+    await queryRunner.query(`drop table if exists media cascade`);
+    await queryRunner.query(`drop table if exists "user" cascade`);
+    await queryRunner.query(`drop table if exists discover_slider cascade`);
+    await queryRunner.query(`drop table if exists watchlist cascade`);
+  }
+}

server/migration/postgres/1730770837441-AddBlacklist.ts

@@ -0,0 +1,32 @@
+import type { MigrationInterface, QueryRunner } from 'typeorm';
+
+export class AddBlacklist1730770837441 implements MigrationInterface {
+  name = 'AddBlacklist1730770837441';
+
+  public async up(queryRunner: QueryRunner): Promise<void> {
+    await queryRunner.query(
+      `CREATE TABLE "blacklist"
+       (
+         "id"        SERIAL PRIMARY KEY,
+         "mediaType" VARCHAR   NOT NULL,
+         "title"     VARCHAR,
+         "tmdbId"    INTEGER   NOT NULL,
+         "createdAt" TIMESTAMP WITH TIME ZONE NOT NULL DEFAULT NOW(),
+         "userId"    INTEGER,
+         "mediaId"   INTEGER,
+         CONSTRAINT "UQ_6bbafa28411e6046421991ea21c" UNIQUE ("tmdbId", "userId")
+       )`
+    );
+
+    await queryRunner.query(
+      `CREATE INDEX "IDX_6bbafa28411e6046421991ea21" ON "blacklist" ("tmdbId")`
+    );
+  }
+
+  public async down(queryRunner: QueryRunner): Promise<void> {
+    await queryRunner.query(
+      `DROP INDEX IF EXISTS "IDX_6bbafa28411e6046421991ea21"`
+    );
+    await queryRunner.query(`DROP TABLE IF EXISTS "blacklist"`);
+  }
+}

server/routes/request.ts

@@ -113,7 +113,7 @@ requestRoutes.get<Record<string, unknown>, RequestResultsResponse>(
           requestStatus: statusFilter,
         })
         .andWhere(
-          '((request.is4k = 0 AND media.status IN (:...mediaStatus)) OR (request.is4k = 1 AND media.status4k IN (:...mediaStatus)))',
+          '((request.is4k = false AND media.status IN (:...mediaStatus)) OR (request.is4k = true AND media.status4k IN (:...mediaStatus)))',
           {
             mediaStatus: mediaStatusFilter,
           }

server/routes/user/index.ts

@@ -45,7 +45,7 @@ router.get('/', async (req, res, next) => {
           `CASE WHEN (user.username IS NULL OR user.username = '') THEN (
              CASE WHEN (user.plexUsername IS NULL OR user.plexUsername = '') THEN (
                CASE WHEN (user.jellyfinUsername IS NULL OR user.jellyfinUsername = '') THEN
-                 user.email
+                 "user"."email"
                ELSE
                  LOWER(user.jellyfinUsername)
                END)

server/utils/DbColumnHelper.ts

@@ -0,0 +1,20 @@
+import { isPgsql } from '@server/datasource';
+import type { ColumnOptions, ColumnType } from 'typeorm';
+import { Column } from 'typeorm';
+const pgTypeMapping: { [key: string]: ColumnType } = {
+  datetime: 'timestamp with time zone',
+};
+
+export function resolveDbType(pgType: ColumnType): ColumnType {
+  if (isPgsql && pgType.toString() in pgTypeMapping) {
+    return pgTypeMapping[pgType.toString()];
+  }
+  return pgType;
+}
+
+export function DbAwareColumn(columnOptions: ColumnOptions) {
+  if (columnOptions.type) {
+    columnOptions.type = resolveDbType(columnOptions.type);
+  }
+  return Column(columnOptions);
+}