torsten/yourpart-daemon
1
0
Fork 0
Code Issues Pull Requests 1 Actions Packages Projects Releases Wiki Activity

Refactor relationship type retrieval in character workers: Simplify the extraction of relationship types in CharacterCreationWorker, EventsWorker, and UserCharacterWorker by streamlining the use of and_then for better readability and maintainability.

Browse Source
This commit is contained in:
Torsten Schulz (local)
2026-01-23 10:48:15 +01:00
parent 0399333163
commit c8668c59eb
3 changed files with 3 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
src/worker/character_creation.rs
View File

@@ -3,7 +3,6 @@ use crate::message_broker::MessageBroker;
use rand::distributions::{Distribution, Uniform}; use rand::distributions::{Distribution, Uniform};
use rand::rngs::StdRng; use rand::rngs::StdRng;
use rand::{thread_rng, Rng, SeedableRng}; use rand::{thread_rng, Rng, SeedableRng};
use serde_json::json;
use std::collections::{HashMap, HashSet}; use std::collections::{HashMap, HashSet};
use std::sync::atomic::{AtomicBool, Ordering}; use std::sync::atomic::{AtomicBool, Ordering};
use std::sync::Arc; use std::sync::Arc;
@@ -437,8 +436,7 @@ impl CharacterCreationWorker {
.and_then(|v| v.parse::<i32>().ok()); .and_then(|v| v.parse::<i32>().ok());
let relationship_type_tr = row let relationship_type_tr = row
.get("relationship_type_tr") .get("relationship_type_tr")
.and_then(|v| v.as_str()) .and_then(|v| v.as_str().map(|s| s.to_string()));
.map(|s| s.to_string());
// Logging: Relationship wurde gelöscht // Logging: Relationship wurde gelöscht
eprintln!( eprintln!(

3
src/worker/events.rs
View File

@@ -1797,8 +1797,7 @@ impl EventsWorker {
.and_then(|v| v.parse::<i32>().ok()); .and_then(|v| v.parse::<i32>().ok());
let relationship_type_tr = row let relationship_type_tr = row
.get("relationship_type_tr") .get("relationship_type_tr")
.and_then(|v| v.as_str()) .and_then(|v| v.as_str().map(|s| s.to_string()));
.map(|s| s.to_string());
// Logging: Relationship wurde gelöscht // Logging: Relationship wurde gelöscht
eprintln!( eprintln!(

4
src/worker/user_character.rs
View File

@@ -3,7 +3,6 @@ use crate::message_broker::MessageBroker;
use rand::distributions::{Distribution, Uniform}; use rand::distributions::{Distribution, Uniform};
use rand::rngs::StdRng; use rand::rngs::StdRng;
use rand::SeedableRng; use rand::SeedableRng;
use serde_json::json;
use std::sync::atomic::Ordering; use std::sync::atomic::Ordering;
use std::sync::Arc; use std::sync::Arc;
use std::time::{Duration, Instant}; use std::time::{Duration, Instant};
@@ -601,8 +600,7 @@ impl UserCharacterWorker {
.and_then(|v| v.parse::<i32>().ok()); .and_then(|v| v.parse::<i32>().ok());
let relationship_type_tr = row let relationship_type_tr = row
.get("relationship_type_tr") .get("relationship_type_tr")
.and_then(|v| v.as_str()) .and_then(|v| v.as_str().map(|s| s.to_string()));
.map(|s| s.to_string());
// Logging: Relationship wurde gelöscht // Logging: Relationship wurde gelöscht
eprintln!( eprintln!(