Füge zusätzliche Informationen zu Lagerzerstörungen hinzu: Erweitere die Funktionen zur Verarbeitung von persönlichen und regionalen Lager-Schäden, um die ID und den Titel des Ereignisses als Schadensursache zu übergeben und in den Rückgaben zu integrieren.
All checks were successful
Deploy yourpart (blue-green) / deploy (push) Successful in 1m56s
All checks were successful
Deploy yourpart (blue-green) / deploy (push) Successful in 1m56s
This commit is contained in:
@@ -641,6 +641,8 @@ impl EventsWorker {
|
|||||||
if let Some(effect_json) = Self::handle_personal_storage_damage_effect(
|
if let Some(effect_json) = Self::handle_personal_storage_damage_effect(
|
||||||
&mut conn,
|
&mut conn,
|
||||||
user_id,
|
user_id,
|
||||||
|
&event.id,
|
||||||
|
&event.title,
|
||||||
stock_type_label,
|
stock_type_label,
|
||||||
*probability,
|
*probability,
|
||||||
*inventory_damage_min_percent,
|
*inventory_damage_min_percent,
|
||||||
@@ -965,6 +967,8 @@ impl EventsWorker {
|
|||||||
if let Some(effect_json) = Self::handle_regional_storage_damage_effect(
|
if let Some(effect_json) = Self::handle_regional_storage_damage_effect(
|
||||||
&mut conn,
|
&mut conn,
|
||||||
region_id,
|
region_id,
|
||||||
|
&event.id,
|
||||||
|
&event.title,
|
||||||
stock_type_label,
|
stock_type_label,
|
||||||
*probability,
|
*probability,
|
||||||
*inventory_damage_min_percent,
|
*inventory_damage_min_percent,
|
||||||
@@ -1560,6 +1564,8 @@ impl EventsWorker {
|
|||||||
fn handle_personal_storage_damage_effect(
|
fn handle_personal_storage_damage_effect(
|
||||||
conn: &mut DbConnection,
|
conn: &mut DbConnection,
|
||||||
user_id: i32,
|
user_id: i32,
|
||||||
|
damage_reason_event_id: &str,
|
||||||
|
damage_reason: &str,
|
||||||
stock_type_label: &str,
|
stock_type_label: &str,
|
||||||
probability: f64,
|
probability: f64,
|
||||||
inventory_damage_min_percent: f64,
|
inventory_damage_min_percent: f64,
|
||||||
@@ -1587,6 +1593,8 @@ impl EventsWorker {
|
|||||||
) {
|
) {
|
||||||
return Ok(Some(json!({
|
return Ok(Some(json!({
|
||||||
"type": "storage_damage",
|
"type": "storage_damage",
|
||||||
|
"damage_reason_event_id": damage_reason_event_id,
|
||||||
|
"damage_reason": damage_reason,
|
||||||
"stock_type": stock_type_label,
|
"stock_type": stock_type_label,
|
||||||
"inventory_damage_percent": damage_info.inventory_damage_percent,
|
"inventory_damage_percent": damage_info.inventory_damage_percent,
|
||||||
"storage_destruction_percent": damage_info.storage_destruction_percent,
|
"storage_destruction_percent": damage_info.storage_destruction_percent,
|
||||||
@@ -1605,6 +1613,8 @@ impl EventsWorker {
|
|||||||
fn handle_regional_storage_damage_effect(
|
fn handle_regional_storage_damage_effect(
|
||||||
conn: &mut DbConnection,
|
conn: &mut DbConnection,
|
||||||
region_id: i32,
|
region_id: i32,
|
||||||
|
damage_reason_event_id: &str,
|
||||||
|
damage_reason: &str,
|
||||||
stock_type_label: &str,
|
stock_type_label: &str,
|
||||||
probability: f64,
|
probability: f64,
|
||||||
inventory_damage_min_percent: f64,
|
inventory_damage_min_percent: f64,
|
||||||
@@ -1632,6 +1642,8 @@ impl EventsWorker {
|
|||||||
) {
|
) {
|
||||||
return Ok(Some(json!({
|
return Ok(Some(json!({
|
||||||
"type": "storage_damage",
|
"type": "storage_damage",
|
||||||
|
"damage_reason_event_id": damage_reason_event_id,
|
||||||
|
"damage_reason": damage_reason,
|
||||||
"stock_type": stock_type_label,
|
"stock_type": stock_type_label,
|
||||||
"region_id": region_id,
|
"region_id": region_id,
|
||||||
"inventory_damage_percent": damage_info.inventory_damage_percent,
|
"inventory_damage_percent": damage_info.inventory_damage_percent,
|
||||||
|
|||||||
Reference in New Issue
Block a user