Спринт 12 | Добавляет БД

pom.xml

@@ -21,6 +21,15 @@
 			<groupId>org.springframework.boot</groupId>
 			<artifactId>spring-boot-starter-web</artifactId>
 		</dependency>
+		<dependency>
+			<groupId>org.springframework.boot</groupId>
+			<artifactId>spring-boot-starter-data-jpa</artifactId>
+		</dependency>
+		<dependency>
+			<groupId>com.h2database</groupId>
+			<artifactId>h2</artifactId>
+			<scope>runtime</scope>
+		</dependency>
 
 		<dependency>
 			<groupId>org.projectlombok</groupId>

src/main/java/ru/yandex/practicum/filmorate/controller/FilmController.java

@@ -1,7 +1,15 @@
 package ru.yandex.practicum.filmorate.controller;
 
 import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.web.bind.annotation.*;
+import org.springframework.web.bind.annotation.DeleteMapping;
+import org.springframework.web.bind.annotation.GetMapping;
+import org.springframework.web.bind.annotation.PathVariable;
+import org.springframework.web.bind.annotation.PostMapping;
+import org.springframework.web.bind.annotation.PutMapping;
+import org.springframework.web.bind.annotation.RequestBody;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RequestParam;
+import org.springframework.web.bind.annotation.RestController;
 import ru.yandex.practicum.filmorate.model.Film;
 import ru.yandex.practicum.filmorate.service.FilmService;
 
@@ -22,6 +30,11 @@ public Collection<Film> list() {
         return filmService.getList();
     }
 
+    @GetMapping("/{id}")
+    public Film getFilm(@PathVariable final Long id) {
+        return filmService.getFilm(id);
+    }
+
     @PostMapping
     public Film create(@RequestBody final Film film) {
         return filmService.create(film);

src/main/java/ru/yandex/practicum/filmorate/controller/GenreController.java

@@ -0,0 +1,28 @@
+package ru.yandex.practicum.filmorate.controller;
+
+import lombok.RequiredArgsConstructor;
+import org.springframework.web.bind.annotation.GetMapping;
+import org.springframework.web.bind.annotation.PathVariable;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RestController;
+import ru.yandex.practicum.filmorate.model.Genre;
+import ru.yandex.practicum.filmorate.service.GenreService;
+
+import java.util.Collection;
+
+@RestController
+@RequestMapping("/genres")
+@RequiredArgsConstructor
+public class GenreController {
+    private final GenreService genreService;
+
+    @GetMapping
+    public Collection<Genre> list() {
+        return genreService.getList();
+    }
+
+    @GetMapping("/{id}")
+    public Genre getById(@PathVariable final Long id) {
+        return genreService.getById(id);
+    }
+}

src/main/java/ru/yandex/practicum/filmorate/controller/MpaController.java

@@ -0,0 +1,32 @@
+package ru.yandex.practicum.filmorate.controller;
+
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.GetMapping;
+import org.springframework.web.bind.annotation.PathVariable;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RestController;
+import ru.yandex.practicum.filmorate.model.Mpa;
+import ru.yandex.practicum.filmorate.service.MpaService;
+
+import java.util.Collection;
+
+@RestController
+@RequestMapping("/mpa")
+public class MpaController {
+    private final MpaService mpaService;
+
+    @Autowired
+    public MpaController(final MpaService mpaService) {
+        this.mpaService = mpaService;
+    }
+
+    @GetMapping
+    public Collection<Mpa> list() {
+        return mpaService.getList();
+    }
+
+    @GetMapping("/{id}")
+    public Mpa getById(@PathVariable final Long id) {
+        return mpaService.getById(id);
+    }
+}

src/main/java/ru/yandex/practicum/filmorate/controller/UserController.java

@@ -1,7 +1,15 @@
 package ru.yandex.practicum.filmorate.controller;
 
 import org.springframework.http.HttpStatus;
-import org.springframework.web.bind.annotation.*;
+import org.springframework.web.bind.annotation.DeleteMapping;
+import org.springframework.web.bind.annotation.GetMapping;
+import org.springframework.web.bind.annotation.PathVariable;
+import org.springframework.web.bind.annotation.PostMapping;
+import org.springframework.web.bind.annotation.PutMapping;
+import org.springframework.web.bind.annotation.RequestBody;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.ResponseStatus;
+import org.springframework.web.bind.annotation.RestController;
 import ru.yandex.practicum.filmorate.model.User;
 import ru.yandex.practicum.filmorate.service.UserService;
 

src/main/java/ru/yandex/practicum/filmorate/exception/InternalErrorException.java

@@ -0,0 +1,7 @@
+package ru.yandex.practicum.filmorate.exception;
+
+public class InternalErrorException extends RuntimeException {
+    public InternalErrorException(String message) {
+        super(message);
+    }
+}

src/main/java/ru/yandex/practicum/filmorate/model/Genre.java

@@ -1,9 +1,13 @@
 package ru.yandex.practicum.filmorate.model;
 
+import com.fasterxml.jackson.annotation.JsonInclude;
+import lombok.Builder;
 import lombok.Data;
 
 @Data
+@Builder
 public class Genre {
     private Long id;
-    private String title;
+    @JsonInclude(value = JsonInclude.Include.NON_NULL)
+    private String name;
 }

src/main/java/ru/yandex/practicum/filmorate/model/Mpa.java

@@ -1,9 +1,13 @@
 package ru.yandex.practicum.filmorate.model;
 
+import com.fasterxml.jackson.annotation.JsonInclude;
+import lombok.Builder;
 import lombok.Data;
 
 @Data
+@Builder
 public class Mpa {
     private Long id;
-    private String title;
+    @JsonInclude(value = JsonInclude.Include.NON_NULL)
+    private String name;
 }

src/main/java/ru/yandex/practicum/filmorate/model/User.java

@@ -15,6 +15,5 @@ public class User {
     private String login;
     private String name;
     private LocalDate birthday;
-    private String password;
     private final Set<Long> friends = new HashSet<>();
 }