MatthiasQuintern/regina
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

fixed request count statement

Browse Source
This commit is contained in:
Matthias@Dell 2023-05-18 10:59:18 +02:00
parent 5f68ab0f85
commit 180bae3a1b
1 changed files with 13 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
regina/data_visualization/history.py
View File

@ -12,10 +12,19 @@ def get_visitor_count_between(db: Database, timestamps: tuple[int, int], only_hu
{'AND v.is_human = 1' if only_human else ''}""")[0][0] {'AND v.is_human = 1' if only_human else ''}""")[0][0]
def get_request_count_between(db: Database, timestamps: tuple[int, int], only_human=False): def get_request_count_between(db: Database, timestamps: tuple[int, int], only_human=False):
return db(f"""SELECT COUNT(r.request_id) if only_human:
FROM request AS r, visitor AS v return db(f"""SELECT COUNT(r.request_id)
WHERE r.time BETWEEN {timestamps[0]} AND {timestamps[1]} FROM request AS r
{'AND v.is_human = 1' if only_human else ''}""")[0][0] JOIN (
SELECT visitor_id
FROM visitor
{'WHERE is_human = 1' if only_human else ''}
) AS v ON v.visitor_id = r.visitor_id
WHERE r.time BETWEEN {timestamps[0]} AND {timestamps[1]}""")[0][0]
else:
return db(f"""SELECT COUNT(*)
FROM request
WHERE time BETWEEN {timestamps[0]} AND {timestamps[1]}""")[0][0]
def get_new_visitor_count_between(db: Database, timestamps: tuple[int, int]): def get_new_visitor_count_between(db: Database, timestamps: tuple[int, int]):