Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
26 commits
Select commit Hold shift + click to select a range
865f2c0
build(deps): bump docker/metadata-action from 3 to 4
dependabot[bot] May 6, 2022
b896c26
build(deps): bump docker/setup-buildx-action from 1 to 2
dependabot[bot] May 6, 2022
83e0248
build(deps): bump docker/build-push-action from 2 to 3
dependabot[bot] May 6, 2022
5630b52
build(deps): update fastapi requirement from ^0.75.2 to ^0.78.0
dependabot[bot] May 16, 2022
e7d9934
Merge pull request #16 from devind-team/develop
MiloslavskiySergey May 19, 2022
2930b11
Merge pull request #12 from devind-team/dependabot/pip/fastapi-tw-0.78.0
MiloslavskiySergey May 20, 2022
35074cc
Merge pull request #5 from devind-team/dependabot/github_actions/dock…
MiloslavskiySergey May 20, 2022
991b0f4
Merge pull request #4 from devind-team/dependabot/github_actions/dock…
MiloslavskiySergey May 20, 2022
60cd235
Merge pull request #2 from devind-team/dependabot/github_actions/dock…
MiloslavskiySergey May 20, 2022
8b0976e
Merge pull request #18 from devind-team/develop
MiloslavskiySergey May 20, 2022
a81f80e
Merge pull request #23 from devind-team/develop
MiloslavskiySergey May 23, 2022
b271755
Merge pull request #29 from devind-team/develop
MiloslavskiySergey Jul 25, 2022
7ea6c69
Merge pull request #30 from devind-team/develop
MiloslavskiySergey Jul 25, 2022
24edd67
Merge pull request #31 from devind-team/develop
MiloslavskiySergey Jul 25, 2022
25d21c0
Merge pull request #32 from devind-team/develop
MiloslavskiySergey Jul 25, 2022
608e443
Merge pull request #33 from devind-team/develop
MiloslavskiySergey Jul 26, 2022
5fa10ae
Merge pull request #34 from devind-team/develop
MiloslavskiySergey Jul 26, 2022
a880ead
Merge pull request #35 from devind-team/develop
MiloslavskiySergey Jul 27, 2022
066d3bd
refactor: change in indicators
MiloslavskiySergey Jul 27, 2022
a04a455
fix: fixed task
MiloslavskiySergey Jul 27, 2022
a824195
refactor: change in indicators
MiloslavskiySergey Jul 27, 2022
038f8bd
Merge branch 'main' into 24-написать-документацию-для-сервиса
MiloslavskiySergey Jul 27, 2022
0116c70
Merge branch 'develop' into 24-написать-документацию-для-сервиса
MiloslavskiySergey Jul 27, 2022
513fff5
Merge remote-tracking branch 'origin/24-написать-документацию-для-сер…
MiloslavskiySergey Jul 27, 2022
939977d
refactor: change in indicators
MiloslavskiySergey Jul 27, 2022
bf0401e
refactor: change cors
MiloslavskiySergey Jul 27, 2022
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
21 changes: 9 additions & 12 deletions main.py
Original file line number Diff line number Diff line change
Expand Up @@ -21,15 +21,12 @@
Site, \
Email
from settings import SECRET_KEY
from services.network_load import interest_calculation

app = FastAPI()

origins = [
'http://sbmpei.ru',
'https://sbmpei.ru',
'http://localhost',
'http://localhost:8095',
]
origins = ['*']


app.add_middleware(
CORSMiddleware,
Expand All @@ -49,9 +46,8 @@ async def redirect_page_docs():

@app.post('/traffic/',
response_model=Traffic)
async def calculate(
identification: str,
session: AsyncSession = Depends(get_session)):
async def calculate(identification: str,
session: AsyncSession = Depends(get_session)):
site = (await session.execute(select(Site).where(Site.identification == identification))).first()
if site is None:
raise HTTPException(status_code=status.HTTP_404_NOT_FOUND, detail='Запрашиваемый ключ доступа не найден')
Expand All @@ -63,14 +59,15 @@ async def calculate(
where(Traffic.id == traffic[0].id).
values(id=traffic[0].id,
counter=Traffic.counter+1,
average_load=Traffic.counter * 0.0125,
maximum_load=Traffic.counter * 0.0195,
))
await session.commit()
return traffic[0]
traffic_id = (await session.execute(insert(Traffic).values(counter=1,
create_at=date.today(),
site_id=site[0].id))).inserted_primary_key[0]
site_id=site[0].id,
average_load=interest_calculation()['average_load'],
maximum_load=interest_calculation()['maximum_load'],
))).inserted_primary_key[0]
await session.commit()
return (await session.execute(select(Traffic).where(Traffic.id == traffic_id))).first()[0]

Expand Down
19 changes: 19 additions & 0 deletions services/network_load.py
Original file line number Diff line number Diff line change
@@ -0,0 +1,19 @@
"""Расчет нагрузки сети."""
from datetime import datetime
from random import uniform


def interest_calculation() -> dict:
"""Генерация процента нагруженности сети."""

week_day = datetime.today().weekday()
if (week_day >= 0) and (week_day <= 4):
return {
'average_load': 45 + uniform(5, 10),
'maximum_load': 45 + uniform(10, 20)
}
else:
return {
'average_load': 42 + uniform(0, 5),
'maximum_load': 42 + uniform(5, 10)
}