dylan/vod-system
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

REFACTOR code to use Optional entity

Browse Source
This commit is contained in:
Dylan De Faoite
2025-08-12 15:39:06 +02:00
parent 19a78df4c6
commit 6433294ced
7 changed files with 121 additions and 74 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
frontend/src/components/Dropdown.tsx
View File

@@ -9,7 +9,9 @@ type DropdownItemProps = {
const DropdownItem = ({ item, onClick, className }: DropdownItemProps) => {
return (
<li className={clsx(className, "cursor-pointer hover:bg-gray-100 px-4 py-2 align-middle")} onClick={() => onClick(item)}>
<li className={clsx(className, "cursor-pointer hover:bg-gray-100 px-4 py-2 align-middle")}
onClick={() => onClick(item)}
>
{item}
</li>
);
@@ -30,7 +32,7 @@ const Dropdown = ({ label, children, className }: DropdownProps) => {
};
useEffect(() => {
function handleClickOutside(event: { target: any; }) {
function handleClickOutside(event: { target: any }) {
if (ref.current && !ref.current.contains(event.target)) {
setIsOpen(false);
}

7
src/main/java/com/ddf/vodsystem/controllers/ClipController.java
View File

@@ -11,6 +11,7 @@ import org.springframework.security.oauth2.core.user.OAuth2User;
import org.springframework.web.bind.annotation.*;
import java.util.List;
import java.util.Optional;
@RestController
@RequestMapping("/api/v1/clips")
@@ -35,12 +36,12 @@ public class ClipController {
@GetMapping("/{id}")
public ResponseEntity<APIResponse<ClipDTO>> getClipById(@PathVariable Long id) {
Clip clip = clipService.getClipById(id);
if (clip == null) {
Optional<Clip> clip = clipService.getClipById(id);
if (clip.isEmpty()) {
return ResponseEntity.notFound().build();
}
ClipDTO clipDTO = convertToDTO(clip);
ClipDTO clipDTO = convertToDTO(clip.get());
return ResponseEntity.ok(
new APIResponse<>("success", "Clip retrieved successfully", clipDTO)

8
src/main/java/com/ddf/vodsystem/controllers/UserController.java
View File

@@ -10,6 +10,8 @@ import org.springframework.http.ResponseCookie;
import org.springframework.http.ResponseEntity;
import org.springframework.web.bind.annotation.*;
import java.util.Optional;
@RestController
@RequestMapping("/api/v1/auth/")
public class UserController {
@@ -21,14 +23,14 @@ public class UserController {
@GetMapping("/user")
public ResponseEntity<APIResponse<User>> user() {
User user = userService.getLoggedInUser();
Optional<User> user = userService.getLoggedInUser();
if (user == null) {
if (user.isEmpty()) {
throw new NotAuthenticated("User not authenticated");
}
return ResponseEntity.ok(
new APIResponse<>("success", "User retrieved successfully", user)
new APIResponse<>("success", "User retrieved successfully", user.get())
);
}

38
src/main/java/com/ddf/vodsystem/security/JwtFilter.java
View File

@@ -1,7 +1,6 @@
package com.ddf.vodsystem.security;
import com.ddf.vodsystem.entities.User;
import com.ddf.vodsystem.exceptions.NotAuthenticated;
import com.ddf.vodsystem.services.UserService;
import jakarta.servlet.FilterChain;
import jakarta.servlet.ServletException;
@@ -20,6 +19,7 @@ import org.springframework.web.filter.OncePerRequestFilter;
import java.io.IOException;
import java.util.Arrays;
import java.util.List;
import java.util.Optional;
@Component
public class JwtFilter extends OncePerRequestFilter {
@@ -59,32 +59,34 @@ public class JwtFilter extends OncePerRequestFilter {
}
}
if (jwt == null) {
logger.debug("No JWT found in request");
Optional<Authentication> authentication = getAuthentication(jwt);
authentication.ifPresent(value ->
SecurityContextHolder.getContext().setAuthentication(value)
);
filterChain.doFilter(request, response);
return;
}
logger.debug("JWT found in request");
private Optional<Authentication> getAuthentication(String jwt) {
if (jwt == null || jwt.isEmpty()) {
return Optional.empty();
}
Long userId = jwtService.validateTokenAndGetUserId(jwt);
if (userId == null) {
logger.warn("Invalid JWT: {}", jwt);
filterChain.doFilter(request, response);
return;
return Optional.empty();
}
User user;
try {
user = userService.getUserById(userId);
} catch (NotAuthenticated e) {
filterChain.doFilter(request, response);
return;
Optional<User> user = userService.getUserById(userId);
if (user.isEmpty()) {
return Optional.empty();
}
Authentication authentication = new UsernamePasswordAuthenticationToken(user, jwt, List.of(new SimpleGrantedAuthority("ROLE_USER")));
SecurityContextHolder.getContext().setAuthentication(authentication);
Authentication authentication = new UsernamePasswordAuthenticationToken(
user.get(),
jwt,
List.of(new SimpleGrantedAuthority("ROLE_USER"))
);
filterChain.doFilter(request, response);
return Optional.of(authentication);
}
}

95
src/main/java/com/ddf/vodsystem/services/ClipService.java
View File

@@ -8,6 +8,7 @@ import java.io.File;
import java.io.IOException;
import java.time.LocalDateTime;
import java.util.List;
import java.util.Optional;
import java.util.concurrent.ExecutionException;
import com.ddf.vodsystem.exceptions.FFMPEGException;
@@ -66,36 +67,50 @@ public class ClipService {
ProgressTracker progress)
throws IOException, InterruptedException {
User user = userService.getLoggedInUser();
Optional<User> user = userService.getLoggedInUser();
metadataService.normalizeVideoMetadata(inputMetadata, outputMetadata);
compressionService.compress(inputFile, outputFile, outputMetadata, progress)
.thenRun(() -> {
if (user != null) {
persistClip(outputMetadata, user, outputFile, inputFile.getName());
}
});
.thenRun(() -> user.ifPresent(value ->
persistClip(
outputMetadata,
value,
outputFile,
inputFile.getName()
)));
}
/**
* Retrieves all clips associated with the currently logged-in user.
*
* @return a list of clips belonging to the authenticated user.
* @throws NotAuthenticated if the user is not authenticated.
*/
public List<Clip> getClipsByUser() {
User user = userService.getLoggedInUser();
Optional<User> user = userService.getLoggedInUser();
if (user == null) {
logger.warn("No authenticated user found");
return List.of();
if (user.isEmpty()) {
throw new NotAuthenticated("User is not authenticated");
}
return clipRepository.findByUser(user);
return clipRepository.findByUser(user.get());
}
public Clip getClipById(Long id) {
Clip clip = clipRepository.findById(id).orElse(null);
/**
* Retrieves a clip by its ID, ensuring the user is authenticated to access it.
*
* @param id the ID of the clip to retrieve.
* @return an Optional containing the Clip if found and accessible, or empty if not found.
* @throws NotAuthenticated if the user is not authorized to access the clip.
*/
public Optional<Clip> getClipById(Long id) {
Optional<Clip> clip = clipRepository.findById(id);
if (clip == null) {
if (clip.isEmpty()) {
logger.warn("Clip with ID {} not found", id);
return null;
return clip;
}
if (!isAuthenticatedForClip(clip)) {
if (!isAuthenticatedForClip(clip.get())) {
logger.warn("User is not authorized to access clip with ID {}", id);
throw new NotAuthenticated("You are not authorized to access this clip");
}
@@ -103,34 +118,44 @@ public class ClipService {
return clip;
}
/**
* Deletes a clip by its ID, ensuring the user is authenticated to perform the deletion.
*
* @param id the ID of the clip to delete.
* @return true if the clip was successfully deleted, false if it was not found.
* @throws NotAuthenticated if the user is not authorized to delete the clip.
*/
public boolean deleteClip(Long id) {
Clip clip = getClipById(id);
if (clip == null) {
Optional<Clip> possibleClip = getClipById(id);
if (possibleClip.isEmpty()) {
logger.warn("Clip with ID {} not found for deletion", id);
return false;
}
Clip clip = possibleClip.get();
if (!isAuthenticatedForClip(clip)) {
logger.warn("User is not authorized to delete clip with ID {}", id);
throw new NotAuthenticated("You are not authorized to delete this clip");
}
File clipFile = new File(clip.getVideoPath());
File thumbnailFile = new File(clip.getThumbnailPath());
directoryService.deleteFile(clipFile);
directoryService.deleteFile(thumbnailFile);
deleteClipFiles(clip);
clipRepository.delete(clip);
logger.info("Clip with ID {} deleted successfully", id);
return true;
}
/**
* Checks if the currently logged-in user is authenticated to access the specified clip.
*
* @param clip the clip to check access for.
* @return true if the user is authenticated for the clip, false otherwise.
*/
public boolean isAuthenticatedForClip(Clip clip) {
User user = userService.getLoggedInUser();
if (user == null || clip == null) {
Optional<User> user = userService.getLoggedInUser();
if (user.isEmpty() || clip == null) {
return false;
}
return user.getId().equals(clip.getUser().getId());
return user.get().getId().equals(clip.getUser().getId());
}
private void persistClip(VideoMetadata videoMetadata,
@@ -175,4 +200,20 @@ public class ClipService {
logger.info("Clip created successfully with ID: {}", clip.getId());
}
private void deleteClipFiles(Clip clip) {
File clipFile = new File(clip.getVideoPath());
File thumbnailFile = new File(clip.getThumbnailPath());
boolean clipDeleted = directoryService.deleteFile(clipFile);
boolean thumbnailDeleted = directoryService.deleteFile(thumbnailFile);
if (!clipDeleted) {
throw new FFMPEGException("Failed to delete clip file: " + clipFile.getAbsolutePath());
}
if (!thumbnailDeleted) {
throw new FFMPEGException("Failed to delete thumbnail file: " + thumbnailFile.getAbsolutePath());
}
}
}

2
src/main/java/com/ddf/vodsystem/services/DirectoryService.java
View File

@@ -118,7 +118,7 @@ public class DirectoryService {
try {
Files.delete(file.toPath());
logger.info("Deleted file: {}", file.getAbsolutePath());
logger.debug("Deleted file: {}", file.getAbsolutePath());
return true;
} catch (IOException e) {
logger.error("Error deleting file: {}", e.getMessage());

13
src/main/java/com/ddf/vodsystem/services/UserService.java
View File

@@ -41,17 +41,16 @@ public class UserService {
this.jwtService = jwtService;
}
public User getUserById(Long userId) {
return userRepository.findById(userId)
.orElseThrow(() -> new NotAuthenticated("User not found"));
public Optional<User> getUserById(Long userId) {
return userRepository.findById(userId);
}
public User getLoggedInUser() {
public Optional<User> getLoggedInUser() {
Authentication auth = SecurityContextHolder.getContext().getAuthentication();
if (auth != null && auth.isAuthenticated() && auth.getPrincipal() instanceof User) {
return (User) auth.getPrincipal();
if (auth != null && auth.isAuthenticated() && auth.getPrincipal() instanceof User user) {
return Optional.of(user);
}
return null;
return Optional.empty();
}
public String login(String idToken) {