diff --git a/src/routes/(user)/plan/+page.svelte b/src/routes/(app)/plan/+page.svelte
similarity index 100%
rename from src/routes/(user)/plan/+page.svelte
rename to src/routes/(app)/plan/+page.svelte
diff --git a/src/routes/(user)/visit/+page.svelte b/src/routes/(app)/visit/+page.svelte
similarity index 100%
rename from src/routes/(user)/visit/+page.svelte
rename to src/routes/(app)/visit/+page.svelte
diff --git a/src/routes/+layout.svelte b/src/routes/+layout.svelte
index 544d7ad..e680e4a 100644
--- a/src/routes/+layout.svelte
+++ b/src/routes/+layout.svelte
@@ -1,5 +1,5 @@
diff --git a/svelte.config.js b/svelte.config.js
index ead8195..ee2ae49 100644
--- a/svelte.config.js
+++ b/svelte.config.js
@@ -1,5 +1,5 @@
-import adapter from "@sveltejs/adapter-auto";
-import { vitePreprocess } from "@sveltejs/kit/vite";
+import adapter from "@sveltejs/adapter-node";
+import { vitePreprocess } from "@sveltejs/vite-plugin-svelte";
/** @type {import('@sveltejs/kit').Config} */
const config = {
@@ -8,10 +8,10 @@ const config = {
preprocess: [vitePreprocess({})],
kit: {
- // adapter-auto only supports some environments, see https://kit.svelte.dev/docs/adapter-auto for a list.
- // If your environment is not supported or you settled on a specific environment, switch out the adapter.
// See https://kit.svelte.dev/docs/adapters for more information about adapters.
- adapter: adapter(),
+ adapter: adapter({
+ precompress: true,
+ }),
},
};
diff --git a/tests/helpers/reset-db.ts b/tests/helpers/reset-db.ts
new file mode 100644
index 0000000..ffa52e2
--- /dev/null
+++ b/tests/helpers/reset-db.ts
@@ -0,0 +1,53 @@
+import { PrismaClient } from "@prisma/client";
+import { CATEGORIES } from "./testdata";
+
+const prisma = new PrismaClient();
+
+export default async () => {
+ await prisma.$transaction([
+ prisma.entryExecution.deleteMany(),
+ prisma.entryVersion.deleteMany(),
+ prisma.entry.deleteMany(),
+ prisma.patient.deleteMany(),
+ prisma.room.deleteMany(),
+ prisma.station.deleteMany(),
+ prisma.category.deleteMany(),
+ prisma.user.deleteMany(),
+
+ prisma.user.createMany({
+ data: [
+ { id: 1, name: "Sven Schulz", email: "sven.schulz@example.com" },
+ { id: 2, name: "Sabrina Loewe", email: "sabrina.loewe@example.com" },
+ ],
+ }),
+ prisma.category.createMany({ data: CATEGORIES }),
+ prisma.station.createMany({
+ data: [
+ { id: 1, name: "S1" },
+ { id: 2, name: "S2" },
+ ],
+ }),
+ prisma.room.createMany({
+ data: [
+ { id: 1, name: "R1.1", stationId: 1 },
+ { id: 2, name: "R1.2", stationId: 1 },
+ { id: 3, name: "R2.1", stationId: 2 },
+ ],
+ }),
+ prisma.patient.createMany({
+ data: [
+ { id: 1, firstName: "Andreas", lastName: "Bergmann", age: 22, roomId: 1 },
+ { id: 2, firstName: "Manuela", lastName: "Kortig", age: 41, roomId: 2 },
+ { id: 3, firstName: "Markus", lastName: "Schuster", age: 50, roomId: 3 },
+ ],
+ }),
+ prisma.$executeRaw`alter sequence users_id_seq restart with 3`,
+ prisma.$executeRaw`alter sequence categories_id_seq restart with 7`,
+ prisma.$executeRaw`alter sequence stations_id_seq restart with 3`,
+ prisma.$executeRaw`alter sequence rooms_id_seq restart with 4`,
+ prisma.$executeRaw`alter sequence patients_id_seq restart with 4`,
+ prisma.$executeRaw`alter sequence entry_execution_id_seq restart with 1`,
+ prisma.$executeRaw`alter sequence entry_versions_id_seq restart with 1`,
+ prisma.$executeRaw`alter sequence entries_id_seq restart with 1`,
+ ]);
+};
diff --git a/tests/helpers/setup.ts b/tests/helpers/setup.ts
new file mode 100644
index 0000000..e9ee148
--- /dev/null
+++ b/tests/helpers/setup.ts
@@ -0,0 +1,7 @@
+import resetDb from "./reset-db";
+
+import { beforeEach } from "vitest";
+
+beforeEach(async (x) => {
+ await resetDb();
+});
diff --git a/tests/helpers/testdata.ts b/tests/helpers/testdata.ts
new file mode 100644
index 0000000..3aa19b0
--- /dev/null
+++ b/tests/helpers/testdata.ts
@@ -0,0 +1,43 @@
+import type { Category, Station } from "$lib/shared/model";
+
+export const S1: Station = { id: 1, name: "S1" };
+export const S2: Station = { id: 2, name: "S2" };
+
+export const CATEGORIES: Category[] = [
+ {
+ id: 1,
+ name: "Laborabnahme",
+ description: "Blutabnahme zur Untersuchung im Labor",
+ color: "FF0000",
+ },
+ {
+ id: 2,
+ name: "Untersuchungen",
+ description: "Durchführung von Untersuchungen",
+ color: "00AA00",
+ },
+ {
+ id: 3,
+ name: "Medikationsumstellung",
+ description: null,
+ color: "FF00FF",
+ },
+ {
+ id: 4,
+ name: "Klinische Visite",
+ description: null,
+ color: "00FFFF",
+ },
+ {
+ id: 5,
+ name: "Entlassung",
+ description: "Entlassung eines Patienten aus dem KH",
+ color: "55AAFF",
+ },
+ {
+ id: 6,
+ name: "Sonstiges",
+ description: null,
+ color: "444444",
+ },
+];
diff --git a/tests/integration/query/category.ts b/tests/integration/query/category.ts
new file mode 100644
index 0000000..6ae8b60
--- /dev/null
+++ b/tests/integration/query/category.ts
@@ -0,0 +1,23 @@
+import { getCategories, getCategory, newCategory } from "$lib/server/query";
+import { expect, test } from "vitest";
+// eslint-disable-next-line no-relative-import-paths/no-relative-import-paths
+import { CATEGORIES } from "../../helpers/testdata";
+
+test("create category", async () => {
+ const data = {
+ name: "Test",
+ description: "Hello World",
+ color: "AABB01",
+ };
+ const cId = await newCategory(data);
+ expect(cId).gt(0);
+
+ const category = await getCategory(cId);
+ expect(category).toMatchObject(data);
+ expect(category.id).toBe(cId);
+});
+
+test("get categories", async () => {
+ const categories = await getCategories();
+ expect(categories).toStrictEqual(CATEGORIES);
+});
diff --git a/tests/integration/query/entry.ts b/tests/integration/query/entry.ts
new file mode 100644
index 0000000..d34b3f8
--- /dev/null
+++ b/tests/integration/query/entry.ts
@@ -0,0 +1,162 @@
+import {
+ getEntries,
+ getEntry,
+ newEntry,
+ newEntryExecution,
+ newEntryVersion,
+} from "$lib/server/query";
+import { expect, test } from "vitest";
+
+const TEST_VERSION = {
+ categoryId: 1,
+ text: "10ml Blut abnehmen",
+ date: new Date(2024, 1, 1),
+ priority: false,
+};
+
+test("create entry", async () => {
+ const eId = await newEntry(1, {
+ patientId: 1,
+ version: TEST_VERSION,
+ });
+ expect(eId).gt(0);
+
+ const entry = await getEntry(eId);
+ expect(entry.patient.id).toBe(1);
+ expect(entry.execution).toBeNull();
+ expect(entry.currentVersion.id).gt(0);
+ expect(entry.currentVersion.category?.id).toBe(TEST_VERSION.categoryId);
+ expect(entry.currentVersion.category?.name).toBe("Laborabnahme");
+ expect(entry.currentVersion.text).toBe(TEST_VERSION.text);
+ expect(entry.currentVersion.date).toStrictEqual(TEST_VERSION.date);
+ expect(entry.currentVersion.priority).toBe(TEST_VERSION.priority);
+});
+
+test("create extry version", async () => {
+ const eId = await newEntry(1, {
+ patientId: 1,
+ version: TEST_VERSION,
+ });
+ const text = "10ml Blut abnehmen\n\nPS: Nadel nicht vergessen";
+
+ await newEntryVersion(1, eId, {
+ ...TEST_VERSION,
+ text,
+ });
+
+ const entry = await getEntry(eId);
+ expect(entry.currentVersion.text).toBe(text);
+});
+
+test("create extry execution", async () => {
+ const eId = await newEntry(1, {
+ patientId: 1,
+ version: TEST_VERSION,
+ });
+ const text = "Blutabnahme erledigt.";
+
+ await newEntryExecution(1, eId, { text });
+ const entry = await getEntry(eId);
+ expect(entry.execution?.author.id).toBe(1);
+ expect(entry.execution?.text).toBe(text);
+});
+
+async function insertTestEntries() {
+ // Create some entries
+ const eId1 = await newEntry(1, {
+ patientId: 1,
+ version: TEST_VERSION,
+ });
+ const eId2 = await newEntry(1, {
+ patientId: 2,
+ version: {
+ text: "Carrot cake jelly-o bonbon toffee chocolate.",
+ date: new Date(2024, 1, 5),
+ priority: false,
+ categoryId: null,
+ },
+ });
+ const eId3 = await newEntry(1, {
+ patientId: 1,
+ version: {
+ text: "Cheesecake danish donut oat cake caramels.",
+ date: new Date(2024, 1, 6),
+ priority: false,
+ categoryId: null,
+ },
+ });
+
+ // Update an entry
+ await newEntryVersion(2, eId1, {
+ categoryId: 3,
+ text: "Hello World",
+ date: new Date(2024, 1, 1),
+ priority: true,
+ });
+
+ // Execute entries
+ await newEntryExecution(1, eId2, { text: "Some execution txt" });
+ await newEntryExecution(2, eId3, { text: "More execution txt" });
+
+ return { eId1, eId2, eId3 };
+}
+
+test("get entries", async () => {
+ const { eId1, eId2, eId3 } = await insertTestEntries();
+ const entries = await getEntries({});
+ expect(entries.items).length(3);
+ expect(entries.total).toBe(3);
+
+ // Pagination
+
+ const entriesLim2 = await getEntries({ pagination: { limit: 2, offset: 0 } });
+ expect(entriesLim2.items).length(2);
+ expect(entriesLim2.total).toBe(3);
+
+ const entriesLim2Offset = await getEntries({ pagination: { limit: 2, offset: 2 } });
+ expect(entriesLim2Offset.items).length(1);
+ expect(entriesLim2Offset.offset).toBe(2);
+ expect(entriesLim2Offset.total).toBe(3);
+
+ // Filter by category
+ const entriesCategory = await getEntries({ filter: { category: 3 } });
+ expect(entriesCategory.items).length(1);
+ expect(entriesCategory.total).toBe(1);
+ expect(entriesCategory.items[0].id).toBe(eId1);
+
+ // Filter by author
+ const entriesAuthor = await getEntries({ filter: { author: 2 } });
+ expect(entriesAuthor.items).length(1);
+ expect(entriesAuthor.total).toBe(1);
+ expect(entriesAuthor.items[0].id).toBe(eId1);
+
+ // Filter by executor
+ const entriesExecutor = await getEntries({ filter: { executor: 1 } });
+ expect(entriesExecutor.items).length(1);
+ expect(entriesExecutor.total).toBe(1);
+ expect(entriesExecutor.items[0].id).toBe(eId2);
+
+ // Filter by patient
+ const entriesPatient = await getEntries({ filter: { patient: 1 } });
+ expect(entriesPatient.items).length(2);
+ expect(entriesPatient.total).toBe(2);
+ expect(entriesPatient.items[0].id).toBe(eId3);
+ expect(entriesPatient.items[1].id).toBe(eId1);
+
+ // Filter by room
+ const entriesRoom = await getEntries({ filter: { room: 1 } });
+ expect(entriesRoom).toStrictEqual(entriesPatient);
+
+ // Filter done
+ const entriesDone = await getEntries({ filter: { done: true } });
+ expect(entriesDone.items).length(2);
+ expect(entriesDone.total).toBe(2);
+ expect(entriesDone.items[0].id).toBe(eId3);
+ expect(entriesDone.items[1].id).toBe(eId2);
+
+ // Filter by priority
+ const entriesPrio = await getEntries({ filter: { priority: true } });
+ expect(entriesPrio.items).length(1);
+ expect(entriesPrio.total).toBe(1);
+ expect(entriesPrio.items[0].id).toBe(eId1);
+});
diff --git a/tests/integration/query/patient.ts b/tests/integration/query/patient.ts
new file mode 100644
index 0000000..5cf8ada
--- /dev/null
+++ b/tests/integration/query/patient.ts
@@ -0,0 +1,74 @@
+import { newPatient, getPatient, getPatients } from "$lib/server/query";
+import { expect, test } from "vitest";
+// eslint-disable-next-line no-relative-import-paths/no-relative-import-paths
+import { S1, S2 } from "../../helpers/testdata";
+
+test("create patient", async () => {
+ const pId = await newPatient({
+ firstName: "Max",
+ lastName: "Müller",
+ age: 31,
+ roomId: 1,
+ });
+ const patient = await getPatient(pId);
+ expect(patient).toMatchObject({
+ id: pId,
+ firstName: "Max",
+ lastName: "Müller",
+ age: 31,
+ room: { id: 1, name: "R1.1", station: S1 },
+ });
+});
+
+test("get patients", async () => {
+ const patients = await getPatients({});
+ expect(patients).toMatchObject({
+ items: [
+ {
+ id: 1,
+ firstName: "Andreas",
+ lastName: "Bergmann",
+ age: 22,
+ room: { id: 1, name: "R1.1", station: S1 },
+ },
+ {
+ id: 2,
+ firstName: "Manuela",
+ lastName: "Kortig",
+ age: 41,
+ room: { id: 2, name: "R1.2", station: S1 },
+ },
+ {
+ id: 3,
+ firstName: "Markus",
+ lastName: "Schuster",
+ age: 50,
+ room: { id: 3, name: "R2.1", station: S2 },
+ },
+ ],
+ offset: 0,
+ total: 3,
+ });
+});
+
+test("get patients (pagination)", async () => {
+ const patients = await getPatients({ pagination: { offset: 1, limit: 100 } });
+ expect(patients.items).length(2);
+ expect(patients.items[0].id).toBe(2);
+ expect(patients.items[1].id).toBe(3);
+ expect(patients.offset).toBe(1);
+ expect(patients.total).toBe(3);
+});
+
+test("get patients (by room)", async () => {
+ const patients = await getPatients({ filter: { room: 1 } });
+ expect(patients.items).length(1);
+ expect(patients.items[0].id).toBe(1);
+});
+
+test("get patients (by station)", async () => {
+ const patients = await getPatients({ filter: { station: 1 } });
+ expect(patients.items).length(2);
+ expect(patients.items[0].id).toBe(1);
+ expect(patients.items[1].id).toBe(2);
+});
diff --git a/tests/integration/query/room.ts b/tests/integration/query/room.ts
new file mode 100644
index 0000000..3f20352
--- /dev/null
+++ b/tests/integration/query/room.ts
@@ -0,0 +1,54 @@
+import {
+ getRoom,
+ getRooms,
+ getStation,
+ getStations,
+ newRoom,
+ newStation,
+} from "$lib/server/query";
+import type { Room, Station } from "$lib/shared/model";
+import { expect, test } from "vitest";
+// eslint-disable-next-line no-relative-import-paths/no-relative-import-paths
+import { S1, S2 } from "../../helpers/testdata";
+
+test("create station", async () => {
+ const sId = await newStation({ name: "S3" });
+ const station = await getStation(sId);
+ expect(station).toStrictEqual({ id: sId, name: "S3" } satisfies Station);
+});
+
+test("get stations", async () => {
+ const stations = await getStations();
+ expect(stations).toStrictEqual([S1, S2]);
+});
+
+test("create room", async () => {
+ const rId = await newRoom({ name: "A1", stationId: 1 });
+ const room = await getRoom(rId);
+ expect(room).toStrictEqual({
+ id: rId,
+ name: "A1",
+ station: S1,
+ } satisfies Room);
+});
+
+test("get rooms", async () => {
+ const rooms = await getRooms();
+ expect(rooms).toStrictEqual([
+ {
+ id: 1,
+ name: "R1.1",
+ station: S1,
+ },
+ {
+ id: 2,
+ name: "R1.2",
+ station: S1,
+ },
+ {
+ id: 3,
+ name: "R2.1",
+ station: S2,
+ },
+ ] satisfies Room[]);
+});
diff --git a/tests/integration/query/user.ts b/tests/integration/query/user.ts
new file mode 100644
index 0000000..300def0
--- /dev/null
+++ b/tests/integration/query/user.ts
@@ -0,0 +1,29 @@
+import { getUser, getUsers } from "$lib/server/query";
+import { expect, test } from "vitest";
+
+test("get user", async () => {
+ const user = await getUser(1);
+ expect(user).toStrictEqual({
+ id: 1,
+ name: "Sven Schulz",
+ email: "sven.schulz@example.com",
+ });
+});
+
+test("get users", async () => {
+ const users = await getUsers({});
+ expect(users).toStrictEqual({
+ items: [
+ {
+ id: 1,
+ name: "Sven Schulz",
+ },
+ {
+ id: 2,
+ name: "Sabrina Loewe",
+ },
+ ],
+ offset: 0,
+ total: 2,
+ });
+});
diff --git a/tests/test.ts b/tests/test.ts
deleted file mode 100644
index 4f4a50e..0000000
--- a/tests/test.ts
+++ /dev/null
@@ -1,8 +0,0 @@
-import { expect, test } from "@playwright/test";
-
-test("index page has expected h1", async ({ page }) => {
- await page.goto("/");
- await expect(
- page.getByRole("heading", { name: "Welcome to SvelteKit" })
- ).toBeVisible();
-});
diff --git a/vitest.config.integration.ts b/vitest.config.integration.ts
new file mode 100644
index 0000000..fe8721e
--- /dev/null
+++ b/vitest.config.integration.ts
@@ -0,0 +1,19 @@
+// Prisma integration tests with Vitest
+// https://www.prisma.io/blog/testing-series-3-aBUyF8nxAn
+
+import { sveltekit } from "@sveltejs/kit/vite";
+import { defineConfig } from "vitest/config";
+
+export default defineConfig({
+ plugins: [sveltekit()],
+ test: {
+ include: ["tests/integration/**/*.ts"],
+ minWorkers: 1,
+ maxWorkers: 1,
+ maxConcurrency: 1,
+ setupFiles: ["tests/helpers/setup.ts"],
+ env: {
+ DATABASE_URL: "postgresql://postgres:1234@localhost:5432/test?schema=public",
+ },
+ },
+});