Skip to content

Commit

Permalink
fix package fetch after delete
Browse files Browse the repository at this point in the history
fix division by 0 in stats
  • Loading branch information
Lukas-Heiligenbrunner committed Feb 14, 2025
1 parent f81abbc commit 162b836
Show file tree
Hide file tree
Showing 2 changed files with 13 additions and 8 deletions.
11 changes: 6 additions & 5 deletions backend/src/api/package.rs
Original file line number Diff line number Diff line change
Expand Up @@ -178,19 +178,20 @@ pub async fn package_del(
) -> Result<(), BadRequest<String>> {
let db = db as &DatabaseConnection;

package_delete(db, id)
.await
.map_err(|e| BadRequest(e.to_string()))?;

// query this before deleting package!
let pkg = Packages::find_by_id(id)
.one(db)
.await
.map_err(|e| BadRequest(e.to_string()))?
.ok_or(BadRequest("id not found".to_string()))?;

package_delete(db, id)
.await
.map_err(|e| BadRequest(e.to_string()))?;

al.add(
PackageDeleteActivity { package: pkg.name },
ActivityType::UpdatePackage,
ActivityType::RemovePackage,
a.username,
)
.await
Expand Down
10 changes: 7 additions & 3 deletions backend/src/api/stats.rs
Original file line number Diff line number Diff line change
Expand Up @@ -210,9 +210,13 @@ SELECT
.await?
.ok_or(anyhow::anyhow!("No last build cnts"))?;

let build_trend = (last_build_cnt.last_30_days_builds as f32
/ last_build_cnt.prev_30_days_builds as f32)
- 1.0;
let build_trend = match last_build_cnt.prev_30_days_builds {
0 => 0.0,
_ => {
(last_build_cnt.last_30_days_builds as f32 / last_build_cnt.prev_30_days_builds as f32)
- 1.0
}
};

Ok(ListStats {
total_builds,
Expand Down

0 comments on commit 162b836

Please sign in to comment.