Refactored templates, controllers, and styles for improved book manag…

pom.xml

@@ -63,11 +63,7 @@
             <groupId>org.springframework.boot</groupId>
             <artifactId>spring-boot-starter-thymeleaf</artifactId>
         </dependency>
-        <!--        <dependency>-->
-<!--            <groupId>gg.jte</groupId>-->
-<!--            <artifactId>jte-spring-boot-starter-4</artifactId>-->
-<!--            <version>3.2.3</version>-->
-<!--        </dependency>-->
+
         <!--        <dependency>-->
 <!--            <groupId>org.springframework.boot</groupId>-->
 <!--            <artifactId>spring-boot-docker-compose</artifactId>-->

src/main/java/org/example/lab1springboot/BookNotFoundException.java

@@ -0,0 +1,7 @@
+package org.example.lab1springboot;
+
+public class BookNotFoundException extends RuntimeException {
+    public BookNotFoundException(String message) {
+        super(message);
+    }
+}

src/main/java/org/example/lab1springboot/GlobalExceptionHandler.java

@@ -0,0 +1,56 @@
+package org.example.lab1springboot;
+
+import org.springframework.http.HttpStatus;
+import org.springframework.ui.Model;
+import org.springframework.validation.FieldError;
+import org.springframework.web.bind.MethodArgumentNotValidException;
+import org.springframework.web.bind.annotation.ControllerAdvice;
+import org.springframework.web.bind.annotation.ExceptionHandler;
+import org.springframework.web.bind.annotation.ResponseStatus;
+import org.springframework.web.servlet.View;
+
+import java.util.HashMap;
+import java.util.Map;
+
+import static org.springframework.util.ReflectionUtils.getField;
+
+/*
+Global exception handler to handle all exceptions more effectively
+
+ */
+@ControllerAdvice
+public class GlobalExceptionHandler {
+
+
+
+    @ExceptionHandler(BookNotFoundException.class)
+    @ResponseStatus(HttpStatus.NOT_FOUND) // 404
+    public String notFoundException(BookNotFoundException ex, Model model) {
+
+        model.addAttribute("errorMessage", ex.getMessage());
+
+        return "error";
+    }
+
+    @ExceptionHandler(RuntimeException.class)
+    @ResponseStatus(HttpStatus.INTERNAL_SERVER_ERROR) // 500
+    public String handleRuntimeException(Exception ex, Model model) {
+
+        model.addAttribute("errorMessage", "Unexpected error");
+        return "error";
+    }
+
+    @ExceptionHandler(MethodArgumentNotValidException.class)
+    @ResponseStatus(HttpStatus.BAD_REQUEST)
+    public String handleMethodArgumentNotValidException(MethodArgumentNotValidException ex, Model model) {
+        Map<String, String> errors = new HashMap<>();
+
+        ex.getBindingResult().getFieldErrors().forEach(error ->
+                errors.put(error.getField(), error.getDefaultMessage())
+        );
+
+        model.addAttribute("errors", errors);
+        return "error";
+    }
+
+}

src/main/java/org/example/lab1springboot/book/BookService.java

@@ -1,55 +1,74 @@
 package org.example.lab1springboot.book;
 
 
+import org.springframework.data.domain.Page;
+import org.springframework.data.domain.PageRequest;
+import org.springframework.data.domain.Pageable;
+import org.springframework.transaction.annotation.Transactional;
+
+import lombok.extern.slf4j.Slf4j;
+import org.example.lab1springboot.BookNotFoundException;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 import org.springframework.stereotype.Service;
 
 import java.util.List;
 
-
+@Slf4j
 @Service
