From 2ac474fe0cd307b685bdf2b224e9645e88e631fd Mon Sep 17 00:00:00 2001 From: "Torsten Schulz (local)" Date: Fri, 23 Jan 2026 10:52:59 +0100 Subject: [PATCH] Refactor relationship type retrieval in user character workers: Simplify the extraction of relationship types in UserCharacterWorker, CharacterCreationWorker, and EventsWorker by replacing `and_then` with `map` for improved readability and consistency. --- src/worker/character_creation.rs | 2 +- src/worker/events.rs | 2 +- src/worker/user_character.rs | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/src/worker/character_creation.rs b/src/worker/character_creation.rs index 306a9d6..96ac47b 100644 --- a/src/worker/character_creation.rs +++ b/src/worker/character_creation.rs @@ -436,7 +436,7 @@ impl CharacterCreationWorker { .and_then(|v| v.parse::().ok()); let relationship_type_tr = row .get("relationship_type_tr") - .and_then(|v| v.as_str().map(|s| s.to_string())); + .map(|s| s.to_string()); // Logging: Relationship wurde gelöscht eprintln!( diff --git a/src/worker/events.rs b/src/worker/events.rs index 7ee18b7..23fdc8b 100644 --- a/src/worker/events.rs +++ b/src/worker/events.rs @@ -1797,7 +1797,7 @@ impl EventsWorker { .and_then(|v| v.parse::().ok()); let relationship_type_tr = row .get("relationship_type_tr") - .and_then(|v| v.as_str().map(|s| s.to_string())); + .map(|s| s.to_string()); // Logging: Relationship wurde gelöscht eprintln!( diff --git a/src/worker/user_character.rs b/src/worker/user_character.rs index c6d28fb..89880ff 100644 --- a/src/worker/user_character.rs +++ b/src/worker/user_character.rs @@ -600,7 +600,7 @@ impl UserCharacterWorker { .and_then(|v| v.parse::().ok()); let relationship_type_tr = row .get("relationship_type_tr") - .and_then(|v| v.as_str().map(|s| s.to_string())); + .map(|s| s.to_string()); // Logging: Relationship wurde gelöscht eprintln!(