Merge pull request #26 from neuefische/ISSUE-12

ISSUE-12: Create a POST create new relation actor-movie-relation endpoint and cover it with tests.

backend/src/main/java/com/example/backend/controller/ActorController.java

@@ -44,21 +44,6 @@ public void getByNameInvalid() throws NoResourceFoundException {
         throw new NoResourceFoundException(HttpMethod.GET, "/api/actor/autocompletion/");
     }
 
-    @GetMapping("/movie/{movieId}")
-    public List<ActorResponse> getByMovieId(@PathVariable @NonNull Long movieId) {
-        return actorService.getActorsByMovieId(movieId).stream().map(ActorResponse::from).toList();
-    }
-
-    /**
-     * Prevents the frontend fallback response from being returned if the request path is invalid.
-     *
-     * @throws NoResourceFoundException
-     */
-    @GetMapping("/movie/")
-    public void getByMovieIdInvalid() throws NoResourceFoundException {
-        throw new NoResourceFoundException(HttpMethod.GET, "/api/actor/movie/");
-    }
-
     @PutMapping
     public void update() {
         // TODO

backend/src/main/java/com/example/backend/controller/MovieActorController.java

@@ -0,0 +1,39 @@
+package com.example.backend.controller;
+
+import com.example.backend.dto.ActorResponse;
+import com.example.backend.dto.MovieActorRequest;
+import com.example.backend.service.MovieActorService;
+import lombok.AllArgsConstructor;
+import lombok.NonNull;
+import org.springframework.http.HttpMethod;
+import org.springframework.web.bind.annotation.*;
+import org.springframework.web.servlet.resource.NoResourceFoundException;
+
+import java.util.List;
+
+@RestController
+@AllArgsConstructor
+@RequestMapping("/api/movie-actor")
+public class MovieActorController {
+
+    private final MovieActorService movieActorService;
+
+    @PostMapping()
+    public void addActorById(@RequestBody @NonNull MovieActorRequest movieActorRequest) {
+        movieActorService.addActor(movieActorRequest.movieId(), movieActorRequest.actorId());
+    }
+
+    @GetMapping("/{movieId}")
+    public List<ActorResponse> getActorsByMovieId(@PathVariable @NonNull Long movieId) {
+        return movieActorService.getActorsByMovieId(movieId).stream().map(ActorResponse::from).toList();
+    }
+
+    /**
+     * Prevents the frontend fallback response from being returned if the request path is invalid.
+     *
+     * @throws NoResourceFoundException
+     */
+    @GetMapping("/")
+    public void getByMovieIdInvalid() throws NoResourceFoundException {
+        throw new NoResourceFoundException(HttpMethod.GET, "/api/actor-movie/");
+    }}

backend/src/main/java/com/example/backend/controller/MovieController.java

@@ -20,12 +20,13 @@ public class MovieController {
     private final MovieService movieService;
 
     @PostMapping
-    public MovieResponse save(@RequestBody @NotNull CreateMovieRequest movieRequest){
+    public MovieResponse save(@RequestBody @NotNull CreateMovieRequest movieRequest) {
         Movie movie = movieRequest.toMovie();
         return MovieResponse.from(movieService.createMovie(movie));
     }
+
     @GetMapping
-    public List<MovieResponse> getAll(){
+    public List<MovieResponse> getAll() {
         return movieService.getAllMovies().stream().map(MovieResponse::from).collect(Collectors.toList());
     }
 

backend/src/main/java/com/example/backend/dto/ErrorResponse.java

@@ -0,0 +1,4 @@
+package com.example.backend.dto;
+
+public record ErrorResponse(String message) {
+}

backend/src/main/java/com/example/backend/dto/MovieActorRequest.java

@@ -0,0 +1,6 @@
+package com.example.backend.dto;
+
+import lombok.NonNull;
+
+public record MovieActorRequest(@NonNull Long movieId, @NonNull Long actorId) {
+}

backend/src/main/java/com/example/backend/exception/GlobalExceptionHandler.java

@@ -0,0 +1,47 @@
+package com.example.backend.exception;
+
+import com.example.backend.dto.ErrorResponse;
+import lombok.extern.log4j.Log4j2;
+import org.springframework.http.HttpStatus;
+import org.springframework.http.converter.HttpMessageNotReadableException;
+import org.springframework.web.bind.annotation.ControllerAdvice;
+import org.springframework.web.bind.annotation.ExceptionHandler;
+import org.springframework.web.bind.annotation.ResponseStatus;
+import org.springframework.web.servlet.resource.NoResourceFoundException;
+
+import java.util.NoSuchElementException;
+import java.util.logging.Logger;
+
+@ControllerAdvice
+@Log4j2
+public class GlobalExceptionHandler {
+    private static final String GENERIC_ERROR_MESSAGE = "Something went wrong";
+
+    @ExceptionHandler
+    @ResponseStatus(HttpStatus.BAD_REQUEST)
+    public ErrorResponse handleGlobalException(NoSuchElementException exception) {
+        log.info(exception.getMessage());
+        return new ErrorResponse(exception.getMessage());
+    }
+
+    @ExceptionHandler
+    @ResponseStatus(HttpStatus.BAD_REQUEST)
+    public ErrorResponse handleGlobalException(HttpMessageNotReadableException exception) {
+        log.info(exception.getMessage());
+        return new ErrorResponse(exception.getMessage());
+    }
+
+    @ExceptionHandler
+    @ResponseStatus(HttpStatus.NOT_FOUND)
+    public ErrorResponse handleGlobalException(NoResourceFoundException exception) {
+        log.info(exception.getMessage());
+        return new ErrorResponse(exception.getMessage());
+    }
+
+    @ExceptionHandler
+    @ResponseStatus(HttpStatus.INTERNAL_SERVER_ERROR)
+    public ErrorResponse handleGlobalException(Exception exception) {
+        log.error(exception);
+        return new ErrorResponse(GENERIC_ERROR_MESSAGE);
+    }
+}

backend/src/main/java/com/example/backend/model/Actor.java

@@ -3,6 +3,7 @@
 import jakarta.persistence.*;
 import lombok.*;
 
+import java.util.HashSet;
 import java.util.Set;
 
 @Entity
@@ -17,9 +18,6 @@ public class Actor {
     @GeneratedValue
     private Long id;
 
-    @ManyToMany(cascade = {CascadeType.DETACH, CascadeType.MERGE, CascadeType.REFRESH}, fetch = FetchType.EAGER)
-    private Set<Movie> movies;
-
     @Column(nullable = false)
     private String name;
 }

backend/src/main/java/com/example/backend/model/ActorRepository.java

@@ -1,16 +1,11 @@
 package com.example.backend.model;
 
 import org.springframework.data.jpa.repository.JpaRepository;
-import org.springframework.data.jpa.repository.Query;
-import org.springframework.data.repository.query.Param;
 import org.springframework.stereotype.Repository;
 
 import java.util.List;
 
 @Repository
 public interface ActorRepository extends JpaRepository<Actor, Long> {
     List<Actor> findByNameStartingWith(String prefix);
-
-    @Query("SELECT a FROM Actor a JOIN a.movies m WHERE m.id = :movieId")
-    List<Actor> findByMovieId(@Param("movieId") Long movieId);
 }

backend/src/main/java/com/example/backend/model/Director.java

@@ -3,6 +3,7 @@
 import jakarta.persistence.*;
 import lombok.*;
 
+import java.util.HashSet;
 import java.util.Set;
 
 @Entity
@@ -17,8 +18,5 @@ public class Director {
     @GeneratedValue
     private Long id;
 
-    @ManyToMany(cascade = {CascadeType.DETACH, CascadeType.MERGE, CascadeType.REFRESH}, fetch = FetchType.EAGER)
-    private Set<Movie> movies;
-
     private String name;
 }

backend/src/main/java/com/example/backend/model/Movie.java

@@ -3,6 +3,7 @@
 import jakarta.persistence.*;
 import lombok.*;
 
+import java.util.HashSet;
 import java.util.Set;
 
 @Entity
@@ -22,11 +23,5 @@ public class Movie {
 
     private boolean isWatched;
 
-    @ManyToMany(cascade = {CascadeType.DETACH, CascadeType.MERGE, CascadeType.REFRESH}, fetch = FetchType.EAGER)
-    private Set<Actor> actors;
-
-    @ManyToMany(cascade = {CascadeType.DETACH, CascadeType.MERGE, CascadeType.REFRESH}, fetch = FetchType.EAGER)
-    private Set<Director> directors;
-
     private String name;
 }

backend/src/main/java/com/example/backend/model/MovieActorRelation.java

@@ -0,0 +1,27 @@
+package com.example.backend.model;
+
+import jakarta.persistence.*;
+import lombok.*;
+
+@Entity
+@AllArgsConstructor
+@NoArgsConstructor
+@Builder
+@With
+@Data
+@Table(
+        uniqueConstraints = {
+                @UniqueConstraint(columnNames = {"actor_id", "movie_id"})
+        }
+)
+public class MovieActorRelation {
+    @Id
+    @GeneratedValue
+    private Long id;
+
+    @ManyToOne(cascade = {CascadeType.DETACH, CascadeType.MERGE, CascadeType.REFRESH})
+    private Actor actor;
+
+    @ManyToOne(cascade = {CascadeType.DETACH, CascadeType.MERGE, CascadeType.REFRESH})
+    private Movie movie;
+}

backend/src/main/java/com/example/backend/model/MovieActorRelationRepository.java

@@ -0,0 +1,11 @@
+package com.example.backend.model;
+
+import org.springframework.data.jpa.repository.JpaRepository;
+import org.springframework.stereotype.Repository;
+
+import java.util.List;
+
+@Repository
+public interface MovieActorRelationRepository extends JpaRepository<MovieActorRelation, Long> {
+    List<MovieActorRelation> findByMovieId(Long movieId);
+}

backend/src/main/java/com/example/backend/service/ActorService.java

@@ -23,8 +23,4 @@ public List<Actor> getAllActors() {
     public List<Actor> getActorsByPrefix(String prefix) {
         return actorRepository.findByNameStartingWith(prefix);
     }
-
-    public List<Actor> getActorsByMovieId(Long movieId) {
-        return actorRepository.findByMovieId(movieId);
-    }
 }

backend/src/main/java/com/example/backend/service/MovieActorService.java

@@ -0,0 +1,30 @@
+package com.example.backend.service;
+
+import com.example.backend.model.*;
+import lombok.RequiredArgsConstructor;
+import org.springframework.stereotype.Service;
+
+import java.util.List;
+
+@Service
+@RequiredArgsConstructor
+public class MovieActorService {
+    private final MovieActorRelationRepository movieActorRelationRepository;
+
+    private final ActorRepository actorRepository;
+
+    private final MovieRepository movieRepository;
+
+    public List<Actor> getActorsByMovieId(Long movieId) {
+        return movieActorRelationRepository.findByMovieId(movieId)
+                .stream()
+                .map(MovieActorRelation::getActor)
+                .toList();
+    }
+
+    public void addActor(Long movieId, Long actorId) {
+        Movie movie = movieRepository.findById(movieId).orElseThrow();
+        Actor actor = actorRepository.findById(actorId).orElseThrow();
+        movieActorRelationRepository.save(MovieActorRelation.builder().actor(actor).movie(movie).actor(actor).build());
+    }
+}

backend/src/main/java/com/example/backend/service/MovieService.java

@@ -2,11 +2,8 @@
 
 import com.example.backend.model.Movie;
 import com.example.backend.model.MovieRepository;
-import jakarta.transaction.Transactional;
 import lombok.RequiredArgsConstructor;
-import org.springframework.http.HttpStatus;
 import org.springframework.stereotype.Service;
-import org.springframework.web.server.ResponseStatusException;
 
 import java.util.List;
 
@@ -18,26 +15,24 @@ public class MovieService {
     public Movie createMovie(Movie movie) {
         return movieRepository.save(movie);
     }
+
     public List<Movie> getAllMovies() {
         return movieRepository.findAll();
     }
 
     public Movie getMovieById(Long movieId) {
-        return movieRepository.findById(movieId)
-                .orElseThrow(() -> new ResponseStatusException(HttpStatus.NOT_FOUND, "Movie with id " + movieId + " not found"));
+        return movieRepository.findById(movieId).orElseThrow();
     }
 
     public void deleteMovie(Long movieId) {
-        if (movieRepository.existsById(movieId)) {
-            movieRepository.deleteById(movieId);
-        } else {
-            throw new ResponseStatusException(HttpStatus.NOT_FOUND, "Movie with id " + movieId + " does not exist");
-        }
+        Movie movie = movieRepository.findById(movieId).orElseThrow();
+
+        movieRepository.delete(movie);
     }
+
     public Movie updateMovie(Movie movie) {
-        if (movieRepository.existsById(movie.getId())) {
-            return movieRepository.save(movie);
-        }
-        throw new ResponseStatusException(HttpStatus.NOT_FOUND, "Movie with id " + movie.getId() + " does not exist");
+        movieRepository.findById(movie.getId()).orElseThrow();
+
+        return movieRepository.save(movie);
     }
 }