complete loading single items

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

@@ -1,33 +1,33 @@
+from typing import List
+
 from fastapi import APIRouter, status, HTTPException
-from sqlalchemy import select
 from src.core.log_conf import logger
-from src.db.repository.media import create_new_mediaactor, delete_mediaactor, get_actor_details
+from src.db.repository.media import create_new_mediaactor, delete_mediaactor
 from src.db.session import SessionDep
-from src.schema.media.actor import MediaActorModel, MediaActorResponse
+from src.schema.media.actor import MediaActorModel, MediaActorResponse, actor_to_response
 from src.db.models.media import MediaActor
 
 router = APIRouter()
 
-@router.get("/actors", response_model=list[MediaActorResponse])
-# def get_all_files(db: SessionDep, review: bool = False, download: bool = False, current_user: Profile = Depends(get_current_user_from_token)) -> List[MediaFileResponse]:
-def get_all_actors(db: SessionDep, review: bool = False, download: bool = False) -> list[MediaActorResponse]: # type: ignore
+@router.get("/actors", response_model=List[MediaActorResponse])
+def get_all_actors(db: SessionDep) -> List[MediaActorResponse]:
     results: list[MediaActorResponse] = []
-    actors = db.scalars(select(MediaActor)).all()
+    actors = db.query(MediaActor).all()
     for mediaactor in actors:
-        response = MediaActorResponse(id=mediaactor.id, name=str(mediaactor.name), url=str(mediaactor.url))
+        response =  actor_to_response(mediaactor)
         results.append(response)
     return results
 
 @router.get("/actors/{actor_id}", response_model=MediaActorResponse)
-def get_actor(actor_id: str, db: SessionDep) -> MediaActorResponse: # type: ignore
+def get_actor(actor_id: str, db: SessionDep) -> MediaActorResponse:
     media_actor = db.get(MediaActor, actor_id)
     if not media_actor:
         raise HTTPException(status_code=404, detail="MediaActor could not be found")
-    response = get_actor_details(media_actor)
+    response = actor_to_response(media_actor)
     return response
 
 @router.delete("/actors/{actor_id}", status_code=status.HTTP_204_NO_CONTENT)
-def delete_actor(actor_id: str, db: SessionDep): # type: ignore
+def delete_actor(actor_id: str, db: SessionDep):
     media_actor = db.get(MediaActor, actor_id)
     if not media_actor:
         raise HTTPException(status_code=404, detail="MediaActor could not be found")
@@ -35,11 +35,11 @@ def delete_actor(actor_id: str, db: SessionDep): # type: ignore
     delete_mediaactor(db, media_actor.id)
 
 @router.post("/actors", status_code=status.HTTP_201_CREATED)
-def add_actor(new_actor: MediaActorModel, db: SessionDep) -> MediaActorResponse: # type: ignore
+def add_actor(new_actor: MediaActorModel, db: SessionDep) -> MediaActorResponse:
     logger.info(f"add actor {new_actor.url}")
     try:
         mediaActor: MediaActor = create_new_mediaactor(new_actor, db)
     except:
         raise HTTPException(status_code=409, detail="Link duplicate")
-    response = get_actor_details(mediaActor)
+    response = actor_to_response(mediaActor)
     return response

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

@@ -1,32 +1,31 @@
 from typing import List
 from fastapi import APIRouter, status, HTTPException
-from sqlalchemy import select
 from src.db.models.media import MediaActorFile
-from src.db.repository.media import delete_mediaactorfile, get_actorfile_details
+from src.db.repository.media import delete_mediaactorfile
 from src.db.session import SessionDep
-from src.schema.media.actorfile import MediaActorFileResponse
+from src.schema.media.actorfile import MediaActorFileResponse, actorfile_to_response
 
 router = APIRouter()
 
 @router.get("/actorfiles", response_model=List[MediaActorFileResponse])
-def get_all_actorfiles(db: SessionDep) -> List[MediaActorFileResponse]: # type: ignore
+def get_all_actorfiles(db: SessionDep) -> List[MediaActorFileResponse]:
     results: List[MediaActorFileResponse] = []
