Tribes2/t2-stat-parser
1
0
Fork 0
mirror of https://github.com/amineo/t2-stat-parser.git synced 2026-01-19 17:34:43 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Merge pull request #3 from exogen/bugfix/null-discjumps

Browse source 
Fix null discjumps and potential divide by zero
This commit is contained in:
Anthony Mineo 2021-04-30 21:53:24 -04:00 committed by GitHub
parent 4bb29a22ff 05fa275f85
commit d0f963911f
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
1 changed files with 5 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

10
app/api/src/players/players.service.ts
View file

@ -62,8 +62,8 @@ export class PlayersService {
const hitsValue = '(game.stats->:hitsStat->>0)::integer'; const hitsValue = '(game.stats->:hitsStat->>0)::integer';
const shotsValue = '(game.stats->:shotsStat->>0)::integer'; const shotsValue = '(game.stats->:shotsStat->>0)::integer';
const discJumpsValue = "(game.stats->'discJumpTG'->>0)::integer"; const discJumpsValue = "COALESCE((game.stats->'discJumpTG'->>0)::integer, 0)";
const killerDiscJumpsValue = "(game.stats->'killerDiscJumpTG'->>0)::integer"; const killerDiscJumpsValue = "COALESCE((game.stats->'killerDiscJumpTG'->>0)::integer, 0)";
// pgSQL doesn't let you reference aliased selections you've made in the // pgSQL doesn't let you reference aliased selections you've made in the
// same select statement, so unfortunately these computed JSON values are // same select statement, so unfortunately these computed JSON values are
@ -79,9 +79,9 @@ export class PlayersService {
let aggregatedShots = `SUM(${shotsValue})::integer`; let aggregatedShots = `SUM(${shotsValue})::integer`;
if (excludeDiscJumps) { if (excludeDiscJumps) {
// Since subtracting disc jumps could theoretically drop the shots count // Since subtracting disc jumps could theoretically drop the shots count
// to 0, clamp it to at least the number of hits, otherwise it'd be // to 0, clamp it to at least the number of hits or 1, otherwise it'd be
// possible to have >100% accuracy. // possible to divide by zero.
aggregatedShots = `GREATEST(${aggregatedHits}, ${aggregatedShots} - ${aggregatedDiscJumps})` aggregatedShots = `GREATEST(1, ${aggregatedHits}, ${aggregatedShots} - ${aggregatedDiscJumps})`
} }
// Cast to float to avoid integer division truncating the result. // Cast to float to avoid integer division truncating the result.