From a7eb81151f447693f1ad04a09b378720fd8554f2 Mon Sep 17 00:00:00 2001 From: Chi Cong Tran Date: Fri, 11 Jul 2025 11:39:42 +0200 Subject: [PATCH] refactor DB access --- src/lib/auth.ts | 5 +---- src/lib/server/dbService.ts | 3 +++ src/lib/server/vorgangService.ts | 3 +-- src/routes/(angemeldet)/upload/+page.server.ts | 3 +-- 4 files changed, 6 insertions(+), 8 deletions(-) create mode 100644 src/lib/server/dbService.ts diff --git a/src/lib/auth.ts b/src/lib/auth.ts index 8b94943..7397b86 100644 --- a/src/lib/auth.ts +++ b/src/lib/auth.ts @@ -1,12 +1,9 @@ import jwt from 'jsonwebtoken'; import jsSHA from 'jssha'; -import Database from 'better-sqlite3'; import process from 'process'; +import db from '$lib/server/dbService'; import config from '$lib/config'; -// import db from '../init/init_db'; - -let db = new Database('./src/lib/data/tatort.db'); const SECRET = config.jwt.secret; const EXPIRES_IN = config.jwt.expiresIn; diff --git a/src/lib/server/dbService.ts b/src/lib/server/dbService.ts new file mode 100644 index 0000000..1c562bc --- /dev/null +++ b/src/lib/server/dbService.ts @@ -0,0 +1,3 @@ +import Database from 'better-sqlite3'; + +export const db = new Database('./src/lib/data/tatort.db'); diff --git a/src/lib/server/vorgangService.ts b/src/lib/server/vorgangService.ts index d86172a..7d7c5e7 100644 --- a/src/lib/server/vorgangService.ts +++ b/src/lib/server/vorgangService.ts @@ -2,8 +2,7 @@ import { fail } from '@sveltejs/kit'; import { BUCKET, client, CONFIGFILENAME, TOKENFILENAME } from '$lib/minio'; import { checkIfExactDirectoryExists, getContentOfTextObject } from './s3ClientService'; -import Database from 'better-sqlite3'; -const db = new Database('./src/lib/data/tatort.db'); +import { db } from './dbService'; /** * Get Vorgang and corresponend list of tatorte diff --git a/src/routes/(angemeldet)/upload/+page.server.ts b/src/routes/(angemeldet)/upload/+page.server.ts index 7d413b4..8016dac 100644 --- a/src/routes/(angemeldet)/upload/+page.server.ts +++ b/src/routes/(angemeldet)/upload/+page.server.ts @@ -4,7 +4,7 @@ import { client } from '$lib/minio'; import { fail } from '@sveltejs/kit'; import { v4 as uuidv4 } from 'uuid'; -import Database from 'better-sqlite3'; +import { db } from '$lib/server/dbService'; const isRequiredFieldValid = (value: unknown) => { if (value == null) return false; @@ -25,7 +25,6 @@ export const actions = { // store case in database - let db = new Database('./src/lib/data/tatort.db'); let token = uuidv4(); let insert_stmt = `INSERT INTO cases (token, name, pw) VALUES (?, ?, ?)`; const stmt = db.prepare(insert_stmt);