-    actorfiles = db.scalars(select(MediaActorFile)).all()
+    actorfiles = db.query(MediaActorFile).all()
     for media_actorfile in actorfiles:
-        response = get_actorfile_details(media_actorfile)
+        response = actorfile_to_response(media_actorfile)
         results.append(response)
     return results
 
 @router.get("/actorfiles/{actorfile_id}", response_model=MediaActorFileResponse)
-def get_actorfile(actorfile_id: str, db: SessionDep) -> MediaActorFileResponse: # type: ignore
+def get_actorfile(actorfile_id: str, db: SessionDep) -> MediaActorFileResponse:
     media_actorfile = db.get(MediaActorFile, actorfile_id)
     if not media_actorfile:
         raise HTTPException(status_code=404, detail="MediaActor could not be found")
-    response = get_actorfile_details(media_actorfile)
+    response = actorfile_to_response(media_actorfile)
     return response
 
 @router.delete("/actorfiles/{actorfile_id}", status_code=status.HTTP_204_NO_CONTENT)
-def delete_actorfile(actorfile_id: str, db: SessionDep): # type: ignore
+def delete_actorfile(actorfile_id: str, db: SessionDep):
     media_actorfile = db.get(MediaActorFile, actorfile_id)
     if not media_actorfile:
         raise HTTPException(status_code=404, detail="MediaActor could not be found")

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

@@ -1,7 +1,6 @@
 from typing import List
 
 from fastapi import APIRouter, status, HTTPException
