Refactor transport planning in DirectorWorker: Updated variable naming for clarity by changing 'shipped' to '_shipped' to indicate unused variable. Removed unused get_branch_user_id function from TransportWorker to streamline code and improve maintainability.
This commit is contained in:
@@ -930,7 +930,7 @@ impl DirectorWorker {
|
|||||||
// - Inventar-Mengen reduziert (geschieht bereits in plan_transports_for_item)
|
// - Inventar-Mengen reduziert (geschieht bereits in plan_transports_for_item)
|
||||||
// Die zurückgegebenen Mengen werden dann lokal verkauft.
|
// Die zurückgegebenen Mengen werden dann lokal verkauft.
|
||||||
for item in items.iter_mut() {
|
for item in items.iter_mut() {
|
||||||
let shipped = self.plan_transports_for_item(
|
let _shipped = self.plan_transports_for_item(
|
||||||
&mut conn,
|
&mut conn,
|
||||||
falukant_user_id,
|
falukant_user_id,
|
||||||
item,
|
item,
|
||||||
|
|||||||
@@ -492,30 +492,6 @@ impl TransportWorker {
|
|||||||
Ok(())
|
Ok(())
|
||||||
}
|
}
|
||||||
|
|
||||||
fn get_branch_user_id(pool: &ConnectionPool, branch_id: i32) -> Result<i32, DbError> {
|
|
||||||
let mut conn = pool
|
|
||||||
.get()
|
|
||||||
.map_err(|e| DbError::new(format!("DB-Verbindung fehlgeschlagen: {e}")))?;
|
|
||||||
|
|
||||||
const QUERY_GET_BRANCH_USER: &str = r#"
|
|
||||||
SELECT falukant_user_id
|
|
||||||
FROM falukant_data.branch
|
|
||||||
WHERE id = $1
|
|
||||||
LIMIT 1;
|
|
||||||
"#;
|
|
||||||
|
|
||||||
conn.prepare("get_branch_user", QUERY_GET_BRANCH_USER)?;
|
|
||||||
let rows = conn.execute("get_branch_user", &[&branch_id])?;
|
|
||||||
|
|
||||||
let user_id = rows
|
|
||||||
.get(0)
|
|
||||||
.and_then(|r| r.get("falukant_user_id"))
|
|
||||||
.and_then(|v| v.parse::<i32>().ok())
|
|
||||||
.unwrap_or(-1);
|
|
||||||
|
|
||||||
Ok(user_id)
|
|
||||||
}
|
|
||||||
|
|
||||||
fn insert_transport_waiting_notification(
|
fn insert_transport_waiting_notification(
|
||||||
pool: &ConnectionPool,
|
pool: &ConnectionPool,
|
||||||
user_id: i32,
|
user_id: i32,
|
||||||
|
|||||||
Reference in New Issue
Block a user