diff --git a/.gitignore b/.gitignore
index 1901201..d7884b4 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,3 +1,5 @@
+.idea/
+target/
 # Default ignored files
 /shelf/
 /.idea/workspace.xml
diff --git a/pom.xml b/pom.xml
index 48b39fd..5391f43 100644
--- a/pom.xml
+++ b/pom.xml
@@ -29,6 +29,9 @@
     <properties>
         <java.version>17</java.version>
         <maven.checkstyle.plugin.configLocation>checkstyle.xml</maven.checkstyle.plugin.configLocation>
+        <lombok.version>1.18.30</lombok.version>
+        <lombok.mapstruct.binding.version>0.2.0</lombok.mapstruct.binding.version>
+        <mapstruct.version>1.5.5.Final</mapstruct.version>
     </properties>
     <dependencies>
         <dependency>
@@ -77,6 +80,25 @@
             <artifactId>h2</artifactId>
             <scope>test</scope>
         </dependency>
+        <dependency>
+            <groupId>org.springframework.boot</groupId>
+            <artifactId>spring-boot-starter-web</artifactId>
+        </dependency>
+
+        <dependency>
+            <groupId>org.mapstruct</groupId>
+            <artifactId>mapstruct</artifactId>
+            <version>${mapstruct.version}</version>
+        </dependency>
+
+        <dependency>
+            <groupId>org.projectlombok</groupId>
+            <artifactId>lombok-mapstruct-binding</artifactId>
+            <version>0.2.0</version>
+            <scope>provided</scope>
+        </dependency>
+
+
     </dependencies>
 
     <build>
@@ -85,12 +107,25 @@
                 <groupId>org.apache.maven.plugins</groupId>
                 <artifactId>maven-compiler-plugin</artifactId>
                 <configuration>
-                    <annotationProcessorPaths>
-                        <path>
-                            <groupId>org.projectlombok</groupId>
-                            <artifactId>lombok</artifactId>
-                        </path>
-                    </annotationProcessorPaths>
+                    <source>${java.version}</source>
+                    <target>${java.version}</target>
+                <annotationProcessorPaths>
+                    <path>
+                        <groupId>org.projectlombok</groupId>
+                        <artifactId>lombok</artifactId>
+                        <version>${lombok.version}</version>
+                    </path>
+                    <path>
+                        <groupId>org.projectlombok</groupId>
+                        <artifactId>lombok-mapstruct-binding</artifactId>
+                        <version>${lombok.mapstruct.binding.version}</version>
+                    </path>
+                    <path>
+                        <groupId>org.mapstruct</groupId>
+                        <artifactId>mapstruct-processor</artifactId>
+                        <version>${mapstruct.version}</version>
+                    </path>
+                </annotationProcessorPaths>
                 </configuration>
             </plugin>
             <plugin>
@@ -110,6 +145,7 @@
                     <consoleOutput>true</consoleOutput>
                     <failsOnError>true</failsOnError>
                     <linkXRef>false</linkXRef>
+                    <sourceDirectories>src/main</sourceDirectories>
                 </configuration>
             </plugin>
             <plugin>
diff --git a/spring-boot-intro (1).iml b/spring-boot-intro (1).iml
new file mode 100644
index 0000000..95df0ad
--- /dev/null
+++ b/spring-boot-intro (1).iml	
@@ -0,0 +1,18 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<module version="4">
+  <component name="AdditionalModuleElements">
+    <content url="file://$MODULE_DIR$" dumb="true">
+      <sourceFolder url="file://$MODULE_DIR$/src/test" isTestSource="true" />
+    </content>
+  </component>
+  <component name="FacetManager">
+    <facet type="jpa" name="JPA">
+      <configuration>
+        <setting name="validation-enabled" value="true" />
+        <setting name="provider-name" value="Hibernate" />
+        <datasource-mapping />
+        <naming-strategy-map />
+      </configuration>
+    </facet>
+  </component>
+</module>
\ No newline at end of file
diff --git a/src/main/java/boot/BootIntroApplication.java b/src/main/java/boot/BootIntroApplication.java
index 0739a11..9a51151 100644
--- a/src/main/java/boot/BootIntroApplication.java
+++ b/src/main/java/boot/BootIntroApplication.java
@@ -29,7 +29,6 @@ public CommandLineRunner init(BookService bookService) {
             book.setPrice(new BigDecimal("19.99"));
             book.setCoverImage("https://example.com/cover.jpg");
 
-            bookService.save(book);
             System.out.println(bookService.findAll());
         };
     }
