f047_neu_Edit-der-Namen #28

Merged
trachi93 merged 14 commits from f047_neu_Edit-der-Namen into development 2025-08-19 09:30:13 +02:00
3 changed files with 35 additions and 14 deletions
Showing only changes of commit 35a55d0676 - Show all commits

View File

@@ -1,3 +1,3 @@
import { readFileSync } from 'fs';
export default JSON.parse(readFileSync('./config_prod.json').toString());
export default JSON.parse(readFileSync('./config.json').toString());
mina marked this conversation as resolved Outdated
Outdated
Review

Stimmt das wirklich? Ich glaube, dass ist nicht korrekt es sollte config.json bleiben, da der Container auch eine config.json anlegt

Stimmt das wirklich? Ich glaube, dass ist nicht korrekt es sollte config.json bleiben, da der Container auch eine config.json anlegt

View File

@@ -31,10 +31,16 @@ export const getCrimesListByToken = async (vorgangToken: string) => {
* @param vorgangToken
* @returns vorgangObj with keys `token`, `name`, `pin` || undefined
*/
export const getVorgangByToken = (vorgangToken: string): {token: string, name:string, pin: string} | undefined => {
const getVorgangSQLStmt = `SELECT token, name, pin FROM cases WHERE token = ?`;
export const getVorgangByToken = (
vorgangToken: string
): { token: string; name: string; pin: string } | undefined => {
const getVorgangSQLStmt = `SELECT token, name, pin
FROM cases
WHERE token = ?`;
const statement = db.prepare(getVorgangSQLStmt);
const result = statement.get(vorgangToken) as {token: string, name:string, pin: string} | undefined;
const result = statement.get(vorgangToken) as
| { token: string; name: string; pin: string }
| undefined;
return result;
};
@@ -44,10 +50,16 @@ export const getVorgangByToken = (vorgangToken: string): {token: string, name:st
* @param vorgangName
* @returns vorgangObj with keys `token`, `name`, `pin` || undefined
*/
export const getVorgangByName = (vorgangName: string): {token: string, name: string, pin: string} | undefined => {
const getVorgangByNameSQLStmt = `SELECT token, name, pin FROM cases WHERE name = ?`;
export const getVorgangByName = (
vorgangName: string
): { token: string; name: string; pin: string } | undefined => {
const getVorgangByNameSQLStmt = `SELECT token, name, pin
FROM cases
WHERE name = ?`;
const statement = db.prepare(getVorgangByNameSQLStmt);
const result = statement.get(vorgangName) as {token: string, name: string, pin: string} | undefined;
const result = statement.get(vorgangName) as
| { token: string; name: string; pin: string }
| undefined;
return result;
};
@@ -88,13 +100,22 @@ export const getListOfVorgänge = async () => {
* Fetches list of vorgänge from database
* @returns list with of available vorgaenge
*/
export const getVorgaenge = (): {vorgangToken: string, vorgangName: string, vorgangPIN: string}[] => {
const getVorgaengeSQLStmt = `SELECT token, name, pin from cases`;
export const getVorgaenge = (): {
vorgangToken: string;
vorgangName: string;
vorgangPIN: string;
}[] => {
const getVorgaengeSQLStmt = `SELECT token, name, pin
from cases`;
const statement = db.prepare(getVorgaengeSQLStmt);
const result = statement.all() as { token: string; name: string; pin: string }[];
const vorgaenge_list: {vorgangToken: string, vorgangName: string, vorgangPIN: string}[] = [];
const vorgaenge_list: { vorgangToken: string; vorgangName: string; vorgangPIN: string }[] = [];
for (const resultItem of result) {
const vorg = { vorgangToken: resultItem.token, vorgangName: resultItem.name, vorgangPIN: resultItem.pin };
const vorg = {
vorgangToken: resultItem.token,
vorgangName: resultItem.name,
vorgangPIN: resultItem.pin
};
vorgaenge_list.push(vorg);
}

View File

@@ -1,7 +1,7 @@
import { client } from '$lib/minio';
import {
deleteVorgangByToken,
getVorgangByToken,
getCrimesListByToken,
vorgangNameExists
} from '$lib/server/vorgangService';
import { json } from '@sveltejs/kit';
@@ -51,9 +51,9 @@ export async function GET({ params, locals }) {
try {
const vorgangToken = params.vorgang;
const vorgang = getVorgangByToken(vorgangToken);
const crimesList = await getCrimesListByToken(vorgangToken);
return new Response(JSON.stringify(vorgang), {
return new Response(JSON.stringify(crimesList), {
status: 200
});
} catch (err) {