sandvich
/
availabili.tf
1
0
Fork 0
Code Issues 1 Pull Requests Packages Projects Releases Wiki Activity

fix: Fix logs not pulling correctly

master
John Montagu, the 4th Earl of Sandvich 2024-12-11 20:31:14 -08:00
parent c7874d6d11
commit b41dbefa55
Signed by: sandvich
GPG Key ID: 9A39BE37E602B22D
1 changed files with 5 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
backend-flask/jobs/fetch_logstf.py
View File

@ -18,7 +18,7 @@ celery = app_db.connect_celery_with_app()
@celery.on_after_configure.connect @celery.on_after_configure.connect
def setup_periodic_task(sender, **kwargs): def setup_periodic_task(sender, **kwargs):
sender.add_periodic_task(30.0, etl_periodic.s(), name="Fetch logs every 5 minutes") sender.add_periodic_task(300.0, etl_periodic.s(), name="Fetch logs every 5 minutes")
FETCH_URL = "https://logs.tf/api/v1/log/{}" FETCH_URL = "https://logs.tf/api/v1/log/{}"
SEARCH_URL = "https://logs.tf/api/v1/log?limit=25?offset={}" SEARCH_URL = "https://logs.tf/api/v1/log?limit=25?offset={}"
@ -115,18 +115,13 @@ def update_playtime(steam_ids: list[int]):
app_db.db.session.commit() app_db.db.session.commit()
def get_common_teams(steam_ids: list[str]): def get_common_teams(steam_ids: list[int]):
return ( return (
app_db.db.session.query( app_db.db.session.query(
PlayerTeam.team_id, PlayerTeam.team_id,
func.count(PlayerTeam.team_id), func.count(PlayerTeam.team_id),
TeamLogsTfIntegration.min_team_member_count,
#aggregate_func #aggregate_func
) )
.outerjoin(
TeamLogsTfIntegration,
TeamLogsTfIntegration.team_id == PlayerTeam.team_id
)
.where(PlayerTeam.player_id.in_(steam_ids)) .where(PlayerTeam.player_id.in_(steam_ids))
.group_by(PlayerTeam.team_id) .group_by(PlayerTeam.team_id)
.order_by(func.count(PlayerTeam.team_id).desc()) .order_by(func.count(PlayerTeam.team_id).desc())
@ -188,7 +183,9 @@ def transform(
row_tuple = tuple(row) row_tuple = tuple(row)
team_id = row_tuple[0] team_id = row_tuple[0]
player_count = row_tuple[1] player_count = row_tuple[1]
log_min_player_count = row_tuple[2] or 100 log_min_player_count = app_db.db.session.query(
TeamLogsTfIntegration.min_team_member_count
).where(TeamLogsTfIntegration.team_id == team_id).one_or_none() or 100
should_create_team_match = False should_create_team_match = False