diff --git a/src/main/java/boot/config/MapperConfig.java b/src/main/java/boot/config/MapperConfig.java
new file mode 100644
index 0000000..5fc527e
--- /dev/null
+++ b/src/main/java/boot/config/MapperConfig.java
@@ -0,0 +1,14 @@
+package boot.config;
+
+import org.mapstruct.InjectionStrategy;
+import org.mapstruct.NullValueCheckStrategy;
+
+@org.mapstruct.MapperConfig(
+        componentModel = "spring",
+        injectionStrategy = InjectionStrategy.CONSTRUCTOR,
+        nullValueCheckStrategy = NullValueCheckStrategy.ALWAYS,
+        implementationPackage = "<PACKAGE_NAME>.impl"
+)
+public class MapperConfig {
+
+}
diff --git a/src/main/java/boot/controller/BookController.java b/src/main/java/boot/controller/BookController.java
new file mode 100644
index 0000000..545b685
--- /dev/null
+++ b/src/main/java/boot/controller/BookController.java
@@ -0,0 +1,37 @@
+package boot.controller;
+
+import boot.dto.BookDto;
+import boot.dto.CreateBookRequestDto;
+import boot.service.BookService;
+import java.util.List;
+import lombok.RequiredArgsConstructor;
+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.RequestBody;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.ResponseBody;
+import org.springframework.web.bind.annotation.RestController;
+
+@RequiredArgsConstructor
+@RestController
+@RequestMapping("/books")
+public class BookController {
+    private final BookService bookService;
+
+    @GetMapping
+    public List<BookDto> getAll() {
+        return bookService.findAll();
+    }
+
+    @GetMapping("/{id}")
+    @ResponseBody
+    public BookDto getBookById(@PathVariable Long id) {
+        return bookService.findById(id);
+    }
+
+    @PostMapping
+    public BookDto createBook(@RequestBody CreateBookRequestDto bookDto) {
+        return bookService.save(bookDto);
+    }
+}
diff --git a/src/main/java/boot/dto/BookDto.java b/src/main/java/boot/dto/BookDto.java
new file mode 100644
index 0000000..1a40884
--- /dev/null
+++ b/src/main/java/boot/dto/BookDto.java
@@ -0,0 +1,13 @@
+package boot.dto;
+
+import lombok.Data;
+
+@Data
+public class BookDto {
+    private Long id;
+    private String title;
+    private String author;
+    private Double price;
+    private String description;
+    private String coverImage;
+}
diff --git a/src/main/java/boot/dto/CreateBookRequestDto.java b/src/main/java/boot/dto/CreateBookRequestDto.java
new file mode 100644
index 0000000..b149603
--- /dev/null
+++ b/src/main/java/boot/dto/CreateBookRequestDto.java
@@ -0,0 +1,14 @@
+package boot.dto;
+
+import lombok.Data;
+
+@Data
+public class CreateBookRequestDto {
+    private Long id;
+    private String title;
+    private String author;
+    private String isbn;
+    private Double price;
+    private String description;
+    private String coverImage;
+}
diff --git a/src/main/java/boot/exception/EntityNotFoundException.java b/src/main/java/boot/exception/EntityNotFoundException.java
new file mode 100644
index 0000000..5b9fcad
--- /dev/null
+++ b/src/main/java/boot/exception/EntityNotFoundException.java
@@ -0,0 +1,7 @@
+package boot.exception;
+
+public class EntityNotFoundException extends RuntimeException {
+    public EntityNotFoundException(String message) {
+        super(message);
+    }
+}
diff --git a/src/main/java/boot/mapper/BookMapper.java b/src/main/java/boot/mapper/BookMapper.java
new file mode 100644
index 0000000..ee8646b
--- /dev/null
+++ b/src/main/java/boot/mapper/BookMapper.java
@@ -0,0 +1,14 @@
+package boot.mapper;
+
+import boot.config.MapperConfig;
+import boot.dto.BookDto;
+import boot.dto.CreateBookRequestDto;
+import boot.model.Book;
+import org.mapstruct.Mapper;
+
+@Mapper(config = MapperConfig.class)
+public interface BookMapper {
+    BookDto toBookDto(Book book);
+
+    Book toBook(CreateBookRequestDto bookDto);
+}
diff --git a/src/main/java/boot/repository/BookRepository.java b/src/main/java/boot/repository/BookRepository.java
index d2d06b7..5395c1b 100644
--- a/src/main/java/boot/repository/BookRepository.java
+++ b/src/main/java/boot/repository/BookRepository.java
@@ -2,9 +2,12 @@
 
 import boot.model.Book;
 import java.util.List;
