Skip to content
Merged
Show file tree
Hide file tree
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
29 changes: 18 additions & 11 deletions backend/api/partners/statistics.py
Original file line number Diff line number Diff line change
Expand Up @@ -109,11 +109,15 @@ async def get_filtered_statistics(
sub_code=MAPSWIPE_GROUP_EMPTY_SUBCODE,
message=MAPSWIPE_GROUP_EMPTY_MESSAGE,
)

mapswipe = MapswipeService()
return mapswipe.fetch_filtered_partner_stats(
partner.id, partner.mapswipe_group_id, from_date, to_date
)
try:
result = await mapswipe.fetch_filtered_partner_stats(
partner.id, partner.mapswipe_group_id, from_date, to_date
)
finally:
await mapswipe.aclose()

return result


@router.get("/{permalink:str}/general-statistics/")
Expand Down Expand Up @@ -176,13 +180,16 @@ async def get_general_statistics(
)

mapswipe = MapswipeService()
group_dto = mapswipe.fetch_grouped_partner_stats(
partner.id,
partner.mapswipe_group_id,
limit,
offset,
download_as_csv,
)
try:
group_dto = await mapswipe.fetch_grouped_partner_stats(
partner.id,
partner.mapswipe_group_id,
limit,
offset,
download_as_csv,
)
finally:
await mapswipe.aclose()

if download_as_csv:
csv_content = group_dto.to_csv()
Expand Down
5 changes: 5 additions & 0 deletions backend/config.py
Original file line number Diff line number Diff line change
Expand Up @@ -269,6 +269,11 @@ def assemble_db_connection(
# Sentry backend DSN
SENTRY_BACKEND_DSN: Optional[str] = os.getenv("TM_SENTRY_BACKEND_DSN", None)

# Mapswipe backend url
MAPSWIPE_API_URL: str = os.getenv(
"MAPSWIPE_API_URL", "https://backend.mapswipe.org/graphql/"
)

# Ohsome Stats Token
OHSOME_STATS_TOKEN: str = os.getenv("OHSOME_STATS_TOKEN", None)
OHSOME_STATS_API_URL: str = os.getenv(
Expand Down
Loading
Loading