fix problem when deleting MediaFile with MediaActor relations

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

@@ -2,7 +2,10 @@ from typing import List
 
 from fastapi import APIRouter, status, HTTPException
 from src.core.log_conf import logger
-from src.db.repository.media.actorfile import create_new_mediaactorfile
+from src.db.repository.media.actorfile import (
+    create_new_mediaactorfile,
+    delete_mediaactorfile,
+)
 from src.db.repository.media.file import delete_mediafile, import_mediafile
 from src.db.session import SessionDep
 from src.schema.media.actor import MediaActorResponse, actor_to_response
@@ -78,8 +81,11 @@ def delete_file(file_id: str, db: SessionDep):
     logger.info("delete MediaFile: %s", file_id)
     actor_files = mediafile.media_actor_files
     logger.info("MediaActorFiles links %s", len(actor_files))
-    if len(actor_files) == 0:
-        delete_mediafile(db, mediafile.id)
+    if len(actor_files) > 0:
+        logger.info("delete MediaActor relations first")
+        for actor_file in actor_files:
+            delete_mediaactorfile(db, actor_file.id)
+    delete_mediafile(db, mediafile.id)
 
 
 @router.get("/files/{file_id}/actors", response_model=list[MediaActorResponse])

kontor-api/src/db/repository/media/actorfile.py

@@ -5,12 +5,16 @@ from sqlalchemy.orm import Session
 
 from src.core.log_conf import logger
 from src.db.models.media import MediaActorFile
-from src.schema.media.actor import MediaActorModel
 from src.schema.media.actorfile import MediaActorFileModel
 
 
-def create_new_mediaactorfile(db: Session, actor_id: str, file_id: str) -> MediaActorFile:
-    logger.info(f"create MediaActorFile with actor {actor_id} and file {file_id}")
+def create_new_mediaactorfile(
+    db: Session, actor_id: str, file_id: str
+) -> MediaActorFile:
+    """
+    Create relation for MediaFile and MediaActor
+    """
+    logger.info("create MediaActorFile with actor %s and file %s", actor_id, file_id)
     media_actor_file: MediaActorFile = MediaActorFile()
     media_actor_file.id = str(uuid.uuid4())
     media_actor_file.created_date = datetime.now()
@@ -23,17 +27,23 @@ def create_new_mediaactorfile(db: Session, actor_id: str, file_id: str) -> Media
     db.refresh(media_actor_file)
     return media_actor_file
 
+
 def delete_mediaactorfile(db: Session, actorfile_id: str):
-    logger.info(f"delete MediaActorFile with id {actorfile_id}")
+    """
+    Delete relation between MediaFile and MediaActor.
+    """
+    logger.info("delete MediaActorFile with id %s", actorfile_id)
     media_actorfile = db.get(MediaActorFile, actorfile_id)
     db.delete(media_actorfile)
     db.commit()
 
-def import_mediaactorfile(db: Session, new_actorfile: MediaActorFileModel) -> MediaActorFile:
+
+def import_mediaactorfile(
+    db: Session, new_actorfile: MediaActorFileModel
+) -> MediaActorFile:
     """
     Import MediaFile and set missing values with default ones.
     """
     logger.info("import MediaActorFile with %s", new_actorfile)
     media_actor_file: MediaActorFile = MediaActorFile()
     return media_actor_file
-    

kontor-api/src/db/repository/media/file.py

@@ -9,6 +9,9 @@ from src.schema.media.file import MediaFileModel
 
 
 def create_new_mediafile(link: str, db: Session) -> MediaFile:
+    """
+    Create MediaFile with gievne URL.
+    """
     logger.info("create MediaFile with url {link}")
     media_file: MediaFile = MediaFile()
     media_file.id = str(uuid.uuid4())
@@ -21,15 +24,20 @@ def create_new_mediafile(link: str, db: Session) -> MediaFile:
     db.add(media_file)
     db.commit()
     db.refresh(media_file)
-    logger.info(f"created {media_file}")
+    logger.info("created %s", media_file)
     return media_file
 
+
 def delete_mediafile(db: Session, media_file_id: str):
-    logger.info(f"delete MediaFile with id {media_file_id}")
+    """
+    Delete MediaFile with given ID from db.
+    """
+    logger.info("delete MediaFile with id %s", media_file_id)
     media_file = db.get(MediaFile, media_file_id)
     db.delete(media_file)
     db.commit()
 
+
 def import_mediafile(db: Session, new_file: MediaFileModel) -> MediaFile:
     """
     import MediaActor and set missing values with defautl ones.