+
 public class BookService {
 
-    private static final Logger log = LoggerFactory.getLogger(BookService.class);
     private final BookRepository bookRepository;
 
     public BookService(BookRepository bookRepository) {
         log.info("BookService created");
         this.bookRepository = bookRepository;
     }
 
+    @Transactional(readOnly = true)
     public List<Book> getAllBooks() {
 
         return bookRepository.findAll();
     }
 
+    @Transactional
     public void deleteBook(Long id) {
-        if (!bookRepository.existsById(id)) {
-            throw new RuntimeException("Book not found with id: " + id);
-        }
+        if(bookRepository.findById(id).isEmpty())
+            throw new BookNotFoundException("Book not found with id: " + id);
+
         bookRepository.deleteById(id);
     }
 
+    @Transactional
     public Book getBookById(Long id) {
         return bookRepository.findById(id)
-                .orElseThrow(() -> new RuntimeException("Book not found with id: " + id));
+                .orElseThrow(() -> new BookNotFoundException("Book not found with id: " + id));
     }
+
+    @Transactional
     public Book updateBook(Long id, UpdateBookDTO dto) {
         Book book = getBookById(id);
         book.setTitle(dto.getTitle());
         book.setAuthor(dto.getName());
 
-        bookRepository.save(book);
+        Book updatedBook = bookRepository.save(book);
+
         log.info("Book updated successfully");
-        return book;
+        return updatedBook;
     }
 
+    @Transactional
     public Book createBook(CreateBookDTO dto) {
 
         Book book = BookMapper.toEntity(dto);
 
         return bookRepository.save(book);
     }
 
+    public Page<Book> getAllBooksPaginated(int page, int size){
+        Pageable pageable = PageRequest.of(page, size);
+        return bookRepository.findAll(pageable);
+    }
+
 }

src/main/java/org/example/lab1springboot/book/CreateBookDTO.java

@@ -5,17 +5,24 @@
 import jakarta.validation.constraints.Min;
 import jakarta.validation.constraints.NotBlank;
 import jakarta.validation.constraints.NotNull;
+import lombok.Data;
 import lombok.Getter;
 
 import lombok.Setter;
 
 @Getter
 @Setter
