Debugging

neuefische · Oct 23, 2024 · 30e6e43 · 30e6e43
1 parent 2ca85b7
commit 30e6e43
Show file tree

Hide file tree

Showing 5 changed files with 32 additions and 13 deletions.
diff --git a/backend/src/main/java/com/example/backend/controller/RatingController.java b/backend/src/main/java/com/example/backend/controller/RatingController.java
@@ -2,7 +2,9 @@
 
 import com.example.backend.dto.CreateRatingRequest;
 import com.example.backend.dto.RatingResponse;
+import com.example.backend.model.Movie;
 import com.example.backend.model.Rating;
+import com.example.backend.service.MovieService;
 import com.example.backend.service.RatingService;
 import lombok.AllArgsConstructor;
 import org.jetbrains.annotations.NotNull;
@@ -16,6 +18,7 @@
 public class RatingController {
 
     private final RatingService ratingService;
+    private final MovieService movieService;
 
     @PostMapping
     public void save(@RequestBody @NotNull CreateRatingRequest request, @AuthenticationPrincipal OAuth2User user) {
@@ -32,4 +35,25 @@ public RatingResponse get(@AuthenticationPrincipal OAuth2User user, @PathVariabl
 
         return RatingResponse.from(rating);
     }
+    @GetMapping("/init")
+    public String innitTestData (@AuthenticationPrincipal OAuth2User user) {
+        Movie movie1 =  Movie.builder().name("Movie 1").build();
+        movieService.createMovie(movie1);
+        Rating rating1 = Rating.builder().rating(5).movieId(movie1.getId()).userId(user.getAttributes().get("login").toString()).isWatched(true).build();
+        Movie movie2 = Movie.builder().name("Movie 2").build();
+        movieService.createMovie(movie2);
+        Rating rating2 = Rating.builder().rating(3).movieId(movie2.getId()).userId(user.getAttributes().get("login").toString()).isWatched(false).build();
+        Movie movie3 = Movie.builder().name("Movie 3").build();
+        movieService.createMovie(movie3);
+        Rating rating3 = Rating.builder().rating(7).movieId(movie3.getId()).userId(user.getAttributes().get("login").toString()).isWatched(true).build();
+        Movie movie4 = Movie.builder().name("Movie 4").build();
+        movieService.createMovie(movie4);
+        Rating rating4 = Rating.builder().rating(8).movieId(movie4.getId()).userId(user.getAttributes().get("login").toString()).isWatched(false).build();
+
+        ratingService.save(rating1);
+        ratingService.save(rating2);
+        ratingService.save(rating3);
+        ratingService.save(rating4);
+        return "Hello";
+    }
 }
diff --git a/backend/src/main/java/com/example/backend/service/MovieService.java b/backend/src/main/java/com/example/backend/service/MovieService.java
@@ -52,10 +52,10 @@ private List<Pair<Rating, Movie>> getMovieRatings(List<Rating> ratings) {
                                     rating,
                                     movies.stream().filter(
                                             (Movie movie) -> movie.getId().equals(rating.getMovieId())
-                                    ).findFirst().orElse(null)
+                                    ).findFirst().orElse(new Movie())
                             );
                         }
-                ).filter(ratingMoviePair -> ratingMoviePair.getSecond() != null)
+                ).filter(ratingMoviePair -> ratingMoviePair.getSecond().getId() != null)
                 .toList();
     }
 

diff --git a/frontend/src/Component/App/Main/WatchedTab.tsx b/frontend/src/Component/App/Main/WatchedTab.tsx
@@ -4,12 +4,11 @@ import {useFetch} from "../../../Hooks/useFetch.ts";
 import MovieType from "../../../Type/MovieType.tsx";
 
 export default function WatchedTab() {
-    const {data, state } = useFetch<MovieType[]>("http://localhost:5173/api/movie/watched");
-    const flatData = Array.isArray(data) ? data.flat() : [];
+    const {data, state } = useFetch<MovieType>("http://localhost:5173/api/movie/watched");
     return (
         <div>
             WatchedTab
-            <MovieList data={flatData} />
+            <MovieList data={data} />
             <EditMovieForm/>
         </div>
     );

diff --git a/frontend/src/Component/App/Main/WishlistTab.tsx b/frontend/src/Component/App/Main/WishlistTab.tsx
@@ -4,12 +4,11 @@ import {useFetch} from "../../../Hooks/useFetch.ts";
 import MovieType from "../../../Type/MovieType.tsx";
 
 export default function WishlistTab() {
-    const {data, state } = useFetch<MovieType[]>("http://localhost:5173/api/movie/wishlist");
-    const flatData = Array.isArray(data) ? data.flat() : [];
+    const {data, state } = useFetch<MovieType>("http://localhost:5173/api/movie/wishlist");
     return (
         <div>
             WishlistTab
-            <MovieList data={flatData} />
+            <MovieList data={data} />
             <EditMovieForm/>
         </div>
     );

diff --git a/frontend/src/Type/MovieType.tsx b/frontend/src/Type/MovieType.tsx
@@ -1,12 +1,9 @@
-import PersonType from "./PersonType.tsx";
 
 type MovieType = {
     id: string,
-    name: string
+    movieName: string
     isWatched: boolean,
-    rating: number,
-    directors: PersonType[];
-    actors: PersonType[]
+    rating: number
 }
 
 export default MovieType;