ps2.live/saerro
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

make experience more specific

Browse source
This commit is contained in:
41666 2023-06-29 15:30:29 -04:00
parent 143ec0cd3b
commit a1f0e32e30
3 changed files with 69 additions and 7 deletions
Download patch file Download diff file Expand all files Collapse all files

11
services/api/src/analytics.rs
View file

@ -24,7 +24,16 @@ impl Analytics {
) -> Vec<Event> {
let pool = ctx.data::<Pool<Postgres>>().unwrap();
let sql = format!("SELECT time_bucket_gapfill('{} seconds', time, start => now() - '{}'::interval, finish => now()) AS bucket, CASE WHEN count(*) IS NULL THEN 0 ELSE count(*) END AS count, event_name, world_id FROM analytics WHERE event_name IN ('Death', 'VehicleDestroy', 'GainExperience') AND time > now() - '{}'::interval {} GROUP BY bucket, world_id, event_name ORDER BY bucket ASC",
let sql = format!("
SELECT
time_bucket_gapfill('{} seconds', time, start => now() - '{}'::interval, finish => now()) AS bucket,
CASE WHEN count(*) IS NULL THEN 0 ELSE count(*) END AS count,
event_name,
world_id
FROM analytics
WHERE time > now() - '{}'::interval {}
GROUP BY bucket, world_id, event_name
ORDER BY bucket ASC",
if hi_precision {
5
} else {

47
services/api/src/html/ingest.html
View file

@ -147,6 +147,15 @@
<canvas id="ceres" />
</div>
</div>
<div class="wide">
<div class="graph-head">
<h3>Experience Events By ID</h3>
<p class="exp-sums">(0, 0, 0, 0)</p>
</div>
<div class="chart-container">
<canvas id="exp-by-id" />
</div>
</div>
</div>
<p>
[<a href="/">home</a>] [<a href="/ingest">1 day w/ 5m buckets</a>] [<a
@ -204,7 +213,9 @@
doSums(id, events);
let allEvents = events.reduce(
(acc, ev) => {
acc[ev.eventName][ev.time] = (acc[ev.time] || 0) + ev.count;
const eventName = ev.eventName.replace(/_[0-9]+/g, "");
acc[eventName][ev.time] = acc[eventName][ev.time] ?? 0;
acc[eventName][ev.time] += ev.count;
return acc;
},
{ Death: {}, VehicleDestroy: {}, GainExperience: {} }
@ -215,7 +226,7 @@
options: {
scales: {
y: { beginAtZero: true, suggestedMin: 0 },
x: { stacked: true, type: "timeseries" },
x: { stacked: false, type: "timeseries" },
},
},
data: {
@ -237,6 +248,37 @@
});
};
const experienceEventsByID = (eventsUnfiltered) => {
const events = eventsUnfiltered.filter((ev) =>
ev.eventName.startsWith("GainExperience_")
);
doSums("exp-by-id", events);
let allEvents = events.reduce((acc, ev) => {
const eventID = ev.eventName.replace(/GainExperience_([0-9]+)/g, "$1");
acc[eventID] = acc[eventID] ?? {};
acc[eventID][ev.time] = acc[eventID][ev.time] ?? 0;
acc[eventID][ev.time] += ev.count;
return acc;
}, {});
new Chart(document.getElementById("exp-by-id"), {
type: "bar",
options: {
scales: {
y: { beginAtZero: true, suggestedMin: 0 },
x: { stacked: true, type: "timeseries" },
},
},
data: {
datasets: Object.keys(allEvents).map((id) => ({
label: id,
data: allEvents[id],
})),
},
});
};
const eventsByWorld = (events) => {
let allEvents = events.reduce((acc, ev) => {
acc[ev.worldId] = acc[ev.worldId] || {};
@ -341,5 +383,6 @@
let worldEvents = events.filter((ev) => ev.worldId === id);
allEventsByType(world, worldEvents);
});
experienceEventsByID(events);
})();
</script>