+import java.util.Optional;
 
 public interface BookRepository {
     Book save(Book book);
 
     List<Book> findAll();
+
+    Optional<Book> findById(Long id);
 }
diff --git a/src/main/java/boot/repository/BookRepositoryImpl.java b/src/main/java/boot/repository/BookRepositoryImpl.java
index 9eb40be..3ef4e27 100644
--- a/src/main/java/boot/repository/BookRepositoryImpl.java
+++ b/src/main/java/boot/repository/BookRepositoryImpl.java
@@ -3,6 +3,7 @@
 import boot.exception.DataProcessingException;
 import boot.model.Book;
 import java.util.List;
+import java.util.Optional;
 import org.hibernate.Session;
 import org.hibernate.SessionFactory;
 import org.hibernate.Transaction;
@@ -48,4 +49,13 @@ public List<Book> findAll() {
             throw new DataProcessingException("Could not find all books", e);
         }
     }
+
+    @Override
+    public Optional<Book> findById(Long id) {
+        try (Session session = sessionFactory.openSession()) {
+            return Optional.ofNullable(session.get(Book.class, id));
+        } catch (Exception e) {
+            throw new DataProcessingException("Could not find book with id: " + id, e);
+        }
+    }
 }
diff --git a/src/main/java/boot/service/BookService.java b/src/main/java/boot/service/BookService.java
index 79337af..954aed0 100644
--- a/src/main/java/boot/service/BookService.java
+++ b/src/main/java/boot/service/BookService.java
@@ -1,10 +1,13 @@
 package boot.service;
 
-import boot.model.Book;
+import boot.dto.BookDto;
+import boot.dto.CreateBookRequestDto;
 import java.util.List;
 
 public interface BookService {
-    Book save(Book book);
+    BookDto save(CreateBookRequestDto bookDto);
 
-    List<Book> findAll();
+    List<BookDto> findAll();
+
+    BookDto findById(Long id);
 }
diff --git a/src/main/java/boot/service/BookServiceImpl.java b/src/main/java/boot/service/BookServiceImpl.java
index d0c0f72..fd63317 100644
--- a/src/main/java/boot/service/BookServiceImpl.java
+++ b/src/main/java/boot/service/BookServiceImpl.java
@@ -1,25 +1,40 @@
 package boot.service;
 
+import boot.dto.BookDto;
+import boot.dto.CreateBookRequestDto;
+import boot.exception.EntityNotFoundException;
+import boot.mapper.BookMapper;
 import boot.model.Book;
 import boot.repository.BookRepository;
 import java.util.List;
 import lombok.RequiredArgsConstructor;
-import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 
 @Service
 @RequiredArgsConstructor
 public class BookServiceImpl implements BookService {
-    @Autowired
     private final BookRepository bookRepository;
 
+    private final BookMapper bookMapper;
+
+    @Override
+    public BookDto save(CreateBookRequestDto bookDto) {
+        Book book = bookMapper.toBook(bookDto);
+        return bookMapper.toBookDto(bookRepository.save(book));
+    }
+
     @Override
-    public Book save(Book book) {
-        return bookRepository.save(book);
+    public List<BookDto> findAll() {
+        return bookRepository.findAll().stream()
+                .map(bookMapper::toBookDto)
+                .toList();
     }
 
     @Override
-    public List<Book> findAll() {
-        return bookRepository.findAll();
+    public BookDto findById(Long id) {
+        Book book = bookRepository.findById(id).orElseThrow(() -> new EntityNotFoundException(
+                "Can't find Book with id:" + id)
+        );
+        return bookMapper.toBookDto(book);
     }
 }