Vorbereitung Release 0.2.0

kontor-api/src/schema/comics/artist.py

@@ -1,36 +1,14 @@
-from typing import List, Dict
-from uuid import UUID
-
 from pydantic import BaseModel
 
-from src.db.models.comic import Artist
-
 
 class ArtistCreation(BaseModel):
+    id: str
     name: str
 
 class ArtistResponse(BaseModel):
-    id: UUID
+    id: str
     name: str
 
-class ArtistDetailResponse(BaseModel):
-    id: UUID
+class AddArtist(BaseModel):
+    id: str
     name: str
-    works: Dict[str, List[str]]
-
-def get_artist_details(artist: Artist) -> ArtistDetailResponse:
-    works = {}
-    for work in artist.comic_works:
-        work_type = work.work_type.name
-        comic_title = work.comic.title
-        if work_type in works:
-            works[work_type].append(comic_title)
-        else:
-            works[work_type] = [comic_title]
-    response = ArtistDetailResponse(
-        id=artist.id,
-        name=artist.name,
-        works=works
-    )
-    return response
-

kontor-api/src/schema/comics/artist_details.py

@@ -0,0 +1,22 @@
+from typing import List
+from pydantic import BaseModel
+
+from src.schema.comics.comic import ComicResponse
+from src.schema.comics.issue_details import IssueDetailsResponse
+from src.schema.comics.worktype import WorktypeResponse
+
+
+class ArtistWorktypeComicResponse(BaseModel):
+    worktype: WorktypeResponse
+    comics: List[ComicResponse]
+
+class ArtistWorktypeIssueResponse(BaseModel):
+    worktype: WorktypeResponse
+    issues: List[IssueDetailsResponse]
+
+class ArtistDetailResponse(BaseModel):
+    id: str
+    name: str
+    weblink: str
+    comic_works: List[ArtistWorktypeComicResponse]
+    issue_works: List[ArtistWorktypeIssueResponse]

kontor-api/src/schema/comics/comic.py

@@ -1,56 +1,17 @@
-from typing import List, Dict
-from uuid import UUID
-
-from pydantic import BaseModel
-
-from src.db.models.comic import Comic
+from typing import Optional
+from pydantic import BaseModel, AnyUrl
+from src.core.log_conf import logger
 
 
 class ComicResponse(BaseModel):
-    id: UUID
+    id: str
     title: str
     completed: bool
 
-class ComicDetailsResponse(BaseModel):
-    id: UUID
-    created: str
+
+class ComicSchema(BaseModel):
+    id: str
     title: str
-    completed : bool
-    current_order : bool
-    publisher: str
-    volumes: List[str]
-    works: Dict[str, List[str]]
-
-def get_short_info(comic: Comic) -> ComicResponse:
-    response = ComicResponse(
-        id=comic.id,
-        title=comic.title,
-        completed=(comic.completed == 1)
-    )
-    return response
-
-
-def get_comic_details(comic: Comic) -> ComicDetailsResponse | None:
-    volumes = []
-    for volume in comic.volumes:
-        volumes.append(volume.name)
-    works = {}
-    for work in comic.comic_works:
-        work_type = work.work_type.name
-        artist_name = work.artist.name
-        if work_type in works:
-            works[work_type].append(artist_name)
-        else:
-            works[work_type] = [artist_name]
-    response = ComicDetailsResponse(
-        id=comic.id,
-        created=str(comic.created_date),
-        title=comic.title,
-        completed=(comic.completed == 1),
-        current_order=(comic.current_order == 1),
-        publisher=comic.publisher.name,
-        volumes=volumes,
-        works=works
-    )
-    return response
-
+    weblink: Optional[AnyUrl]
+    completed: Optional[bool]
+    current_order: Optional[bool]

kontor-api/src/schema/comics/comic_details.py

@@ -0,0 +1,26 @@
+from typing import List
+from pydantic import BaseModel
+
+from src.schema.comics.artist import ArtistResponse
+from src.schema.comics.issue import IssueResponse
+from src.schema.comics.publisher import PublisherResponse
+from src.schema.comics.volume import VolumeResponse
+from src.schema.comics.worktype import WorktypeResponse
+
+
+class ComicWorktypeArtistResponse(BaseModel):
+    worktype: WorktypeResponse
+    artists: List[ArtistResponse]
+
+
+class ComicDetailsResponse(BaseModel):
+    id: str
+    created: str
+    title: str
+    completed : bool
+    current_order : bool
+    weblink: str
+    publisher: PublisherResponse
+    issues: List[IssueResponse]
+    volumes: List[VolumeResponse]
+    works: List[ComicWorktypeArtistResponse]

kontor-api/src/schema/comics/issue.py

@@ -0,0 +1,8 @@
+from pydantic import BaseModel
+
+
+class IssueResponse(BaseModel):
+    id: str
+    issue_number: str
+    in_stock: bool
+    is_read: bool

kontor-api/src/schema/comics/issue_details.py

@@ -0,0 +1,13 @@
+from pydantic import BaseModel
+
+from src.schema.comics.comic import ComicResponse
+from src.schema.comics.volume import VolumeResponse
+
+
+class IssueDetailsResponse(BaseModel):
+    id: str
+    issue_number: str
+    in_stock: bool
+    is_read: bool
+    comic: ComicResponse
+    volume: VolumeResponse | None

kontor-api/src/schema/comics/publisher.py

@@ -0,0 +1,6 @@
+from pydantic import BaseModel
+
+
+class PublisherResponse(BaseModel):
+    id: str
+    name: str

kontor-api/src/schema/comics/publisher_details.py

@@ -0,0 +1,14 @@
+from typing import List
+
+from pydantic import BaseModel
+
+from src.schema.comics.comic import ComicResponse
+from src.schema.comics.publisher import PublisherResponse
+
+
+class PublisherDetailsResponse(BaseModel):
+    id: str
+    name: str
+    parent_publisher: PublisherResponse | None
+    imprints: List[PublisherResponse]
+    comics: List[ComicResponse]

kontor-api/src/schema/comics/volume.py

@@ -0,0 +1,6 @@
+from pydantic import BaseModel
+
+
+class VolumeResponse(BaseModel):
+    id: str
+    name: str

kontor-api/src/schema/comics/worktype.py

@@ -0,0 +1,9 @@
+from pydantic import BaseModel
+
+class AddWorkType(BaseModel):
+    worktype: str
+
+class WorktypeResponse(BaseModel):
+    id: str
+    name: str
+