Redume/Kekkai
1
0
Fork 0
mirror of https://github.com/Redume/Kekkai.git synced 2025-02-23 12:43:12 +03:00
Code Issues Projects Releases Packages Wiki Activity Actions

feat(chart): В ответе от апи теперь полностью показывается url, а не путь
Some checks failed
Create and publish a Docker image / build-and-push-server (push) Has been cancelled
Details
Create and publish a Docker image / build-and-push-chart (push) Has been cancelled
Details
Create and publish a Docker image / build-and-push-CR (push) Has been cancelled
Details
Deploy docs / deploy (push) Has been cancelled
Details

Browse source
This commit is contained in:
Данил 2024-10-28 16:32:51 +03:00
parent eb54ddb2a9
commit 34d216de94
1 changed files with 26 additions and 5 deletions
Download patch file Download diff file Expand all files Collapse all files

31
chart/main.py
View file

@ -10,7 +10,7 @@ import dateutil.relativedelta
import random import random
import string import string
from fastapi import FastAPI, Response, status from fastapi import FastAPI, Response, status, Request
from psycopg2.extras import DictCursor from psycopg2.extras import DictCursor
from starlette.staticfiles import StaticFiles from starlette.staticfiles import StaticFiles
@ -37,21 +37,39 @@ app.mount('/static/charts', StaticFiles(directory='../charts/'))
app.middleware('http')(PlausibleAnalytics()) app.middleware('http')(PlausibleAnalytics())
@app.get("/api/getChart/", status_code=status.HTTP_201_CREATED) @app.get("/api/getChart/", status_code=status.HTTP_201_CREATED)
async def get_chart(response: Response, from_currency: str, conv_currency: str, start_date: str, end_date: str): async def get_chart(
response: Response,
request: Request,
from_currency: str,
conv_currency: str,
start_date: str,
end_date: str
):
chart = await create_chart(from_currency, conv_currency, start_date, end_date) chart = await create_chart(from_currency, conv_currency, start_date, end_date)
if not chart: if not chart:
response.status_code = status.HTTP_404_NOT_FOUND response.status_code = status.HTTP_404_NOT_FOUND
return {'message': 'No data found.', 'status_code': status.HTTP_404_NOT_FOUND} return {'message': 'No data found.', 'status_code': status.HTTP_404_NOT_FOUND}
host = request.headers.get("host")
url_schema = request.url.scheme
return { return {
'message': f'./static/charts/{chart}.png', 'message': f'{url_schema}://{host}/static/charts/{chart}.png',
'status_code': status.HTTP_201_CREATED, 'status_code': status.HTTP_201_CREATED,
} }
@app.get("/api/getChart/{period}", status_code=status.HTTP_201_CREATED) @app.get("/api/getChart/{period}", status_code=status.HTTP_201_CREATED)
async def get_chart_period(response: Response, from_currency: str, conv_currency: str, period: str): async def get_chart_period(
response: Response,
request: Request,
from_currency: str,
conv_currency: str,
period: str
):
if period not in ['week', 'month', 'quarter', 'year']: if period not in ['week', 'month', 'quarter', 'year']:
response.status_code = status.HTTP_400_BAD_REQUEST response.status_code = status.HTTP_400_BAD_REQUEST
return {'message': 'Invalid period.', 'status_code': status.HTTP_400_BAD_REQUEST} return {'message': 'Invalid period.', 'status_code': status.HTTP_400_BAD_REQUEST}
@ -80,8 +98,11 @@ async def get_chart_period(response: Response, from_currency: str, conv_currency
response.status_code = status.HTTP_404_NOT_FOUND response.status_code = status.HTTP_404_NOT_FOUND
return {'message': 'No data found.', 'status_code': status.HTTP_404_NOT_FOUND} return {'message': 'No data found.', 'status_code': status.HTTP_404_NOT_FOUND}
host = request.headers.get("host")
url_schema = request.url.scheme
return { return {
'message': f'./static/charts/{chart}.png', 'message': f'{url_schema}://{host}/static/charts/{chart}.png',
'status_code': status.HTTP_201_CREATED, 'status_code': status.HTTP_201_CREATED,
} }