Merge branch 'development' into f092_ViewAuth-von-User-vereinfachen

Dockerfile.dev

@@ -8,11 +8,10 @@ RUN npm i --unsafe-perm
 COPY . ./
 COPY config_dev.json ./config.json
 RUN npm run build
-RUN npm run init-db
 
 # --- Production stage ---
 FROM node:24-alpine
 COPY --from=build /app .
 ENV HOST=0.0.0.0
 EXPOSE 3000
-CMD ["sh", "-c", "ORIGIN=https://tatort-dev.innovation-hub-niedersachsen.de node build/index.js"]
+CMD ["sh", "-c", "npm run init-db && ORIGIN=https://tatort-dev.innovation-hub-niedersachsen.de node build/index.js"]

src/init/init_db.ts

@@ -1,8 +1,9 @@
 import Database from 'better-sqlite3';
 import fs from 'fs';
 import path from 'path';
+import { DB_FULLPATH } from '../routes';
 
-const fullPath = './src/lib/data/tatort.db';
+const fullPath = DB_FULLPATH;
 const dir = path.dirname(fullPath);
 
 if (!fs.existsSync(dir)) {

src/lib/server/dbService.ts

@@ -1,12 +1,7 @@
 import Database from 'better-sqlite3';
-import fs from 'fs';
+import { DB_FULLPATH } from '../../routes';
-import path from 'path';
 
-const fullPath = './src/lib/data/tatort.db';
+// make sure the DB is initiated
-const dir = path.dirname(fullPath);
+import '../../init/init_db'
 
-if (!fs.existsSync(dir)) {
+export const db = new Database(DB_FULLPATH);
-	fs.mkdirSync(dir);
-}
-
-export const db = new Database(fullPath);

src/routes/(angemeldet)/+layout.server.ts

@@ -3,30 +3,10 @@ import type { PageServerLoad } from '../anmeldung/$types';
 
 import { ROUTE_NAMES } from '..';
 
-// *** [START] check for dir
-
-import fs from 'fs';
-const path = '/daten';
-
-let path_existing: string;
-
-fs.access(path, fs.constants.F_OK, (err) => {
-	if (err) {
-		console.error(`❌ Directory "${path}" does NOT exist or is not accessible.`);
-		path_existing = "NO";
-	} else {
-		console.log(`✅ Directory "${path}" exists and is accessible.`);
-		path_existing = "YES";
-	}
-});
-
-// ***
-
 export const load: PageServerLoad = (event: ServerLoadEvent) => {
 	if (!event.locals.user && event.url.pathname !== ROUTE_NAMES.ANMELDUNG)
 		throw redirect(303, ROUTE_NAMES.ANMELDUNG);
 	return {
-		user: event.locals.user,
+		user: event.locals.user
-		path_existing
 	};
 };

src/routes/(angemeldet)/+page.svelte

@@ -11,7 +11,7 @@
 
 <div
 	class=" inset-x-0 top-0 -z-10 h-full flex items-center justify-center bg-white shadow-lg ring-1 ring-gray-900/5"
-><h3>Pfad existiert: {data.path_existing}</h3>
+>
 	<div class="mx-auto flex justify-center max-w-7xl py-10 px-8 w-full">
 		{#if data.user.admin}
 			<div class="group relative rounded-lg p-6 text-sm leading-6 hover:bg-gray-50 w-1/4">

src/routes/index.ts

@@ -36,3 +36,6 @@ export const API_ROUTES = {
 	USERS: '/api/users',
 	USER: (userId: string) => `/api/users/${userId}`
 };
+
+const isProd = process.env.NODE_ENV == 'production';
+export const DB_FULLPATH = !isProd ? './src/lib/data/tatort.db' : '/daten/tatort.db';

tests/views/Layout.test.ts

@@ -22,9 +22,8 @@ describe('+layout.server load(): Teste korrekte URL', () => {
 });
 
 describe('+layout.server load(): Teste erfolgreichen Pfad', () => {
-	// [TODO]
+	test('Werfe kein Fehler', async () => {
-	test.skip('Werfe kein Fehler', async () => {
 		const result = load(mockEvent);
 		expect(result).toEqual({ user: baseData.user });
 	});
-});
+});