diff --git a/backend/src/main/java/com/example/backend/movies/api/MovieUserController.java b/backend/src/main/java/com/example/backend/movies/api/MovieUserController.java index b83c732..0cb0df8 100644 --- a/backend/src/main/java/com/example/backend/movies/api/MovieUserController.java +++ b/backend/src/main/java/com/example/backend/movies/api/MovieUserController.java @@ -5,7 +5,6 @@ import java.util.ArrayList; import org.modelmapper.ModelMapper; import org.springframework.web.bind.annotation.RequestMapping; -import org.springframework.web.servlet.mvc.support.RedirectAttributes; import com.example.backend.categories.service.CategorieService; import com.example.backend.core.configurations.Constants; @@ -19,15 +18,11 @@ import com.example.backend.viewed.model.ViewedEntity; import com.example.backend.viewed.service.ViewedService; import org.springframework.ui.Model; -import org.springframework.validation.BindingResult; import org.springframework.security.core.Authentication; -import jakarta.validation.Valid; - import org.springframework.security.core.context.SecurityContextHolder; import org.springframework.stereotype.Controller; import org.springframework.web.bind.annotation.GetMapping; -import org.springframework.web.bind.annotation.ModelAttribute; import org.springframework.web.bind.annotation.PathVariable; import org.springframework.web.bind.annotation.RequestParam; import org.springframework.web.bind.annotation.PostMapping; @@ -38,11 +33,8 @@ public class MovieUserController { public static final String URL = "/movies"; private static final String MOVIE_VIEW = "movies"; - private static final String MOVIE_EDIT_VIEW = "movie-edit"; private static final String PAGE_ATTRIBUTE = "page"; - private static final String MOVIE_ATTRIBUTE = "movie"; private static final String CATEGORIEID_ATTRIBUTE = "categorieId"; - private static final String MOVEID_ATTRIBUTE = "movieId"; private final MovieService movieService; private final CategorieService categorieService; @@ -70,11 +62,11 @@ public class MovieUserController { return modelMapper.map(entity, MovieDTO.class); } - private MovieEntity toEntity(MovieDTO dto) { - final MovieEntity entity = modelMapper.map(dto, MovieEntity.class); - entity.setCategorie(categorieService.get(dto.getCategorieId())); - return entity; - } + // private MovieEntity toEntity(MovieDTO dto) { + // final MovieEntity entity = modelMapper.map(dto, MovieEntity.class); + // entity.setCategorie(categorieService.get(dto.getCategorieId())); + // return entity; + // } private List getListMovieUserDTOs(Integer categorieId, int page) { List movies = movieService.getAll(categorieId, page, Constants.DEFUALT_PAGE_SIZE) @@ -92,6 +84,7 @@ public class MovieUserController { for (MovieDTO movieDTO : movies) { MovieUserDTO newMovDto = new MovieUserDTO(); newMovDto.setMovieDTO(movieDTO); + newMovDto.setCountViewes(movieService.countView(movieDTO.getId())); for (FavoriteEntity favoriteEntity : favs) { if ((int) favoriteEntity.getMovie().getId() == (int) movieDTO.getId()) { @@ -221,10 +214,11 @@ public class MovieUserController { } @GetMapping("/card/{id}") - public String getCardFilm(@PathVariable(name = "id") Integer movieId, - Model model) { + public String getCardFilm(@PathVariable(name = "id") Integer movieId, Model model) { + int countView = movieService.countView(movieId); MovieEntity movie = movieService.get(movieId); model.addAttribute("movie", movie); + model.addAttribute("countView", countView); // Изменено на countView return "card-film"; } diff --git a/backend/src/main/java/com/example/backend/movies/api/MovieUserDTO.java b/backend/src/main/java/com/example/backend/movies/api/MovieUserDTO.java index ac1f403..be0e447 100644 --- a/backend/src/main/java/com/example/backend/movies/api/MovieUserDTO.java +++ b/backend/src/main/java/com/example/backend/movies/api/MovieUserDTO.java @@ -12,6 +12,16 @@ public class MovieUserDTO { @NotBlank private boolean isViewed; + private Integer countViewes; + + public Integer getCountViewes() { + return countViewes; + } + + public void setCountViewes(Integer countViewes) { + this.countViewes = countViewes; + } + public MovieDTO getMovieDTO() { return movieDTO; } diff --git a/backend/src/main/resources/templates/card-film.html b/backend/src/main/resources/templates/card-film.html index 24d6bd5..668fa4f 100644 --- a/backend/src/main/resources/templates/card-film.html +++ b/backend/src/main/resources/templates/card-film.html @@ -7,20 +7,17 @@
- -
-
+

- +

-
-
diff --git a/data.mv.db b/data.mv.db index f5509a0..7c0c8da 100644 Binary files a/data.mv.db and b/data.mv.db differ