bonkmaykr/ojrc
1
0
Fork 0
mirror of https://git.ngram.ca/OpenJam/rc-servers synced 2026-08-23 23:08:52 +00:00
Code Activity

Fix empty factory cube amounts causing incorrect CPU display

Browse Source
This commit is contained in:
NG (Graham)
2026-01-04 16:05:13 -05:00
parent 901bf76e19
commit 50eb3f471e
1 changed files with 15 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

17
rc_factory/src/arc/adapter.rs
View File

@@ -42,6 +42,10 @@ impl ArcAdapter {
meta meta
} }
} }
fn parse_cube_amounts(&self, cube_amounts: &str) -> std::collections::HashMap<u32, u32> {
serde_json::from_str(cube_amounts).unwrap_or_default()
}
} }
#[async_trait::async_trait] #[async_trait::async_trait]
@@ -80,7 +84,7 @@ impl crate::VehicleFactoryAdapter for ArcAdapter {
banner_message: Default::default(), banner_message: Default::default(),
combat_rating: meta.combat_rating, combat_rating: meta.combat_rating,
cosmetic_rating: meta.cosmetic_rating, cosmetic_rating: meta.cosmetic_rating,
cube_amounts: Default::default(), // FIXME parse cube amounts cube_amounts: self.parse_cube_amounts(&cubes.cube_amounts),
} }
))) )))
} else { } else {
@@ -154,6 +158,15 @@ impl crate::VehicleFactoryAdapter for ArcAdapter {
let metadata_pages = query_params.paginate(&self.orm, query.page_size as u64); let metadata_pages = query_params.paginate(&self.orm, query.page_size as u64);
let metadatas = metadata_pages.fetch_page((query.page - 1) as u64).await?; let metadatas = metadata_pages.fetch_page((query.page - 1) as u64).await?;
let mut infos = Vec::with_capacity(metadatas.len()); let mut infos = Vec::with_capacity(metadatas.len());
let cubes_to_retrieve: std::collections::HashSet<_> = metadatas.iter().map(|meta| meta.id).collect();
let cube_amounts: std::collections::HashMap<u32, String> = super::entities::robot_cubes::Entity::find()
.filter(super::entities::robot_cubes::Column::Id.is_in(cubes_to_retrieve))
.all(&self.orm)
.await?
.into_iter()
.map(|cubes| (cubes.id, cubes.cube_amounts))
.collect();
for meta in metadatas { for meta in metadatas {
//let cube_amounts = super::entities::robot_cubes::Entity::find_by_id(meta.id).one(&self.orm).await?.map(|x| x.cube_amounts).unwrap_or_else(|| "".to_owned()); //let cube_amounts = super::entities::robot_cubes::Entity::find_by_id(meta.id).one(&self.orm).await?.map(|x| x.cube_amounts).unwrap_or_else(|| "".to_owned());
infos.push( infos.push(
@@ -177,7 +190,7 @@ impl crate::VehicleFactoryAdapter for ArcAdapter {
banner_message: Default::default(), banner_message: Default::default(),
combat_rating: meta.combat_rating, combat_rating: meta.combat_rating,
cosmetic_rating: meta.cosmetic_rating, cosmetic_rating: meta.cosmetic_rating,
cube_amounts: Default::default(), cube_amounts: if let Some(cube_amounts) = cube_amounts.get(&meta.id) { self.parse_cube_amounts(cube_amounts) } else { Default::default() },
} }
); );
} }