-from sqlalchemy import select
 from src.core.log_conf import logger
 from src.db.repository.media import (
     create_new_mediaactorfile,
@@ -9,16 +8,16 @@ from src.db.repository.media import (
     delete_mediafile,
 )
 from src.db.session import SessionDep
-from src.schema.media.actor import MediaActorResponse
-from src.schema.media.actorfile import MediaActorFileResponse
-from src.schema.media.file import MediaFileResponse, Link, get_file_details, set_file
+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 MediaFileResponse, Link, file_to_response, set_file
 from src.db.models.media import MediaFile
 
 router = APIRouter()
 
 
 @router.get("/update-titles")
-def update_titles(db: SessionDep) -> list[MediaFileResponse]:
+def update_titles(db: SessionDep) -> List[MediaFileResponse]:
     """
     Update title for given MediaFile.
     """
@@ -27,13 +26,13 @@ def update_titles(db: SessionDep) -> list[MediaFileResponse]:
     for mediafile in files:
         mediafile.update_title()
         db.add(mediafile)
-        response = get_file_details(mediafile)
+        response = file_to_response(mediafile)
         results.append(response)
     db.commit()
     return results
 
 
-@router.get("/files", response_model=list[MediaFileResponse])
+@router.get("/files", response_model=List[MediaFileResponse])
 def get_all_files(
     db: SessionDep, review: bool = False, download: bool = False
 ) -> List[MediaFileResponse]:
@@ -49,7 +48,7 @@ def get_all_files(
     else:
         files = db.query(MediaFile).all()
     for mediafile in files:
-        response = get_file_details(mediafile)
+        response = file_to_response(mediafile)
         results.append(response)
     return results
 
@@ -62,7 +61,7 @@ def get_file(file_id: str, db: SessionDep) -> MediaFileResponse:
     mediafile = db.get(MediaFile, file_id)
     if not mediafile:
         raise HTTPException(status_code=404, detail="MediaFile could not be found")
-    response = get_file_details(mediafile)
+    response = file_to_response(mediafile)
     return response
 
 
@@ -84,7 +83,7 @@ def delete_file(file_id: str, db: SessionDep):
 @router.get("/files/{file_id}/actors", response_model=list[MediaActorResponse])
 def get_file_actors(file_id: str, db: SessionDep) -> list[MediaActorResponse]:
     """
-    Get list of ACtors for given MediaFile.
+    Get list of Actors for given MediaFile.
     """
     mediafile = db.get(MediaFile, file_id)
     if not mediafile:
@@ -93,19 +92,15 @@ def get_file_actors(file_id: str, db: SessionDep) -> list[MediaActorResponse]:
     logger.info("already known actors: %s", actor_files)
     results: list[MediaActorResponse] = []
     for actor_file in actor_files:
-        response = MediaActorResponse(
-            id=actor_file.media_actor.id,
-            name=actor_file.media_actor.name,
-            url=str(actor_file.media_actor.url),
-        )
+        response = actor_to_response(actor_file.media_actor)
         results.append(response)
     return results
 
 
-@router.put("/files/{file_id}/actors", response_model=list[MediaActorFileResponse])
+@router.put("/files/{file_id}/actors", response_model=List[MediaActorFileResponse])
 def update_file_actors(
-    file_id: str, db: SessionDep, actors: list[MediaActorResponse]
-) -> list[MediaActorFileResponse]:  # type: ignore
+    file_id: str, db: SessionDep, actors: List[MediaActorResponse]
+) -> List[MediaActorFileResponse]:
     mediafile = db.get(MediaFile, file_id)
     if not mediafile:
         raise HTTPException(status_code=404, detail="MediaFile could not be found")
@@ -122,13 +117,9 @@ def update_file_actors(
             create_new_mediaactorfile(db, actor.id, mediafile.id)
     db.refresh(mediafile)
     actor_files = mediafile.media_actor_files
-    results: list[MediaActorFileResponse] = []
+    results: List[MediaActorFileResponse] = []
     for actor_file in actor_files:
-        response = MediaActorFileResponse(
-            id=actor_file.id,
-            actor_id=actor_file.media_actor_id,
-            file_id=actor_file.media_file_id,
-        )
+        response = actorfile_to_response(actor_file)
         results.append(response)
     return results
 
@@ -136,7 +127,7 @@ def update_file_actors(
 @router.put("/files/{file_id}", response_model=MediaFileResponse)
 def update_file(
     file_id: str, db: SessionDep, info: MediaFileResponse
-) -> MediaFileResponse:  # type: ignore
+) -> MediaFileResponse:
     mediaFile = db.get(MediaFile, file_id)
     if not mediaFile:
         raise HTTPException(status_code=404, detail="MediaFile could not be found")
@@ -146,7 +137,7 @@ def update_file(
     mediafile = db.get(MediaFile, file_id)
     if not mediafile:
         raise HTTPException(status_code=404, detail="MediaFile could not be updated")
-    response = get_file_details(mediafile)
+    response = file_to_response(mediafile)
     return response
 
 
@@ -157,5 +148,5 @@ def add_file(new_link: Link, db: SessionDep) -> MediaFileResponse:  # type: igno
         mediaFile: MediaFile = create_new_mediafile(new_link.url, db)
     except:
         raise HTTPException(status_code=409, detail="Link duplicate")
-    response = get_file_details(mediaFile)
+    response = file_to_response(mediaFile)
     return response

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

@@ -1,17 +1,17 @@
 
 from typing import List
 
-from fastapi import APIRouter
+from fastapi import APIRouter, HTTPException
 
 from src.db.models.media import MediaVideo
 from src.db.session import SessionDep
-from src.schema.media.video import MediaVideoResponse, to_response
+from src.schema.media.video import MediaVideoResponse, video_to_response
 
 
 router = APIRouter()
 
 @router.get("/videos", response_model=List[MediaVideoResponse])
-def get_all_files(
+def get_all_videos(
     db: SessionDep, review: bool = False, download: bool = False
 ) -> List[MediaVideoResponse]:
     """
@@ -26,6 +26,17 @@ def get_all_files(
     else:
         files = db.query(MediaVideo).all()
     for mediafile in files:
-        response = to_response(mediafile)
+        response = video_to_response(mediafile)
         results.append(response)
     return results
+
+@router.get("/videos/{video_id}", response_model=MediaVideoResponse)
+def get_video(video_id: str, db: SessionDep) -> MediaVideoResponse:
+    """
+    Get MediaVideo by id.
+    """
+    video = db.get(MediaVideo, video_id)
+    if video is None:
+        raise HTTPException(status_code=404, detail="MediaVideo could not be found")
+    response = video_to_response(video)
+    return response