Skip to content
Closed
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
24 changes: 16 additions & 8 deletions backend/services/users/user_service.py
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,8 @@
from databases import Database
from loguru import logger
from sqlalchemy import and_, desc, distinct, func, insert, select
from httpx import AsyncClient
import requests
import asyncio

from backend.config import Settings
from backend.exceptions import NotFound
Expand Down Expand Up @@ -172,6 +173,9 @@ async def get_projects_mapped(user_id: int, db: Database):

@staticmethod
async def get_and_save_stats(user_id: int, db: Database) -> dict:
def sync_get(url, headers):
return requests.get(url, headers=headers, timeout=10.0)

hashtag = settings.DEFAULT_CHANGESET_COMMENT.replace("#", "")
oh_some_url = (
f"{settings.OHSOME_STATS_API_URL}/stats/user?"
Expand All @@ -180,11 +184,17 @@ async def get_and_save_stats(user_id: int, db: Database) -> dict:
)
osm_user_details_url = f"{settings.OSM_SERVER_URL}/api/0.6/user/{user_id}.json"

oh_some_headers = {"Authorization": f"Basic {settings.OHSOME_STATS_TOKEN}"}

async with AsyncClient(timeout=10.0) as client:
oh_some_response = await client.get(oh_some_url, headers=oh_some_headers)
changeset_response = await client.get(osm_user_details_url)
oh_some_headers = {
"Authorization": f"Basic {settings.OHSOME_STATS_TOKEN}",
"User-Agent": "HOT-Tasking-Manager/5.0",
}
osm_headers = {
"User-Agent": "HOT-Tasking-Manager/5.0",
}
oh_some_response, changeset_response = await asyncio.gather(
asyncio.to_thread(sync_get, oh_some_url, oh_some_headers),
asyncio.to_thread(sync_get, osm_user_details_url, osm_headers),
)

if oh_some_response.status_code != 200:
error_msg = (
Expand Down Expand Up @@ -217,9 +227,7 @@ async def get_and_save_stats(user_id: int, db: Database) -> dict:
topic_data["result"]["topics"]["changeset"] = {
"value": changeset_data["user"]["changesets"]["count"],
}

new_stats = await UserStats.update(user_id, topic_data, db)

return new_stats

@staticmethod
Expand Down
Loading