From 416da3281a02d728bf7229cb83e51a4a16d2d9c7 Mon Sep 17 00:00:00 2001
From: ThisBirchWood <dylanseandefaoite@gmail.com>
Date: Mon, 14 Jul 2025 13:36:26 +0200
Subject: [PATCH] ADD functionality to retrieve and display clips by ID

---
 frontend/src/pages/VideoPlayer.tsx            | 17 ++++++++++++++++
 frontend/src/utils/endpoints.ts               | 20 ++++++++++++++++++-
 .../configuration/SecurityConfig.java         |  1 +
 .../vodsystem/controllers/ClipController.java | 17 ++++++++++++++++
 .../controllers/DownloadController.java       |  4 +++-
 .../ddf/vodsystem/services/ClipService.java   |  4 ++++
 6 files changed, 61 insertions(+), 2 deletions(-)

diff --git a/frontend/src/pages/VideoPlayer.tsx b/frontend/src/pages/VideoPlayer.tsx
index 3bdeaf4..00bfb2c 100644
--- a/frontend/src/pages/VideoPlayer.tsx
+++ b/frontend/src/pages/VideoPlayer.tsx
@@ -1,10 +1,14 @@
 import {useEffect, useState} from "react";
 import {useParams} from "react-router-dom";
+import type {Clip} from "../utils/types";
+import {getClipById} from "../utils/endpoints.ts";
+import Box from "../components/Box.tsx"
 
 const VideoPlayer = () => {
     const { id } = useParams();
     const [videoUrl, setVideoUrl] = useState<string>("");
     const [error, setError] = useState<string | null>(null);
+    const [clip, setClip] = useState<Clip | null>(null);
 
     useEffect(() => {
         // Fetch the video URL from the server
@@ -23,6 +27,14 @@ const VideoPlayer = () => {
                 console.error("Error fetching video:", err);
                 setError("Failed to load video. Please try again later.");
             });
+
+        if (!id) {
+            setError("Clip ID is required.");
+            return;
+        }
+
+        getClipById(id).then((fetchedClip) => {setClip(fetchedClip)})
+
     }, [id]);
 
     return (
@@ -41,6 +53,11 @@ const VideoPlayer = () => {
 
             {error && <div className="text-red-500 mt-2">{error}</div>}
             {!videoUrl && !error && <div className="text-gray-500 mt-2">Loading video...</div>}
+
+            <Box className={"p-2 m-2"}>
+                <p className={"text-2xl font-bold text-gray-600"}>{clip?.title}</p>
+            </Box>
+
         </div>
     );
 };
diff --git a/frontend/src/utils/endpoints.ts b/frontend/src/utils/endpoints.ts
index ae597a5..490bc15 100644
--- a/frontend/src/utils/endpoints.ts
+++ b/frontend/src/utils/endpoints.ts
@@ -167,6 +167,23 @@ const getClips = async (setError: Function): Promise< Clip[]> => {
     }
 }
 
