ED/SquadsActivityMonitor
1
0
Fork 0
mirror of https://github.com/norohind/SquadsActivityMonitor.git synced 2025-04-12 13:00:02 +03:00
Code Issues Projects Releases Wiki Activity

WIP: model.get_leaderboard_sum_history and all appropriate stuff

Browse Source
This commit is contained in:
norohind 2021-12-10 00:56:48 +03:00
parent 8879f76372
commit 5360ab2e31
Signed by: norohind
GPG Key ID: 01C3BECC26FB59E1
6 changed files with 128 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
model/__init__.py
View File

@ -11,3 +11,5 @@ model: AbstractModel = PostgresModel()
if config.log_level == 'DEBUG':
model.get_diff_action_id = utils.measure(model.get_diff_action_id, 'model.get_diff_action_id')
model.get_activity_changes = utils.measure(model.get_activity_changes, 'model.get_activity_changes')
model.get_leaderboard_sum_history = utils.measure(model.get_leaderboard_sum_history,
'model.get_leaderboard_sum_history')

4
model/abstract_model.py
View File

@ -23,3 +23,7 @@ class AbstractModel(abc.ABC):
@abc.abstractmethod
def get_diff_action_id(self, action_id: int) -> list:
raise NotImplemented
@abc.abstractmethod
def get_leaderboard_sum_history(self, platform: str, leaderboard_type: str) -> list[dict]:
raise NotImplemented

23
model/postgres_model.py
View File

@ -143,3 +143,26 @@ class PostgresModel(AbstractModel):
cache.set(cache_key, json.dumps(result))
return result
@errors_catcher
def get_leaderboard_sum_history(self, platform: str, leaderboard_type: str) -> list[dict]:
cache_key = f'sum_history_{platform}_{leaderboard_type}'
cached_result: typing.Union[str, None] = cache.get(cache_key)
if cached_result is not None:
logger.debug(f'Cached result for {cache_key}')
return json.loads(cached_result)
with self.db.cursor(cursor_factory=psycopg2.extras.RealDictCursor) as cursor:
cursor.execute(
postgres_sql_requests.select_leaderboard_sum_history,
{
'LB_type': utils.LeaderboardTypes(leaderboard_type.lower()).value,
'platform': utils.Platform(platform.upper()).value}
)
result: list = cursor.fetchall()
if not cache.disabled:
cache.set(cache_key, json.dumps(result))
return result

12
model/postgres_sql_requests.py
View File

@ -84,4 +84,14 @@ full join
limit 1)) old_stats
on new_stats.squadron_id = old_stats.squadron_id
where coalesce(new_stats.score, 0) - coalesce(old_stats.score, 0) <> 0
order by coalesce(new_stats.score, 0) - coalesce(old_stats.score, 0) desc;"""
order by coalesce(new_stats.score, 0) - coalesce(old_stats.score, 0) desc;"""
select_leaderboard_sum_history = """select
sum(score)::bigint as "Score Sum",
to_char(max(timestamp), 'YYYY-MM-DD HH24:MI:SS') as "Timestamp UTC"
from squads_stats_states
where leaderboard_type = %(LB_type)s and platform = %(platform)s
group by action_id
order by "Timestamp UTC" desc
limit 1000;
"""

58
templates/graph_template.html Normal file
View File

@ -0,0 +1,58 @@
<!DOCTYPE HTML>
<html lang="en-US">
<head>
<meta charset="UTF-8">
<script src="https://cdn.jsdelivr.net/npm/chart.js"></script>
<script type="text/javascript">
window.addEventListener("load", () => {
let xhr = new XMLHttpRequest();
let api_endpoint = location.protocol + '//' + location.host + '/api' + location.pathname + location.search;
xhr.open('GET', api_endpoint)
xhr.onload = function() {
received_data = JSON.parse(xhr.response);
labels = [];
data_array = [];
for (item_id in received_data) {
item = received_data[item_id]
labels.push(item["Timestamp UTC"]);
data_array.push(item["Score Sum"]);
}
const data = {
labels: labels.reverse(),
datasets: [{
label: ' {{ dataset_title }} ',
backgroundColor: 'rgb(255, 99, 132)',
borderColor: 'rgb(255, 99, 132)',
data: data_array.reverse(),
}]
};
const config = {
type: 'line',
data: data,
options: {}
};
const myChart = new Chart(
document.getElementById('myChart'),
config
);
}
xhr.onerror = function() {
alert('Loading Error');
};
xhr.send()
})
</script>
</head>
<body>
<div>
<canvas id="myChart"></canvas>
</div>
{{ @footer.html }}
</body>
</html>

30
web.py
View File

@ -95,6 +95,33 @@ class ActivityDiffHtml:
)
class SumLeaderboardHistory:
def on_get(self, req: falcon.request.Request, resp: falcon.response.Response, leaderboard: str, platform: str)\
-> None:
resp.content_type = falcon.MEDIA_JSON
try:
resp.text = json.dumps(model.get_leaderboard_sum_history(platform, leaderboard))
except Exception as e:
logger.warning(
f'Exception occurred during executing history request, LB: {leaderboard!r}; platform: {platform!r}',
exc_info=e
)
raise falcon.HTTPInternalServerError(description=str(e))
class SumLeaderboardHistoryHtml:
def on_get(self, req: falcon.request.Request, resp: falcon.response.Response, leaderboard: str, platform: str)\
-> None:
resp.content_type = falcon.MEDIA_HTML
resp.text = render(
'graph_template.html',
{
'dataset_title': f'{leaderboard} {platform} points sum'
})
class MainPage:
def on_get(self, req: falcon.request.Request, resp: falcon.response.Response) -> None:
raise falcon.HTTPMovedPermanently('/index.html')
@ -113,9 +140,12 @@ class Cache:
app = falcon.App()
app.add_route('/api/leaderboard/{leaderboard}/platform/{platform}', Activity())
app.add_route('/api/diff/{action_id}', ActivityDiff())
app.add_route('/leaderboard-history/leaderboard/{leaderboard}/platform/{platform}', SumLeaderboardHistoryHtml())
app.add_route('/leaderboard/{leaderboard}/platform/{platform}', ActivityHtml())
app.add_route('/diff/{action_id}', ActivityDiffHtml())
app.add_route('/api/leaderboard-history/leaderboard/{leaderboard}/platform/{platform}', SumLeaderboardHistory())
app.add_route('/api/cache/{action}', Cache())