Changeset 6791e89 for src/main/java/mk

Timestamp:

09/22/22 21:16:07 (2 years ago)

Author:

Leona <leona@…>

Branches:

master

Parents:

3692f0d

Message:

working on reservations part

Location:

src/main/java/mk/ukim/finki/db/library

Files:

• model/Book.java (modified) (1 diff)
• model/ReservationBook.java (modified) (1 diff)
• model/exception/MemberNotFoundException.java (added)
• repository/MemberRepository.java (modified) (1 diff)
• repository/UserRepository.java (modified) (2 diffs)
• service/ReservationBookService.java (modified) (1 diff)
• service/UserService.java (modified) (2 diffs)
• service/impl/ReservationBookServiceImpl.java (modified) (3 diffs)
• service/impl/UserServiceImpl.java (modified) (2 diffs)
• web/BookController.java (modified) (3 diffs)
• web/ReservationBookController.java (modified) (2 diffs)

src/main/java/mk/ukim/finki/db/library/model/Book.java

@@ -74 +74 @@
     private List<Writer> writers;
 
+    public Long getId() {
+        return id;
+    }
+
     public Library getLibrary() {
         return library;

src/main/java/mk/ukim/finki/db/library/model/ReservationBook.java

@@ -18 +18 @@
     }
 
-    public ReservationBook(Member member, Book book, Date takeDate, Date returnDate, boolean isReservedBook) {
-        this.member = member;
-        this.book = book;
+    public ReservationBook( Date takeDate, Date returnDate) { //Long id,
+        //(Long) this.book.getId() = id;
         this.takeDate = takeDate;
         this.returnDate = returnDate;
-        this.isReservedBook = isReservedBook;
     }
 

src/main/java/mk/ukim/finki/db/library/repository/MemberRepository.java

@@ -1 +1 @@
 package mk.ukim.finki.db.library.repository;
 
+import mk.ukim.finki.db.library.model.Book;
+import mk.ukim.finki.db.library.model.Member;
 import org.springframework.stereotype.Repository;
+
+import java.util.List;
 
 @Repository

src/main/java/mk/ukim/finki/db/library/repository/UserRepository.java

@@ -6 +6 @@
 import org.springframework.stereotype.Repository;
 
+import java.util.List;
 import java.util.Optional;
 
@@ -13 +14 @@
 
     Optional<Person> findByEmailAndPassword(String email, String password);
+
+    List<Person> findByEmail(String email);
 }

src/main/java/mk/ukim/finki/db/library/service/ReservationBookService.java

@@ -10 +10 @@
 public interface ReservationBookService {
 
-    ReservationBook findById(Long id);
+    //ReservationBook getActiveResBookUser(String username);
 
     List<ReservationBook> listAll();
 
-    ReservationBook reserveBook(Long memberId, Long bookId, Date takeDate, Date returnDate, boolean isReservedBook);
+    ReservationBook reserveBook(Long bookId, Date takeDate, Date returnDate);
 }

src/main/java/mk/ukim/finki/db/library/service/UserService.java

@@ -2 +2 @@
 
 import mk.ukim.finki.db.library.model.Person;
+
+import java.util.List;
 
 public interface UserService {
@@ -10 +12 @@
     Person login(String username, String password);
 
+    List<Person> findByEmail(String email);
+
 }

src/main/java/mk/ukim/finki/db/library/service/impl/ReservationBookServiceImpl.java

@@ -2 +2 @@
 
 import mk.ukim.finki.db.library.model.*;
-import mk.ukim.finki.db.library.model.exception.InvalidReservationBookIdException;
+import mk.ukim.finki.db.library.model.exception.MemberNotFoundException;
 import mk.ukim.finki.db.library.repository.BookRepository;
 import mk.ukim.finki.db.library.repository.MemberRepository;
 import mk.ukim.finki.db.library.repository.ReservationBookRepository;
+import mk.ukim.finki.db.library.repository.UserRepository;
 import mk.ukim.finki.db.library.service.ReservationBookService;
 import org.springframework.stereotype.Service;
@@ -16 +17 @@
 
     private final ReservationBookRepository reservationBookRepository;
-    private final MemberRepository memberRepository;
+    private final UserRepository userRepository;
     private final BookRepository bookRepository;
 
     public ReservationBookServiceImpl(ReservationBookRepository reservationBookRepository, MemberRepository memberRepository, BookRepository bookRepository) {
         this.reservationBookRepository = reservationBookRepository;
-        this.memberRepository = memberRepository;
+        this.userRepository = memberRepository;
         this.bookRepository = bookRepository;
-    }
-
-
-    @Override
-    public ReservationBook findById(Long id) {
-        return this.reservationBookRepository.findById(id).orElseThrow(InvalidReservationBookIdException::new);
     }
 