+const getClipById = async (id: string): Promise<Clip | null> => {
+    try {
+        const response = await fetch(`/api/v1/clips/${id}`, {credentials: "include",});
+
+        if (!response.ok) {
+            console.error('Failed to fetch clip:', response.status);
+            return null;
+        }
+
+        const result: APIResponse = await response.json();
+        return result.data;
+    } catch (error: unknown) {
+        console.error('Error fetching clip:', error);
+        return null;
+    }
+};
+
 export {
     uploadFile,
     editFile,
@@ -174,5 +191,6 @@ export {
     getProgress,
     getMetadata,
     getUser,
-    getClips
+    getClips,
+    getClipById
 };
\ No newline at end of file
diff --git a/src/main/java/com/ddf/vodsystem/configuration/SecurityConfig.java b/src/main/java/com/ddf/vodsystem/configuration/SecurityConfig.java
index d7d8d04..e577c86 100644
--- a/src/main/java/com/ddf/vodsystem/configuration/SecurityConfig.java
+++ b/src/main/java/com/ddf/vodsystem/configuration/SecurityConfig.java
@@ -29,6 +29,7 @@ public class SecurityConfig {
         http
                 .csrf(AbstractHttpConfigurer::disable)
                 .authorizeHttpRequests(auth -> auth
+                        .requestMatchers("/api/v1/download/clip/**").authenticated()
                         .requestMatchers("/api/v1/auth/login", "/api/v1/auth/user").permitAll()
                         .requestMatchers("/api/v1/upload", "/api/v1/download/**").permitAll()
                         .requestMatchers("/api/v1/edit/**", "/api/v1/process/**", "/api/v1/progress/**").permitAll()
diff --git a/src/main/java/com/ddf/vodsystem/controllers/ClipController.java b/src/main/java/com/ddf/vodsystem/controllers/ClipController.java
index 3be57b9..a20cceb 100644
--- a/src/main/java/com/ddf/vodsystem/controllers/ClipController.java
+++ b/src/main/java/com/ddf/vodsystem/controllers/ClipController.java
@@ -9,6 +9,7 @@ import org.springframework.security.core.annotation.AuthenticationPrincipal;
 import org.springframework.security.oauth2.core.user.OAuth2User;
 import org.springframework.stereotype.Controller;
 import org.springframework.web.bind.annotation.GetMapping;
+import org.springframework.web.bind.annotation.PathVariable;
 import org.springframework.web.bind.annotation.RequestMapping;
 
 import java.util.List;
@@ -33,4 +34,20 @@ public class ClipController {
                 new APIResponse<>("success", "Clips retrieved successfully", clips)
         );
     }
+
+    @GetMapping("/{id}")
+    public ResponseEntity<APIResponse<Clip>> getClipById(@AuthenticationPrincipal OAuth2User principal, @PathVariable Long id) {
+        if (principal == null) {
+            throw new NotAuthenticated("User is not authenticated");
+        }
+
+        Clip clip = clipService.getClipById(id);
+        if (clip == null) {
+            return ResponseEntity.notFound().build();
+        }
+
+        return ResponseEntity.ok(
+                new APIResponse<>("success", "Clip retrieved successfully", clip)
+        );
+    }
 }
diff --git a/src/main/java/com/ddf/vodsystem/controllers/DownloadController.java b/src/main/java/com/ddf/vodsystem/controllers/DownloadController.java
index 5e633d5..26dce88 100644
--- a/src/main/java/com/ddf/vodsystem/controllers/DownloadController.java
+++ b/src/main/java/com/ddf/vodsystem/controllers/DownloadController.java
@@ -7,6 +7,8 @@ import org.springframework.http.HttpHeaders;
 import org.springframework.http.MediaType;
 import org.springframework.http.MediaTypeFactory;
 import org.springframework.http.ResponseEntity;
+import org.springframework.security.core.annotation.AuthenticationPrincipal;
+import org.springframework.security.oauth2.core.user.OAuth2User;
 import org.springframework.web.bind.annotation.GetMapping;
 import org.springframework.web.bind.annotation.PathVariable;
 import org.springframework.web.bind.annotation.RequestMapping;
@@ -51,7 +53,7 @@ public class DownloadController {
     }
 
     @GetMapping("/clip/{id}")
-    public ResponseEntity<Resource> downloadClip(@PathVariable Long id) {
+    public ResponseEntity<Resource> downloadClip(@AuthenticationPrincipal OAuth2User principal, @PathVariable Long id) {
         Resource resource = downloadService.downloadClip(id);
 
         if (resource == null || !resource.exists()) {
diff --git a/src/main/java/com/ddf/vodsystem/services/ClipService.java b/src/main/java/com/ddf/vodsystem/services/ClipService.java
index 06e0ee5..8bae4dc 100644
--- a/src/main/java/com/ddf/vodsystem/services/ClipService.java
+++ b/src/main/java/com/ddf/vodsystem/services/ClipService.java
@@ -100,4 +100,8 @@ public class ClipService {
         clip.setVideoPath(outputFile.getPath());
         clipRepository.save(clip);
     }
+
+    public Clip getClipById(Long id) {
+        return clipRepository.findById(id).orElse(null);
+    }
 }