refactor: Для контроля сортировки использовать SortBy

Author: vvbakhanovich

src/main/java/ru/yandex/practicum/filmorate/service/impl/FilmServiceImpl.java

@@ -8,15 +8,11 @@
 import ru.yandex.practicum.filmorate.dto.FilmDto;
 import ru.yandex.practicum.filmorate.dto.FilmSearchDto;
 import ru.yandex.practicum.filmorate.mapper.FilmMapper;
-import ru.yandex.practicum.filmorate.model.EventType;
-import ru.yandex.practicum.filmorate.model.Film;
-import ru.yandex.practicum.filmorate.model.Operation;
-import ru.yandex.practicum.filmorate.model.SearchBy;
+import ru.yandex.practicum.filmorate.model.*;
 import ru.yandex.practicum.filmorate.service.FilmService;
 
 import java.util.ArrayList;
 import java.util.Collection;
-import java.util.Map;
 import java.util.stream.Collectors;
 
 import static ru.yandex.practicum.filmorate.mapper.FilmMapper.toDto;
@@ -27,11 +23,6 @@
 @Slf4j
 public class FilmServiceImpl implements FilmService {
 
-    public static final Map<String, String> ALLOWED_SORTS = Map.of(
-            "year", "f.release_date",
-            "likes", "likes DESC"
-    );
-
     private final FilmStorage filmStorage;
 
     private final UserStorage userStorage;
@@ -91,11 +82,10 @@ public Collection<FilmDto> getAllFilms() {
      * @return найденный фильм.
      */
     @Override
-    @Transactional
     public FilmDto getFilmById(final long filmId) {
-        filmStorage.findById(filmId);
+        Film film = filmStorage.findById(filmId);
         log.info("Фильм с id {} найден.", filmId);
-        return toDto(filmStorage.findById(filmId));
+        return toDto(film);
     }
 
     /**
@@ -191,11 +181,12 @@ public Collection<FilmDto> searchFilms(FilmSearchDto search) {
     @Override
     @Transactional
     public Collection<FilmDto> getFilmsFromDirector(final long directorId, final String sortBy) {
-        if (!ALLOWED_SORTS.containsKey(sortBy)) {
+        if (!SortBy.getStringValues().contains(sortBy)) {
             throw new IllegalArgumentException("Поле сортировки '" + sortBy + "' не поддерживается.");
         }
+        String sort = SortBy.fromString(sortBy).getSql();
         directorStorage.findById(directorId);
-        return filmStorage.findFilmsFromDirectorOrderBy(directorId, ALLOWED_SORTS.get(sortBy)).stream()
+        return filmStorage.findFilmsFromDirectorOrderBy(directorId, sort).stream()
                 .map(FilmMapper::toDto)
                 .collect(Collectors.toList());
     }

src/test/java/ru/yandex/practicum/filmorate/storage/DirectorDbStorageTest.java

@@ -9,6 +9,7 @@
 import ru.yandex.practicum.filmorate.dao.impl.DirectorDbStorage;
 import ru.yandex.practicum.filmorate.exception.NotFoundException;
 import ru.yandex.practicum.filmorate.model.Director;
+import ru.yandex.practicum.filmorate.model.SortBy;
 
 import java.util.Collection;
 import java.util.List;
@@ -46,6 +47,8 @@ public void init() {
     public void testFindEmptyDirectors() {
         Collection<Director> emptyDirectors = directorStorage.findAll();
 
+        System.out.println(SortBy.getStringValues());
+
         assertThat(emptyDirectors)
                 .isNotNull()
                 .isEmpty();

src/test/java/ru/yandex/practicum/filmorate/storage/FilmDbStorageTest.java

@@ -563,7 +563,7 @@ public void findFilmsByDirectorSortByYear() {
         filmDbStorage.add(film2);
 
         Collection<Film> films = filmDbStorage.findFilmsFromDirectorOrderBy(director.getId(),
-                FilmServiceImpl.ALLOWED_SORTS.get("year"));
+                SortBy.YEAR.getSql());
 
         assertThat(films)
                 .isNotNull()
@@ -589,7 +589,7 @@ public void findFilmsByDirectorSortByLikes() {
 
 
         Collection<Film> films = filmDbStorage.findFilmsFromDirectorOrderBy(director.getId(),
-                FilmServiceImpl.ALLOWED_SORTS.get("likes"));
+                SortBy.LIKES.getSql());
 
         assertThat(films)
                 .isNotNull()
@@ -603,7 +603,7 @@ public void findFilmsByDirectorSortByLikes() {
     public void findFilmsByDirectorUnknownId() {
         directorStorage.add(director);
         Collection<Film> films = filmDbStorage.findFilmsFromDirectorOrderBy(director.getId(),
-                FilmServiceImpl.ALLOWED_SORTS.get("year"));
+                SortBy.YEAR.getSql());
 
         assertThat(films)
                 .isNotNull()