From f396ad612eba75ab5c3361e9df071e06af60f01e Mon Sep 17 00:00:00 2001
From: Vargha Csongor <Culisa1023@gmail.com>
Date: Thu, 1 May 2025 22:56:45 +0200
Subject: [PATCH] fix relationship update and save on edit

---
 apps/app/src/lib/profile/Modal.svelte         |  4 +---
 apps/app/src/lib/relationship/Modal.svelte    | 24 +++++++++----------
 .../src/lib/relationship/ModalButtons.svelte  |  2 --
 .../api/relationship/[ID1]/[ID2]/+server.ts   |  2 +-
 4 files changed, 14 insertions(+), 18 deletions(-)

diff --git a/apps/app/src/lib/profile/Modal.svelte b/apps/app/src/lib/profile/Modal.svelte
index 3eb13a2..77b4b13 100644
--- a/apps/app/src/lib/profile/Modal.svelte
+++ b/apps/app/src/lib/profile/Modal.svelte
@@ -65,8 +65,6 @@
 				const data = (await response.json()) as {
 					person?: components['schemas']['Person'];
 				};
-
-				return;
 			} else {
 				const errorDetails = await response.json();
 				alert(
@@ -79,7 +77,7 @@
 		} catch (error) {
 			alert('An unexpected error occurred: ' + error);
 		}
-		editorMode = false;
+		editorMode = !editorMode;
 	}
 </script>
 
diff --git a/apps/app/src/lib/relationship/Modal.svelte b/apps/app/src/lib/relationship/Modal.svelte
index eb72e49..d96f258 100644
--- a/apps/app/src/lib/relationship/Modal.svelte
+++ b/apps/app/src/lib/relationship/Modal.svelte
@@ -7,6 +7,7 @@
 		parent,
 		relation,
 		relation_type,
+		relationship,
 		sibling,
 		spouse,
 		until
@@ -80,8 +81,8 @@
 			if (r.Props.verified === undefined) {
 				r.Props.verified = false;
 			}
-			console.log('Saving relationship', r.StartId, r.EndId, r.Props);
-			const patchBody: components['schemas']['FamilyRelationship'] = r.Props ?? {};
+			console.debug('Saving relationship', r.StartId, r.EndId, r.Props);
+			const patchBody: components['schemas']['FamilyRelationship'] = r.Props!;
 
 			const response = await fetch(`/api/relationship/${r.StartId}/${r.EndId}`, {
 				method: 'PATCH',
@@ -90,17 +91,16 @@
 			});
 
 			if (!response.ok) {
-				console.log(`Failed to save relationship ${r.StartId} → ${r.EndId}`);
+				console.error(`Failed to save relationship ${r.StartId} → ${r.EndId}`);
 			}
 
 			if (response.status === 200) {
-				console.log(`Relationship ${r.StartId} → ${r.EndId} saved successfully`);
+				console.debug(`Relationship ${r.StartId} → ${r.EndId} saved successfully`);
 			} else {
-				console.log(`Failed to save relationship ${r.StartId} → ${r.EndId}`);
+				console.error(`Failed to save relationship ${r.StartId} → ${r.EndId}`);
 			}
 		}
-
-		closeModal();
+		editorMode = !editorMode;
 	}
 
 	async function createNewRelationship() {
@@ -199,7 +199,7 @@
 							<input
 								id={`verified-${index}`}
 								type="checkbox"
-								bind:checked={r.Props!.verified}
+								bind:checked={relationships[index].Props!.verified}
 								class="checkbox"
 							/>
 						{:else}
@@ -211,11 +211,11 @@
 							<label for={`notes-${index}`} class="label">{notes()}</label>
 							<textarea
 								id={`notes-${index}`}
-								bind:value={r.Props!.notes}
+								bind:value={relationships[index].Props!.notes}
 								class="textarea textarea-bordered w-full"
 							></textarea>
 						{:else}
-							<p><strong>{notes()}:</strong> {r.Props?.notes}</p>
+							<p><strong>{notes()}:</strong> {relationships[index].Props?.notes}</p>
 						{/if}
 					</div>
 					<div class="form-control mt-2">
@@ -224,7 +224,7 @@
 							<input
 								id={`from-${index}`}
 								type="date"
-								bind:value={r.Props!.from}
+								bind:value={relationships[index].Props!.from}
 								class="input input-bordered w-full"
 							/>
 						{:else}
@@ -237,7 +237,7 @@
 							<input
 								id={`to-${index}`}
 								type="date"
-								bind:value={r.Props!.to}
+								bind:value={relationships[index].Props!.to}
 								class="input input-bordered w-full"
 							/>
 						{:else}
diff --git a/apps/app/src/lib/relationship/ModalButtons.svelte b/apps/app/src/lib/relationship/ModalButtons.svelte
index d038412..979cfb5 100644
--- a/apps/app/src/lib/relationship/ModalButtons.svelte
+++ b/apps/app/src/lib/relationship/ModalButtons.svelte
@@ -2,9 +2,7 @@
 	import {
 		add_relationship,
 		back,
-		biography,
 		close,
-		create,
 		edit,
 		relation,
 		save
diff --git a/apps/app/src/routes/api/relationship/[ID1]/[ID2]/+server.ts b/apps/app/src/routes/api/relationship/[ID1]/[ID2]/+server.ts
index 45b98bc..d4f61f1 100644
--- a/apps/app/src/routes/api/relationship/[ID1]/[ID2]/+server.ts
+++ b/apps/app/src/routes/api/relationship/[ID1]/[ID2]/+server.ts
@@ -37,7 +37,7 @@ export async function PATCH(event: RequestEvent): Promise<Response> {
 			header: { 'X-User-ID': event.locals.session.userId }
 		},
 		body: {
-			relationship: event.request.json() as components['schemas']['FamilyRelationship']
+			relationship: (await event.request.json()) as components['schemas']['FamilyRelationship']
 		}
 	});