move kontor_model in kontor-api (#98)

Co-authored-by: Thomas Peetz <thomas.peetz@cimt-ag.de>
Reviewed-on: #98

kontor-api/src/apis/version1/admin/login.py

@@ -9,8 +9,8 @@ from src.core.security import (
     authenticate_user_by_username,
     create_access_token,
 )
-from kontor_model.schema.admin.login import LoginRequest
-from kontor_model.schema.admin.token import Token
+from src.schema.admin.login import LoginRequest
+from src.schema.admin.token import Token
 from src.webapps.auth.forms import LoginForm
 
 login_router = APIRouter()

kontor-api/src/apis/version1/admin/mailaccount.py

@@ -2,9 +2,9 @@ from typing import List
 
 from fastapi import APIRouter, HTTPException
 
-from kontor_model.db.models.admin import MailAccount
+from src.db.models.admin import MailAccount
 from src.db.session import SessionDep
-from kontor_model.schema.admin.mailaccount import MailAccountResponse, to_response
+from src.schema.admin.mailaccount import MailAccountResponse, to_response
 
 router = APIRouter()
 

kontor-api/src/apis/version1/bookshelf/article.py

@@ -2,9 +2,9 @@ from typing import List
 
 from fastapi import APIRouter
 
-from kontor_model.db.models.bookshelf import Article
+from src.db.models.bookshelf import Article
 from src.db.session import SessionDep
-from kontor_model.schema.bookshelf.article import ArticleResponse, to_response
+from src.schema.bookshelf.article import ArticleResponse, to_response
 
 
 router = APIRouter()

kontor-api/src/apis/version1/bookshelf/articleauthor.py

@@ -2,9 +2,9 @@ from typing import List
 
 from fastapi import APIRouter
 
-from kontor_model.db.models.bookshelf import ArticleAuthor
+from src.db.models.bookshelf import ArticleAuthor
 from src.db.session import SessionDep
-from kontor_model.schema.bookshelf.articleauthor import ArticleAuthorResponse, to_response
+from src.schema.bookshelf.articleauthor import ArticleAuthorResponse, to_response
 
 router = APIRouter()
 

kontor-api/src/apis/version1/bookshelf/author.py

@@ -2,9 +2,9 @@ from typing import List
 
 from fastapi import APIRouter, HTTPException
 
-from kontor_model.db.models.bookshelf import Author
+from src.db.models.bookshelf import Author
 from src.db.session import SessionDep
-from kontor_model.schema.bookshelf.author import AuthorResponse, to_response
+from src.schema.bookshelf.author import AuthorResponse, to_response
 
 router = APIRouter()
 

kontor-api/src/apis/version1/bookshelf/book.py

@@ -2,9 +2,9 @@ from typing import List
 
 from fastapi import APIRouter
 
-from kontor_model.db.models.bookshelf import Book
+from src.db.models.bookshelf import Book
 from src.db.session import SessionDep
-from kontor_model.schema.bookshelf.book import BookResponse, to_response
+from src.schema.bookshelf.book import BookResponse, to_response
 
 router = APIRouter()
 

kontor-api/src/apis/version1/bookshelf/bookauthor.py

@@ -2,9 +2,9 @@ from typing import List
 
 from fastapi import APIRouter
 
-from kontor_model.db.models.bookshelf import BookAuthor
+from src.db.models.bookshelf import BookAuthor
 from src.db.session import SessionDep
-from kontor_model.schema.bookshelf.bookauthor import BookAuthorResponse, to_response
+from src.schema.bookshelf.bookauthor import BookAuthorResponse, to_response
 
 router = APIRouter()
 

kontor-api/src/apis/version1/bookshelf/bookshelf_publisher.py

@@ -2,9 +2,9 @@ from typing import List
 
 from fastapi import APIRouter
 
-from kontor_model.db.models.bookshelf import BookshelfPublisher
+from src.db.models.bookshelf import BookshelfPublisher
 from src.db.session import SessionDep
-from kontor_model.schema.bookshelf.publisher import PublisherResponse, to_response
+from src.schema.bookshelf.publisher import PublisherResponse, to_response
 
 router = APIRouter()
 

kontor-api/src/apis/version1/comics/artist.py

@@ -2,11 +2,11 @@ from typing import List
 
 from fastapi import APIRouter, HTTPException, status
 
-from kontor_model.db.models.comic import Artist
-from kontor_model.db.repository.comics.artist import get_artist_details
+from src.db.models.comic import Artist
+from src.db.repository.comics.artist import get_artist_details
 from src.db.session import SessionDep
-from kontor_model.schema.comics.artist import ArtistCreation, ArtistResponse, artist_to_response
-from kontor_model.schema.comics.artist_details import ArtistDetailResponse
+from src.schema.comics.artist import ArtistCreation, ArtistResponse, artist_to_response
+from src.schema.comics.artist_details import ArtistDetailResponse
 
 
 router = APIRouter()

kontor-api/src/apis/version1/comics/comic.py

@@ -3,13 +3,13 @@ from typing import List
 from fastapi import APIRouter, HTTPException
 
 from src.core.log_conf import logger
-from kontor_model.db.models.comic import Comic
-from kontor_model.db.repository.comics.comic import (
+from src.db.models.comic import Comic
+from src.db.repository.comics.comic import (
     get_comic_details,
 )
 from src.db.session import SessionDep
-from kontor_model.schema.comics.comic import ComicResponse, comic_to_response
-from kontor_model.schema.comics.comic_details import ComicDetailsResponse
+from src.schema.comics.comic import ComicResponse, comic_to_response
+from src.schema.comics.comic_details import ComicDetailsResponse
 
 router = APIRouter()
 

kontor-api/src/apis/version1/comics/comicwork.py

@@ -2,9 +2,9 @@ from typing import List
 
 from fastapi import APIRouter, HTTPException
 
-from kontor_model.db.models.comic import ComicWork
+from src.db.models.comic import ComicWork
 from src.db.session import SessionDep
-from kontor_model.schema.comics.comicwork import ComicWorkResponse, comicwork_to_response
+from src.schema.comics.comicwork import ComicWorkResponse, comicwork_to_response
 
 
 router = APIRouter()

kontor-api/src/apis/version1/comics/issue.py

@@ -2,9 +2,9 @@ from typing import List
 
 from fastapi import APIRouter, HTTPException
 
-from kontor_model.db.models.comic import Issue
+from src.db.models.comic import Issue
 from src.db.session import SessionDep
-from kontor_model.schema.comics.issue import IssueResponse, issue_to_response
+from src.schema.comics.issue import IssueResponse, issue_to_response
 
 
 router = APIRouter()

kontor-api/src/apis/version1/comics/issuework.py

@@ -2,9 +2,9 @@ from typing import List
 
 from fastapi import APIRouter, HTTPException
 
-from kontor_model.db.models.comic import IssueWork
+from src.db.models.comic import IssueWork
 from src.db.session import SessionDep
-from kontor_model.schema.comics.issuework import IssueWorkResponse, issuework_to_response
+from src.schema.comics.issuework import IssueWorkResponse, issuework_to_response
 
 
 router = APIRouter()

kontor-api/src/apis/version1/comics/publisher.py

@@ -2,11 +2,11 @@ from typing import List
 
 from fastapi import APIRouter, HTTPException
 
-from kontor_model.db.models.comic import Publisher
-from kontor_model.db.repository.comics.publisher import get_publisher_details
+from src.db.models.comic import Publisher
+from src.db.repository.comics.publisher import get_publisher_details
 from src.db.session import SessionDep
-from kontor_model.schema.comics.publisher import PublisherResponse, publisher_to_response
-from kontor_model.schema.comics.publisher_details import PublisherDetailsResponse
+from src.schema.comics.publisher import PublisherResponse, publisher_to_response
+from src.schema.comics.publisher_details import PublisherDetailsResponse
 
 
 router = APIRouter()

kontor-api/src/apis/version1/comics/storyarc.py

@@ -2,9 +2,9 @@ from typing import List
 
 from fastapi import APIRouter, HTTPException
 
-from kontor_model.db.models.comic import StoryArc
+from src.db.models.comic import StoryArc
 from src.db.session import SessionDep
-from kontor_model.schema.comics.storyarc import StoryArcResponse, storyarc_to_response
+from src.schema.comics.storyarc import StoryArcResponse, storyarc_to_response
 
 router = APIRouter()
 

kontor-api/src/apis/version1/comics/volume.py

@@ -2,9 +2,9 @@ from typing import List
 
 from fastapi import APIRouter, HTTPException
 
-from kontor_model.db.models.comic import Volume
+from src.db.models.comic import Volume
 from src.db.session import SessionDep
-from kontor_model.schema.comics.volume import VolumeResponse, volume_to_response
+from src.schema.comics.volume import VolumeResponse, volume_to_response
 
 router = APIRouter()
 

kontor-api/src/apis/version1/comics/worktype.py

@@ -2,9 +2,9 @@ from typing import List
 
 from fastapi import APIRouter, HTTPException
 
-from kontor_model.db.models.comic import WorkType
+from src.db.models.comic import WorkType
 from src.db.session import SessionDep
-from kontor_model.schema.comics.worktype import WorktypeResponse, worktype_to_response
+from src.schema.comics.worktype import WorktypeResponse, worktype_to_response
 
 
 router = APIRouter()

kontor-api/src/apis/version1/healthcheck.py

@@ -1,6 +1,6 @@
 from fastapi import APIRouter, status
 
-from kontor_model.schema.admin.healthcheck import HealthCheck
+from src.schema.admin.healthcheck import HealthCheck
 
 health_router = APIRouter()
 

kontor-api/src/apis/version1/media/actor.py

@@ -2,10 +2,10 @@ from typing import List
 
 from fastapi import APIRouter, status, HTTPException
 from src.core.log_conf import logger
-from kontor_model.db.repository.media.actor import delete_mediaactor, import_mediaactor
+from src.db.repository.media.actor import delete_mediaactor, import_mediaactor
 from src.db.session import SessionDep
-from kontor_model.schema.media.actor import MediaActorModel, MediaActorResponse, actor_to_response
-from kontor_model.db.models.media import MediaActor
+from src.schema.media.actor import MediaActorModel, MediaActorResponse, actor_to_response
+from src.db.models.media import MediaActor
 
 router = APIRouter()
 

kontor-api/src/apis/version1/media/file.py

@@ -2,21 +2,21 @@ from typing import List
 
 from fastapi import APIRouter, status, HTTPException
 from src.core.log_conf import logger
-from kontor_model.db.repository.media.actorfile import (
+from src.db.repository.media.actorfile import (
     create_new_mediaactorfile,
     delete_mediaactorfile,
 )
-from kontor_model.db.repository.media.file import delete_mediafile, import_mediafile
+from src.db.repository.media.file import delete_mediafile, import_mediafile
 from src.db.session import SessionDep
-from kontor_model.schema.media.actor import MediaActorResponse, actor_to_response
-from kontor_model.schema.media.actorfile import MediaActorFileResponse, actorfile_to_response
-from kontor_model.schema.media.file import (
+from src.schema.media.actor import MediaActorResponse, actor_to_response
+from src.schema.media.actorfile import MediaActorFileResponse, actorfile_to_response
+from src.schema.media.file import (
     MediaFileModel,
     MediaFileResponse,
     file_to_response,
     file_to_model,
 )
-from kontor_model.db.models.media import MediaFile
+from src.db.models.media import MediaFile
 
 router = APIRouter()
 

kontor-api/src/apis/version1/media/lofi.py

@@ -3,16 +3,16 @@ from typing import List
 
 from fastapi import APIRouter, status, HTTPException
 
-from kontor_model.db.models.media import MediaLofi
+from src.db.models.media import MediaLofi
 from src.db.session import SessionDep
 from src.core.log_conf import logger
-from kontor_model.schema.media.lofi import (
+from src.schema.media.lofi import (
     MediaLofiModel,
     MediaLofiResponse,
     lofi_to_response,
     lofi_to_model
 )
-from kontor_model.db.repository.media.lofi import (
+from src.db.repository.media.lofi import (
     import_medialofi,
     delete_medialofi
 )

kontor-api/src/apis/version1/media/mediaactorfile.py

@@ -1,10 +1,10 @@
 from typing import List
 from fastapi import APIRouter, status, HTTPException
 from src.core.log_conf import logger
-from kontor_model.db.models.media import MediaActorFile
-from kontor_model.db.repository.media.actorfile import delete_mediaactorfile, import_mediaactorfile
+from src.db.models.media import MediaActorFile
+from src.db.repository.media.actorfile import delete_mediaactorfile, import_mediaactorfile
 from src.db.session import SessionDep
-from kontor_model.schema.media.actorfile import MediaActorFileModel, MediaActorFileResponse, actorfile_to_response
+from src.schema.media.actorfile import MediaActorFileModel, MediaActorFileResponse, actorfile_to_response
 
 router = APIRouter()
 

kontor-api/src/apis/version1/media/mediaarticle.py

@@ -3,9 +3,9 @@ from typing import List
 
 from fastapi import APIRouter
 
-from kontor_model.db.models.media import MediaArticle
+from src.db.models.media import MediaArticle
 from src.db.session import SessionDep
-from kontor_model.schema.media.article import MediaArticleResponse, to_response
+from src.schema.media.article import MediaArticleResponse, to_response
 
 router = APIRouter()
 

kontor-api/src/apis/version1/media/mediavideo.py

@@ -3,9 +3,9 @@ from typing import List
 
 from fastapi import APIRouter, HTTPException
 
-from kontor_model.db.models.media import MediaVideo
+from src.db.models.media import MediaVideo
 from src.db.session import SessionDep
-from kontor_model.schema.media.video import MediaVideoResponse, video_to_response
+from src.schema.media.video import MediaVideoResponse, video_to_response
 
 
 router = APIRouter()

kontor-api/src/apis/version1/tysc/card.py

@@ -2,9 +2,9 @@ from typing import List
 
 from fastapi import APIRouter, HTTPException
 
-from kontor_model.db.models.tysc import Card
+from src.db.models.tysc import Card
 from src.db.session import SessionDep
-from kontor_model.schema.tysc.card import CardResponse, to_response
+from src.schema.tysc.card import CardResponse, to_response
 
 
 router = APIRouter()

kontor-api/src/apis/version1/tysc/cardset.py

@@ -2,9 +2,9 @@ from typing import List
 
 from fastapi import APIRouter, HTTPException
 
-from kontor_model.db.models.tysc import CardSet
+from src.db.models.tysc import CardSet
 from src.db.session import SessionDep
-from kontor_model.schema.tysc.cardset import CardSetResponse, to_response
+from src.schema.tysc.cardset import CardSetResponse, to_response
 
 
 router = APIRouter()

kontor-api/src/apis/version1/tysc/fieldposition.py

@@ -2,9 +2,9 @@ from typing import List
 
 from fastapi import APIRouter, HTTPException
 
-from kontor_model.db.models.tysc import FieldPosition
+from src.db.models.tysc import FieldPosition
 from src.db.session import SessionDep
-from kontor_model.schema.tysc.fieldposition import FieldPositionResponse, to_response
+from src.schema.tysc.fieldposition import FieldPositionResponse, to_response
 
 
 router = APIRouter()

kontor-api/src/apis/version1/tysc/player.py

@@ -2,9 +2,9 @@ from typing import List
 
 from fastapi import APIRouter, HTTPException
 
-from kontor_model.db.models.tysc import Player
+from src.db.models.tysc import Player
 from src.db.session import SessionDep
-from kontor_model.schema.tysc.player import PlayerResponse, to_response
+from src.schema.tysc.player import PlayerResponse, to_response
 
 
 router = APIRouter()

kontor-api/src/apis/version1/tysc/rooster.py

@@ -2,9 +2,9 @@ from typing import List
 
 from fastapi import APIRouter, HTTPException
 
-from kontor_model.db.models.tysc import Rooster
+from src.db.models.tysc import Rooster
 from src.db.session import SessionDep
-from kontor_model.schema.tysc.rooster import RoosterResponse, to_response
+from src.schema.tysc.rooster import RoosterResponse, to_response
 
 
 router = APIRouter()

kontor-api/src/apis/version1/tysc/sport.py

@@ -3,8 +3,8 @@ from fastapi import APIRouter, HTTPException
 
 from src.core.log_conf import logger
 from src.db.session import SessionDep
-from kontor_model.schema.tysc.sport import SportResponse, to_response
-from kontor_model.db.models.tysc import Sport
+from src.schema.tysc.sport import SportResponse, to_response
+from src.db.models.tysc import Sport
 
 router = APIRouter()
 

kontor-api/src/apis/version1/tysc/team.py

@@ -2,9 +2,9 @@ from typing import List
 
 from fastapi import APIRouter, HTTPException
 
-from kontor_model.db.models.tysc import Team
+from src.db.models.tysc import Team
 from src.db.session import SessionDep
-from kontor_model.schema.tysc.team import TeamResponse, to_response
+from src.schema.tysc.team import TeamResponse, to_response
 
 
 router = APIRouter()

kontor-api/src/apis/version1/tysc/vendor.py

@@ -2,9 +2,9 @@ from typing import List
 
 from fastapi import APIRouter, HTTPException
 
-from kontor_model.db.models.tysc import Vendor
+from src.db.models.tysc import Vendor
 from src.db.session import SessionDep
-from kontor_model.schema.tysc.vendor import VendorResponse, to_response
+from src.schema.tysc.vendor import VendorResponse, to_response
 
 
 router = APIRouter()

kontor-api/src/apis/version1/user/assignment.py

@@ -2,9 +2,9 @@ from typing import List
 
 from fastapi import APIRouter, HTTPException
 
-from kontor_model.db.models.admin import Assignment
+from src.db.models.admin import Assignment
 from src.db.session import SessionDep
-from kontor_model.schema.user.assignment import AssignmentResponse, to_response
+from src.schema.user.assignment import AssignmentResponse, to_response
 
 router = APIRouter()
 

kontor-api/src/apis/version1/user/permission.py

@@ -2,9 +2,9 @@ from typing import List
 
 from fastapi import APIRouter, HTTPException
 
-from kontor_model.db.models.admin import Permission
+from src.db.models.admin import Permission
 from src.db.session import SessionDep
-from kontor_model.schema.user.permission import PermissionResponse, to_response
+from src.schema.user.permission import PermissionResponse, to_response
 
 router = APIRouter()
 

kontor-api/src/apis/version1/user/profile.py

@@ -4,10 +4,10 @@ from sqlalchemy import select
 from src.core.log_conf import logger
 
 from src.core.security import CurrentUser
-from kontor_model.db.models.admin import Profile
+from src.db.models.admin import Profile
 from src.db.repository.user import create_new_profile
 from src.db.session import SessionDep
-from kontor_model.schema.user.profile import ProfileResponse, ProfileModel, to_response
+from src.schema.user.profile import ProfileResponse, ProfileModel, to_response
 
 
 router = APIRouter()

kontor-api/src/apis/version1/user/token.py

@@ -2,9 +2,9 @@ from typing import List
 
 from fastapi import APIRouter
 
-from kontor_model.db.models.admin import Token
+from src.db.models.admin import Token
 from src.db.session import SessionDep
-from kontor_model.schema.user.token import TokenResponse, to_response
+from src.schema.user.token import TokenResponse, to_response
 
 router = APIRouter()