From a0c8ecaf2727845716bf257429e168244f044932 Mon Sep 17 00:00:00 2001
From: Marek Lenczewski <gitlab@marha.de>
Date: Wed, 8 Apr 2026 08:51:59 +0200
Subject: [PATCH] update

---
 .../main/java/com/youtubeapp/data/VideoApi.kt | 15 +++---
 .../com/youtubeapp/data/VideoRepository.kt    |  9 ++--
 .../youtubeapp/ui/viewmodel/VideoViewModel.kt |  6 ++-
 backend/api/profile_controller.py             | 39 ++++++++++++---
 backend/api/schemas.py                        |  9 ----
 backend/api/video_controller.py               | 50 +++----------------
 backend/database/database.py                  |  8 ++-
 backend/model/profile.py                      |  5 +-
 backend/model/video.py                        |  7 ---
 browser_extension/api/background.js           |  6 +--
 browser_extension/tracking/content.js         |  7 ++-
 structure.md                                  |  6 +++
 12 files changed, 75 insertions(+), 92 deletions(-)
 create mode 100644 structure.md

diff --git a/app/frontend/src/main/java/com/youtubeapp/data/VideoApi.kt b/app/frontend/src/main/java/com/youtubeapp/data/VideoApi.kt
index f8cec81..7811750 100644
--- a/app/frontend/src/main/java/com/youtubeapp/data/VideoApi.kt
+++ b/app/frontend/src/main/java/com/youtubeapp/data/VideoApi.kt
@@ -3,20 +3,19 @@ package com.youtubeapp.data
 import retrofit2.http.GET
 import retrofit2.http.POST
 import retrofit2.http.Path