@@ -37 +32 @@
 
     @Override
-    public ReservationBook reserveBook(Long memberId, Long bookId, Date takeDate, Date returnDate, boolean isReservedBook) {
-        Person member = memberId!=null ? this.memberRepository.findById(memberId).orElse((Member) null) : null;
-        Book book = bookId!=null ? this.bookRepository.findById(bookId).orElse((Book) null) : null;
+    public ReservationBook reserveBook(Long bookId, Date takeDate, Date returnDate) {
 
-        ReservationBook reservationBook = new ReservationBook((Member) member, book, takeDate, returnDate, isReservedBook);
-        //TODO: treba da se zemat site izdanija od knigata, da se proveri dali ima slobodna i ako ima, od vkupnoto da se namali za edno
+
+        ReservationBook reservationBook = new ReservationBook(takeDate, returnDate); //bookId,
 
         return this.reservationBookRepository.save(reservationBook);
     }
+
+
+
+//    @Override
+//    public ReservationBook reserveBook(Long memberId, Long bookId, Date takeDate, Date returnDate, boolean isReservedBook) {
+//        Person member = memberId!=null ? this.userRepository.findById(memberId).orElse((Member) null) : null;
+//        Book book = bookId!=null ? this.bookRepository.findById(bookId).orElse((Book) null) : null;
+//
+//        ReservationBook reservationBook = new ReservationBook((Member) member, book, takeDate, returnDate, isReservedBook);
+//        //TODO: treba da se zemat site izdanija od knigata, da se proveri dali ima slobodna i ako ima, od vkupnoto da se namali za edno
+//
+//        return this.reservationBookRepository.save(reservationBook);
+//    }
+
 }

src/main/java/mk/ukim/finki/db/library/service/impl/UserServiceImpl.java

@@ -8 +8 @@
 import mk.ukim.finki.db.library.service.UserService;
 import org.springframework.stereotype.Service;
+
+import java.util.List;
 
 
@@ -35 +37 @@
         return userRepository.findByEmailAndPassword(email, password).orElseThrow(InvalidUserCredentialsException::new);
     }
+
+    @Override
+    public List<Person> findByEmail(String email) {
+        return this.userRepository.findByEmail(email);
+    }
 }

src/main/java/mk/ukim/finki/db/library/web/BookController.java

@@ -40 +40 @@
 
         List<Book> books;
-        //List<Writer> writers;
+//        List<Writer> writers;
         //List<Genre> genres;
         //List<Library> libraries;
@@ -46 +46 @@
         if(bookName == null){
             books = this.bookService.listAllBooks();
-           // writers = this.writerService.listAll();
+//            writers = this.writerService.listAll();
            // genres = this.genreService.listAll();
 
@@ -62 +62 @@
         return "book.html";
     }
+
+
+
+
 }

src/main/java/mk/ukim/finki/db/library/web/ReservationBookController.java

@@ -1 +1 @@
 package mk.ukim.finki.db.library.web;
 
+import mk.ukim.finki.db.library.model.exception.InvalidArgumentsException;
+import mk.ukim.finki.db.library.model.exception.PasswordsDoNotMatchException;
+import mk.ukim.finki.db.library.service.ReservationBookService;
 import org.springframework.stereotype.Controller;
-import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.ui.Model;
+import org.springframework.web.bind.annotation.*;
+
+import java.util.Date;
 
 @Controller
@@ -8 +14 @@
 public class ReservationBookController {
 
+    private final ReservationBookService reservationBookService;
+
+    public ReservationBookController(ReservationBookService reservationBookService) {
+        this.reservationBookService = reservationBookService;
+    }
+
+    @GetMapping("/resBook")
+    public String showRes(){
+        return "resBook";
+    }
+
+    @GetMapping
+    public String getReservationBook(@RequestParam(required = false) String error, Model model) {
+        if(error != null && !error.isEmpty()) {
+            model.addAttribute("hasError", true);
+            model.addAttribute("error", error);
+        }
+        //ReservationBook reservationBook = this.reservationBookService.getCurrentUserId(id);
+        model.addAttribute("books", this.reservationBookService.listAll());
+        return "resBook";
+    }
+
+    @PostMapping("/reserve/{id}")
+    public String reserve(@PathVariable Long id,
+                            @RequestParam Date takeDate,
+                           @RequestParam Date returnDate
+    ) {
+        try{
+            this.reservationBookService.reserveBook(id, takeDate, returnDate);
+            return "redirect:/book";
+        } catch (InvalidArgumentsException | PasswordsDoNotMatchException exception) {
+            return "redirect:/resBook?error=" + exception.getMessage();
+        }
+    }
 
 }