+@Data
 public class CreateBookDTO {
 
     @NotBlank(message = "name cannot be empty")
     private String name;
 
+    @NotBlank(message = "title cannot be empty")
+    private String title;
+    @NotBlank(message = "author cannot be empty")
+    private String author;
+
 
     @NotBlank(message = "Description cannot be empty")
     private String description;

src/main/java/org/example/lab1springboot/controller/BookController.java

@@ -2,16 +2,29 @@
 
 
 import jakarta.validation.Valid;
+import lombok.extern.slf4j.Slf4j;
+import org.example.lab1springboot.BookNotFoundException;
 import org.example.lab1springboot.book.*;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+
+import org.springframework.data.domain.Page;
+import org.springframework.http.HttpStatus;
 import org.springframework.stereotype.Controller;
 import org.springframework.ui.Model;
 import org.springframework.validation.BindingResult;
 import org.springframework.web.bind.annotation.*;
 
+
+
+
+
 @Controller
-@RequestMapping("/books")
+
 public class BookController {
 
+    Logger log = LoggerFactory.getLogger(BookController.class);
+
 
     BookService bookService;
 
@@ -22,26 +35,20 @@ public class BookController {
 
 
 
-    @GetMapping("/{id}")
-    public String getBookById(@PathVariable Long id, Model model) {
-        Book book = bookService.getBookById(id);
-        model.addAttribute("book", book);
-        return "books";
-    }
-
-    @GetMapping
-    public String getAllBooks(Model model) {
-        model.addAttribute("books", bookService.getAllBooks());
-        return "books";
-    }
-
+//    @GetMapping("/{id}")
+//    public String getBookById(@PathVariable Long id, Model model) {
+//        Book book = bookService.getBookById(id);
+//
+//        model.addAttribute("book", book);
+//        return "books";
+//    }
 
 
     @PostMapping("books/create")
     public String createBook(@Valid CreateBookDTO dto, BindingResult result) {
 
         if(result.hasErrors()){
-            return "createbook";
+            return "create-book";
         }
         bookService.createBook(dto);
         return "redirect:/books";
@@ -50,8 +57,7 @@ public String createBook(@Valid CreateBookDTO dto, BindingResult result) {
     @PutMapping("/{id}")
     public String updateBook(@PathVariable Long id, @Valid UpdateBookDTO updateBookDTO, BindingResult bindingResult, Model model) {
         if (bindingResult.hasErrors()) {
-            model.addAttribute("updateBookDTO", updateBookDTO);
-            return "updatebook";
+            return "update-book";
         }
 
         bookService.updateBook(id, updateBookDTO);
@@ -61,10 +67,51 @@ public String updateBook(@PathVariable Long id, @Valid UpdateBookDTO updateBookD
 
     @DeleteMapping("/{id}")
     public String deleteBook(@PathVariable Long id) {
+
         bookService.deleteBook(id);
         return "redirect:/books";
     }
 
+    @GetMapping("/update/{id}")
+    public String showUpdateForm(@PathVariable Long id, Model model) {
+        Book book = bookService.getBookById(id);
+
+        UpdateBookDTO dto = new UpdateBookDTO();
+
+
+        model.addAttribute("updateBookDTO", dto);
+        model.addAttribute("id", id);
+        return "update-book";
+    }
+
+    @GetMapping("books/create")
+    public String showCreateForm(Model model) {
+
+        model.addAttribute("book", new CreateBookDTO());
+        return "create-book";
+    }
+
+    @ExceptionHandler(BookNotFoundException.class)
+    @ResponseStatus(HttpStatus.NOT_FOUND)
+    public String handleBookNotFound(BookNotFoundException ex, Model model) {
+        model.addAttribute("errorMessage", ex.getMessage());
+        return "error";
+    }
+
+    @GetMapping("/books")
+    public String getAllBooks(
+            @RequestParam(defaultValue = "0") int page,
+            @RequestParam(defaultValue = "5") int size,
+            Model model) {
+
+        Page<Book> bookPage = bookService.getAllBooksPaginated(page, size);
+
+        model.addAttribute("books", bookPage.getContent());
+        model.addAttribute("currentPage", page);
+        model.addAttribute("totalPages", bookPage.getTotalPages());
+
+        return "books";
+    }
 
 
 

src/main/java/org/example/lab1springboot/controller/HomeController.java

@@ -11,11 +11,8 @@ public class HomeController {
     @GetMapping("/")
     public String home(Model model) {
 
-        System.out.println("DEBUG: Home controller triggered");
-
-        model.addAttribute("message", "Welcome to Thymeleaf!");
-        model.addAttribute("currentDate", java.time.LocalDate.now());
-
+        model.addAttribute("activePage", "home");
         return "home";
     }
+
 }

src/main/java/org/example/lab1springboot/controller/UserController.java

@@ -0,0 +1,19 @@
+package org.example.lab1springboot.controller;
+
+import jakarta.validation.Valid;
+import org.example.lab1springboot.user.User;
+import org.springframework.stereotype.Controller;
+import org.springframework.web.bind.annotation.PostMapping;
+import org.springframework.web.bind.annotation.RequestBody;
+
+@Controller
+public class UserController {
+
+    @PostMapping("/user")
+    public String CreateUser(@RequestBody @Valid User user) {
+
+        return "user";
+
+
+    }
+}

src/main/java/org/example/lab1springboot/user/User.java

@@ -0,0 +1,31 @@
+package org.example.lab1springboot.user;
+
+import jakarta.validation.constraints.NotBlank;
+import jakarta.validation.constraints.NotEmpty;
+import jakarta.validation.constraints.NotNull;
+import lombok.Getter;
+import lombok.Setter;
+
+@Getter
+@Setter
+public class User {
+
+    @NotNull(message = "Name cannot be empty")
+    private String name;
+
+    @NotEmpty
+    @NotNull(message = "Username cannot be empty")
+    private String username;
+
+    @NotNull(message = "Email cannot be empty")
+    private String email;
+
+    @NotBlank(message = "Password cannot be blank")
+    private String password;
+
+    @NotNull(message = "Id cannot be empty")
+    private String id;
+
+
+
+}