-import retrofit2.http.Query
 
 interface VideoApi {
-    @GET("videos")
-    suspend fun getAllVideos(@Query("profileId") profileId: Int? = null): List<Video>
-
-    @GET("videos/downloaded")
-    suspend fun getDownloadedVideos(@Query("profileId") profileId: Int? = null): List<Video>
+    @GET("profiles/{profileId}/videos")
+    suspend fun getAllVideos(@Path("profileId") profileId: Int): List<Video>
 
     @POST("videos/{id}/download")
     suspend fun triggerDownload(@Path("id") id: Int): Map<String, String>
 
-    @POST("videos/cleanup")
-    suspend fun cleanupVideos(@retrofit2.http.Body body: Map<String, @JvmSuppressWildcards Any>): Map<String, Int>
+    @POST("profiles/{profileId}/videos/cleanup")
+    suspend fun cleanupVideos(
+        @Path("profileId") profileId: Int,
+        @retrofit2.http.Body body: Map<String, @JvmSuppressWildcards Any>,
+    ): Map<String, Int>
 
     @retrofit2.http.DELETE("videos/{id}/file")
     suspend fun deleteServerFile(@Path("id") id: Int): Map<String, String>
diff --git a/app/frontend/src/main/java/com/youtubeapp/data/VideoRepository.kt b/app/frontend/src/main/java/com/youtubeapp/data/VideoRepository.kt
index 7c1d358..dfc6c7d 100644
--- a/app/frontend/src/main/java/com/youtubeapp/data/VideoRepository.kt
+++ b/app/frontend/src/main/java/com/youtubeapp/data/VideoRepository.kt
@@ -2,12 +2,9 @@ package com.youtubeapp.data
 
 class VideoRepository(private val api: VideoApi = ApiClient.api) {
 
-    suspend fun getAllVideos(profileId: Int? = null): Result<List<Video>> =
+    suspend fun getAllVideos(profileId: Int): Result<List<Video>> =
         runCatching { api.getAllVideos(profileId) }
 
-    suspend fun getDownloadedVideos(profileId: Int? = null): Result<List<Video>> =
-        runCatching { api.getDownloadedVideos(profileId) }
-
     suspend fun triggerDownload(videoId: Int): Result<String> = runCatching {
         val response = api.triggerDownload(videoId)
         response["status"] ?: "unknown"
@@ -19,8 +16,8 @@ class VideoRepository(private val api: VideoApi = ApiClient.api) {
     }
 
     suspend fun cleanupVideos(profileId: Int, excludeIds: List<Int>): Result<Int> = runCatching {
-        val body = mapOf("profileId" to profileId, "excludeIds" to excludeIds)
-        val response = api.cleanupVideos(body)
+        val body = mapOf("excludeIds" to excludeIds)
+        val response = api.cleanupVideos(profileId, body)
         response["deleted"] ?: 0
     }
 
diff --git a/app/frontend/src/main/java/com/youtubeapp/ui/viewmodel/VideoViewModel.kt b/app/frontend/src/main/java/com/youtubeapp/ui/viewmodel/VideoViewModel.kt
index d7f7c59..10dd778 100644
--- a/app/frontend/src/main/java/com/youtubeapp/ui/viewmodel/VideoViewModel.kt
+++ b/app/frontend/src/main/java/com/youtubeapp/ui/viewmodel/VideoViewModel.kt
@@ -103,9 +103,10 @@ class VideoViewModel : ViewModel() {
     }
 
     fun loadAllVideos() {
+        val profileId = _state.value.selectedProfileId ?: return
         viewModelScope.launch {
             _state.value = _state.value.copy(isLoading = true, error = null)
-            repository.getAllVideos(profileId = _state.value.selectedProfileId)
+            repository.getAllVideos(profileId)
                 .onSuccess { videos ->
                     _state.value = _state.value.copy(allVideos = videos, isLoading = false)
                 }
@@ -135,10 +136,11 @@ class VideoViewModel : ViewModel() {
 
                 val status = result.getOrNull()
                 if (status == "download_started") {
+                    val profileId = _state.value.selectedProfileId ?: 1
                     var attempts = 0
                     while (attempts < 150) {
                         delay(2000)
-                        val videosResult = repository.getAllVideos()
+                        val videosResult = repository.getAllVideos(profileId)
                         val video = videosResult.getOrNull()?.find { it.id == videoId }
                         if (video?.isDownloaded == true) break
                         attempts++
diff --git a/backend/api/profile_controller.py b/backend/api/profile_controller.py
index 3ec41c6..989546a 100644
--- a/backend/api/profile_controller.py
+++ b/backend/api/profile_controller.py
@@ -1,13 +1,38 @@
-from fastapi import APIRouter, Depends
-from sqlalchemy.orm import Session
+from fastapi import APIRouter
 
-from api.schemas import ProfileResponse
-from database.database import getDb
+from api.schemas import CleanupRequest, VideoCreate, VideoResponse
+from database.database import DbSession
 from model.profile import Profile
+from model.video import Video
+from notify.notify_clients import notifyClients
 
-router = APIRouter(prefix="/profiles", tags=["profiles"])
+router = APIRouter()
 
 
-@router.get("", response_model=list[ProfileResponse])
-def getAll(db: Session = Depends(getDb)):
+@router.get("/profiles")
+def getAll(db: DbSession):
     return Profile.getAll(db)
+
+
+@router.post("/profiles/{profileId}/videos", status_code=204)
+async def createVideo(profileId: int, videoData: VideoCreate, db: DbSession):
+    title = videoData.title
+    youtuber = videoData.youtuber
+    thumbnailUrl = videoData.thumbnailUrl
+    youtubeUrl = videoData.youtubeUrl
+
+    Video.deleteIfExists(db, youtubeUrl, profileId)
+    Video.create(db, title, youtuber, thumbnailUrl, youtubeUrl, profileId)
+    await notifyClients(profileId)
+
+
+@router.get("/profiles/{profileId}/videos", response_model=list[VideoResponse])
+def getVideos(profileId: int, db: DbSession):
+    return Video.getAll(db, profileId=profileId)
+
+
+@router.post("/profiles/{profileId}/videos/cleanup")
+def cleanupVideos(profileId: int, request: CleanupRequest, db: DbSession):
+    excludeIds = request.excludeIds
+    count = Video.deleteNotDownloaded(db, profileId, excludeIds)
+    return {"deleted": count}
diff --git a/backend/api/schemas.py b/backend/api/schemas.py
index a1ddf7d..5cc021f 100644
--- a/backend/api/schemas.py
+++ b/backend/api/schemas.py
@@ -6,7 +6,6 @@ class VideoCreate(BaseModel):
     youtuber: str
     thumbnailUrl: str
     youtubeUrl: str
-    profileId: int | None = None
 
 
 class VideoResponse(BaseModel):
@@ -22,12 +21,4 @@ class VideoResponse(BaseModel):
 
 
 class CleanupRequest(BaseModel):
-    profileId: int
     excludeIds: list[int] = []
-
-
-class ProfileResponse(BaseModel):
-    id: int
-    name: str
-
-    model_config = ConfigDict(from_attributes=True)
diff --git a/backend/api/video_controller.py b/backend/api/video_controller.py
index 1ebedae..1df3705 100644
--- a/backend/api/video_controller.py
+++ b/backend/api/video_controller.py
@@ -1,54 +1,18 @@
 from pathlib import Path
-from typing import Optional
 
-from fastapi import APIRouter, Depends, HTTPException, Query
+from fastapi import APIRouter, HTTPException
 from fastapi.responses import FileResponse, StreamingResponse
-from sqlalchemy.orm import Session
 
-from api.schemas import CleanupRequest, VideoCreate, VideoResponse
-from database.database import getDb
+from database.database import DbSession
 from download.download_service import downloadAsync
 from model.video import Video
-from notify.notify_clients import notifyClients
 from stream.stream_service import streamAndSave
 
-router = APIRouter(prefix="/videos", tags=["videos"])
-
-
-@router.post("", status_code=204)
-async def create(videoData: VideoCreate, db: Session = Depends(getDb)):
-    title = videoData.title
-    youtuber = videoData.youtuber
-    thumbnailUrl = videoData.thumbnailUrl
-    youtubeUrl = videoData.youtubeUrl
-    profileId = videoData.profileId
-
-    Video.deleteIfExists(db, youtubeUrl, profileId)
-    Video.create(db, title, youtuber, thumbnailUrl, youtubeUrl, profileId)
-    await notifyClients(profileId)
-
-
-@router.get("", response_model=list[VideoResponse])
-def getAll(profileId: Optional[int] = Query(None), db: Session = Depends(getDb)):
-    return Video.getAll(db, profileId=profileId)
-
-
-@router.get("/downloaded", response_model=list[VideoResponse])
-def getDownloaded(profileId: Optional[int] = Query(None), db: Session = Depends(getDb)):
-    return Video.getDownloaded(db, profileId=profileId)
-
-
-@router.post("/cleanup")
-def cleanup(request: CleanupRequest, db: Session = Depends(getDb)):
-    profileId = request.profileId
-    excludeIds = request.excludeIds
-
-    count = Video.deleteNotDownloaded(db, profileId, excludeIds)
-    return {"deleted": count}
+router = APIRouter(prefix="/videos")
 
 
 @router.post("/{videoId}/download")
-def download(videoId: int, db: Session = Depends(getDb)):
+def download(videoId: int, db: DbSession):
     video = Video.getById(db, videoId)
     if not video:
         raise HTTPException(404, "Video nicht gefunden")
@@ -60,7 +24,7 @@ def download(videoId: int, db: Session = Depends(getDb)):
 
 
 @router.get("/{videoId}/stream")
-def stream(videoId: int, db: Session = Depends(getDb)):
+def stream(videoId: int, db: DbSession):
     video = Video.getById(db, videoId)
     if not video:
         raise HTTPException(404, "Video nicht gefunden")
@@ -75,7 +39,7 @@ def stream(videoId: int, db: Session = Depends(getDb)):
 
 
 @router.get("/{videoId}/file")
-def getFile(videoId: int, db: Session = Depends(getDb)):
+def getFile(videoId: int, db: DbSession):
     path, video = Video.getValidPath(db, videoId)
     if not path:
         raise HTTPException(404, "Video noch nicht heruntergeladen")
@@ -83,7 +47,7 @@ def getFile(videoId: int, db: Session = Depends(getDb)):
 
 
 @router.delete("/{videoId}/file")
-def deleteFile(videoId: int, db: Session = Depends(getDb)):
+def deleteFile(videoId: int, db: DbSession):
     if not Video.deleteServerFile(db, videoId):
         raise HTTPException(404, "Video nicht gefunden")
     return {"status": "deleted"}
diff --git a/backend/database/database.py b/backend/database/database.py
index 7a4370d..3f166c2 100644
--- a/backend/database/database.py
+++ b/backend/database/database.py
@@ -1,5 +1,8 @@
+from typing import Annotated
+
+from fastapi import Depends
 from sqlalchemy import create_engine
-from sqlalchemy.orm import sessionmaker, declarative_base
+from sqlalchemy.orm import Session, sessionmaker, declarative_base
 
 DATABASE_URL = "sqlite:///videos/youtubeapp.db"
 
@@ -18,3 +21,6 @@ def getDb():
         yield db
     finally:
         db.close()
+
+
+DbSession = Annotated[Session, Depends(getDb)]
diff --git a/backend/model/profile.py b/backend/model/profile.py
index 6d6bf63..cdd7fc3 100644
--- a/backend/model/profile.py
+++ b/backend/model/profile.py
@@ -11,5 +11,6 @@ class Profile(Base):
     name = Column(String, nullable=False, unique=True)
 
     @classmethod
-    def getAll(cls, db: Session) -> list["Profile"]:
-        return db.query(cls).all()
+    def getAll(cls, db: Session) -> list[dict]:
+        profiles = db.query(cls).all()
+        return [{"id": p.id, "name": p.name} for p in profiles]
diff --git a/backend/model/video.py b/backend/model/video.py
index e00479a..04dc1d2 100644
--- a/backend/model/video.py
+++ b/backend/model/video.py
@@ -72,13 +72,6 @@ class Video(Base):
             query = query.filter(cls.profiles.any(Profile.id == profileId))
         return query.order_by(cls.id.desc()).all()
 
-    @classmethod
-    def getDownloaded(cls, db: Session, profileId: int | None = None) -> list["Video"]:
-        query = db.query(cls).filter(cls.filePath.isnot(None))
-        if profileId:
-            query = query.filter(cls.profiles.any(Profile.id == profileId))
-        return query.order_by(cls.id.desc()).all()
-
     @classmethod
     def getById(cls, db: Session, videoId: int) -> "Video | None":
         return db.query(cls).filter(cls.id == videoId).first()
diff --git a/browser_extension/api/background.js b/browser_extension/api/background.js
index a367c94..dafd8fa 100644
--- a/browser_extension/api/background.js
+++ b/browser_extension/api/background.js
@@ -1,7 +1,7 @@
-const SERVER_URL = "http://marha.local:8000/videos";
+const SERVER_BASE = "http://marha.local:8000";
 
-browser.runtime.onMessage.addListener((video) => {
-  fetch(SERVER_URL, {
+browser.runtime.onMessage.addListener(({ profileId, video }) => {
+  fetch(`${SERVER_BASE}/profiles/${profileId}/videos`, {
     method: "POST",
     headers: { "Content-Type": "application/json" },
     body: JSON.stringify(video),
diff --git a/browser_extension/tracking/content.js b/browser_extension/tracking/content.js
index 0fc2240..7ca3a06 100644
--- a/browser_extension/tracking/content.js
+++ b/browser_extension/tracking/content.js
@@ -25,10 +25,9 @@ function extractVideoFromCard(element) {
 
 async function sendVideo(video) {
   const stored = await browser.storage.local.get("profileId");
-  const profileId = stored.profileId || null;
-  const payload = { ...video, profileId };
-  console.log(`[YT-Erfasser] Video senden (Profil: ${profileId})`, payload.title);
-  browser.runtime.sendMessage(payload);
+  const profileId = stored.profileId || 1;
+  console.log(`[YT-Erfasser] Video senden (Profil: ${profileId})`, video.title);
+  browser.runtime.sendMessage({ profileId, video });
 }
 
 // --- IntersectionObserver: nur sichtbare Cards erfassen ---
diff --git a/structure.md b/structure.md
new file mode 100644
index 0000000..00ed6ab
--- /dev/null
+++ b/structure.md
@@ -0,0 +1,6 @@
+# Backend
+Profile(id, name) - Profiledata
+Video(id, title, youtuber, imgUrl, videoUrl, profile) - Videodata for profiles 
+# App 
+Profile(id, name) - Profiledata, sync with backend
+Video(id, title, youtuber, imgPath, videoPath, profile) - Videodata for downloaded videos
\ No newline at end of file