From 4e615fe2114f6a7b77c14a6169eff2a77ebe076b Mon Sep 17 00:00:00 2001
From: bytedream <me@bytedream.dev>
Date: Sat, 21 Jun 2025 22:37:05 +0200
Subject: [PATCH] fix report edit

---
 src/actions/report.ts                  | 2 ++
 src/app/admin/reports/BottomBar.svelte | 7 +++----
 src/components/input/Select.svelte     | 2 ++
 src/db/database.ts                     | 3 +++
 src/db/schema/report.ts                | 7 +++++++
 src/db/schema/strike.ts                | 9 ++++++++-
 6 files changed, 25 insertions(+), 5 deletions(-)

diff --git a/src/actions/report.ts b/src/actions/report.ts
index a13dc61..c306efd 100644
--- a/src/actions/report.ts
+++ b/src/actions/report.ts
@@ -151,6 +151,8 @@ export const report = {
             reportId: input.reportId,
             strikeReasonId: input.strikeReasonId
           });
+        } else {
+          await db.deleteStrike({ reportId: input.reportId });
         }
       });
 
diff --git a/src/app/admin/reports/BottomBar.svelte b/src/app/admin/reports/BottomBar.svelte
index 95ccd5e..0d444c3 100644
--- a/src/app/admin/reports/BottomBar.svelte
+++ b/src/app/admin/reports/BottomBar.svelte
@@ -20,12 +20,12 @@
   let status = $state<'open' | 'closed' | null>(null);
   let notice = $state<string | null>(null);
   let statement = $state<string | null>(null);
-  let strikeReason = $state<string | null>(null);
+  let strikeReason = $state<string | null>(String(report?.strike?.strikeReasonId ?? null));
 
   // consts
   const strikeReasonValues = strikeReasons.reduce(
     (prev, curr) => Object.assign(prev, { [curr.id]: `${curr.name} (${curr.weight})` }),
-    {}
+    { [null]: 'Kein Vergehen' }
   );
 
   // lifetime
@@ -82,8 +82,7 @@
       label="Bearbeitungsstatus"
       dynamicWidth
     />
-    <Select bind:value={strikeReason} values={strikeReasonValues} defaultValue="" label="Vergehen" dynamicWidth
-    ></Select>
+    <Select bind:value={strikeReason} values={strikeReasonValues} label="Vergehen" dynamicWidth></Select>
     <div class="divider mt-0 mb-2"></div>
     <button class="btn mt-auto" onclick={onSaveButtonClick}>Speichern</button>
   </div>
diff --git a/src/components/input/Select.svelte b/src/components/input/Select.svelte
index 1332852..eeb085d 100644
--- a/src/components/input/Select.svelte
+++ b/src/components/input/Select.svelte
@@ -1,6 +1,7 @@
 <script lang="ts">
   import type { Snippet } from 'svelte';
 
+  // types
   interface Props {
     id?: string;
     value?: string | null;
@@ -19,6 +20,7 @@
     notice?: Snippet;
   }
 
+  // inputs
   let {
     id,
     value = $bindable(),
diff --git a/src/db/database.ts b/src/db/database.ts
index ea6d75c..bc42d6a 100644
--- a/src/db/database.ts
+++ b/src/db/database.ts
@@ -130,6 +130,8 @@ import {
   deleteStrikeReason
 } from '@db/schema/strikeReason.ts';
 import {
+  deleteStrike,
+  type DeleteStrikeReq,
   editStrike,
   type EditStrikeReq,
   getStrikeByReportId,
@@ -288,6 +290,7 @@ export class Database {
 
   /* strikes */
   editStrike = (values: EditStrikeReq) => editStrike(this.db, values);
+  deleteStrike = (values: DeleteStrikeReq) => deleteStrike(this.db, values);
   getStrikeByReportId = (values: GetStrikeByReportIdReq) => getStrikeByReportId(this.db, values);
   getStrikesByTeamId = (values: GetStrikesByTeamIdReq) => getStrikesByTeamId(this.db, values);
 
diff --git a/src/db/schema/report.ts b/src/db/schema/report.ts
index 07e02c1..8f4ea4f 100644
--- a/src/db/schema/report.ts
+++ b/src/db/schema/report.ts
@@ -5,6 +5,8 @@ import { reportStatus } from './reportStatus.ts';
 import { generateRandomString } from '@util/random.ts';
 import { team } from '@db/schema/team.ts';
 import { BASE_PATH } from 'astro:env/server';
+import { strikeReason } from '@db/schema/strikeReason.ts';
+import { strike } from '@db/schema/strike.ts';
 
 type Database = MySql2Database<{ report: typeof report }>;
 
@@ -113,12 +115,17 @@ export async function getReports(db: Database, values: GetReportsReq) {
         status: reportStatus.status,
         notice: reportStatus.notice,
         statement: reportStatus.statement
+      },
+      strike: {
+        strikeReasonId: strikeReason.id
       }
     })
     .from(report)
     .innerJoin(reporterTeam, eq(report.reporterTeamId, reporterTeam.id))
     .leftJoin(reportedTeam, eq(report.reportedTeamId, reportedTeam.id))
     .leftJoin(reportStatus, eq(report.id, reportStatus.reportId))
+    .leftJoin(strike, eq(report.id, strike.reportId))
+    .leftJoin(strikeReason, eq(strike.strikeReasonId, strikeReason.id))
     .where(
       and(
         values.reporter != null ? eq(report.reporterTeamId, reporterIdSubquery!.id) : undefined,
diff --git a/src/db/schema/strike.ts b/src/db/schema/strike.ts
index 887a19e..8947520 100644
--- a/src/db/schema/strike.ts
+++ b/src/db/schema/strike.ts
@@ -3,7 +3,6 @@ import { strikeReason } from '@db/schema/strikeReason.ts';
 import type { MySql2Database } from 'drizzle-orm/mysql2';
 import { eq } from 'drizzle-orm';
 import { report } from '@db/schema/report.ts';
-import { strikeReasons } from '@app/admin/strikeReasons/strikeReasons.ts';
 
 type Database = MySql2Database<{ strike: typeof strike }>;
 
@@ -23,6 +22,10 @@ export type EditStrikeReq = {
   strikeReasonId: number;
 };
 
+export type DeleteStrikeReq = {
+  reportId: number;
+};
+
 export type GetStrikeByReportIdReq = {
   reportId: number;
 };
@@ -47,6 +50,10 @@ export async function editStrike(db: Database, values: EditStrikeReq) {
     });
 }
 
+export async function deleteStrike(db: Database, values: DeleteStrikeReq) {
+  return db.delete(strike).where(eq(strike.reportId, values.reportId)).limit(1);
+}
+
 export async function getStrikeByReportId(db: Database, values: GetStrikeByReportIdReq) {
   const strikes = await db
     .select({