Skip to content

Commit 1993f62

Browse files
authored
Deprication (#83)
* Old routers depricate * Test fixes * Style
1 parent 7244dc4 commit 1993f62

53 files changed

Lines changed: 382 additions & 281 deletions

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

calendar_backend/__main__.py

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -4,6 +4,7 @@
44

55
from calendar_backend.routes import app
66

7+
78
logging.basicConfig(
89
filename=f'logger_{__name__}.log',
910
level=logging.DEBUG,

calendar_backend/google_engine/__init__.py

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,6 @@
1-
from .service import get_calendar_service_from_token
21
from .api_utils import create_calendar_with_timetable
2+
from .service import get_calendar_service_from_token
3+
34

45
__all__ = [
56
"get_calendar_service_from_token",

calendar_backend/google_engine/api_utils.py

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -4,9 +4,11 @@
44
from sqlalchemy.orm import Session
55

66
from calendar_backend.settings import get_settings
7+
78
from .event import Event
89
from .event_from_db import create_google_events_from_db
910

11+
1012
settings = get_settings()
1113
logger = logging.getLogger(__name__)
1214

calendar_backend/google_engine/event.py

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,7 @@
1-
from calendar_backend.methods import utils
21
from pydantic import BaseModel
32

3+
from calendar_backend.methods import utils
4+
45

56
class Event(BaseModel):
67
summary: str

calendar_backend/google_engine/event_from_db.py

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,11 +3,13 @@
33

44
from sqlalchemy.orm import Session
55

6-
from calendar_backend.settings import get_settings
76
from calendar_backend.methods.utils import get_lessons_by_group_from_date
87
from calendar_backend.models import Event, Group
8+
from calendar_backend.settings import get_settings
9+
910
from .event import create_google_calendar_event
1011

12+
1113
settings = get_settings()
1214
logger = logging.getLogger(__name__)
1315

calendar_backend/google_engine/service.py

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -2,12 +2,13 @@
22

33
import google.oauth2.credentials
44
import googleapiclient.discovery
5-
from sqlalchemy.exc import NoResultFound
5+
from fastapi_sqlalchemy import db
66
from googleapiclient.discovery import build
7+
from pydantic import Json
8+
from sqlalchemy.exc import NoResultFound
9+
710
from calendar_backend.models import Credentials
811
from calendar_backend.settings import get_settings
9-
from fastapi_sqlalchemy import db
10-
from pydantic import Json
1112

1213

1314
settings = get_settings()

calendar_backend/methods/__init__.py

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
1-
from . import utils
2-
from . import auth
1+
from . import auth, utils
2+
33

44
__all__ = [
55
"utils",

calendar_backend/methods/auth.py

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,12 @@
11
import logging
2+
23
from fastapi import Depends, HTTPException, status
34
from fastapi.security import OAuth2PasswordBearer
45
from pydantic import BaseModel
6+
57
from calendar_backend.settings import get_settings
68

9+
710
logger = logging.getLogger(__name__)
811
settings = get_settings()
912
oauth2_scheme = OAuth2PasswordBearer(tokenUrl="token")

calendar_backend/methods/list_calendar.py

Lines changed: 6 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -4,15 +4,18 @@
44
import time
55
from datetime import date as date_
66
from datetime import datetime
7-
from fastapi import HTTPException
8-
from fastapi.responses import FileResponse
97

108
import pytz
9+
from fastapi import HTTPException
10+
from fastapi.responses import FileResponse
1111
from icalendar import Calendar, Event, vText
1212
from sqlalchemy.orm import Session
13+
14+
from calendar_backend.models import Group
1315
from calendar_backend.settings import get_settings
16+
1417
from . import utils
15-
from calendar_backend.models import Group
18+
1619

1720
settings = get_settings()
1821
logger = logging.getLogger(__name__)

calendar_backend/methods/utils.py

Lines changed: 6 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -5,23 +5,16 @@
55
import string
66
from concurrent.futures import ThreadPoolExecutor
77
from functools import partial
8+
from io import BytesIO
89
from typing import Final
910

1011
import aiofiles
11-
from fastapi import File, UploadFile, HTTPException
12+
from fastapi import File, HTTPException, UploadFile
13+
from PIL import Image
1214
from sqlalchemy.orm import Session
1315

14-
from calendar_backend.models.db import (
15-
Event,
16-
Group,
17-
Lecturer,
18-
Photo,
19-
Room,
20-
ApproveStatuses,
21-
)
16+
from calendar_backend.models.db import ApproveStatuses, Event, Group, Lecturer, Photo, Room
2217
from calendar_backend.settings import get_settings
23-
from PIL import Image
24-
from io import BytesIO
2518

2619

2720
settings = get_settings()
@@ -75,8 +68,10 @@ async def get_lecturer_lessons_in_daterange(
7568
events_list.append(lesson)
7669
return events_list
7770

71+
7872
SUPPORTED_FILE_EXTENSIONS: Final[list[str]] = ['png', 'svg', 'jpg', 'jpeg']
7973

74+
8075
async def upload_lecturer_photo(lecturer_id: int, session: Session, file: UploadFile = File(...)) -> Photo:
8176
lecturer = Lecturer.get(lecturer_id, session=session)
8277
random_string = ''.join(random.choice(string.ascii_letters) for _ in range(32))

0 commit comments

Comments
 (0)