Changeset 3692f0d for src/main/java/mk

Timestamp:

09/22/22 18:11:04 (2 years ago)

Author:

Leona <leona@…>

Branches:

master

Children:

6791e89

Parents:

e5de1b0

Message:

books & rooms showing

Location:

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

Files:

• config/DataInitializer.java (modified) (4 diffs)
• model/Library.java (modified) (1 diff)
• model/Room.java (modified) (1 diff)
• repository/BookRepository.java (modified) (1 diff)
• repository/RoomRepository.java (modified) (1 diff)
• service/BookService.java (modified) (1 diff)
• service/RoomService.java (modified) (1 diff)
• service/impl/BookServiceImpl.java (modified) (2 diffs)
• service/impl/RoomServiceImpl.java (modified) (2 diffs)
• web/BookController.java (modified) (2 diffs)
• web/LoginController.java (modified) (1 diff)
• web/ReservationBookController.java (modified) (1 diff)
• web/RoomController.java (added)

src/main/java/mk/ukim/finki/db/library/config/DataInitializer.java

@@ -6 +6 @@
 
 import javax.annotation.PostConstruct;
+import java.util.Collections;
 import java.util.List;
 
@@ -36 +37 @@
     public void initData(){
         Person member = this.userService.register("MemberName", "MemberSurname",
-                "MemberAddres", "MemberTown", "071/111/222", "memberemail@hotmail.com", "baza123!");
+                "MemberAddress", "MemberTown", "071/111/222", "memberemail@hotmail.com", "baza123!");
 
         //LIBRARIES
         Library library = this.libraryService.create(1L,"Grigor Prlicev", "Ohrid");
-        this.libraryService.create(2L, "Braka Miladinovci", "Struga");
-        this.libraryService.create(3L, "Braka Miladinovci", "Skopje");
+//        this.libraryService.create(2L, "Braka Miladinovci", "Struga");
+//        this.libraryService.create(3L, "Braka Miladinovci", "Skopje");
 
         //GENRES
@@ -63 +64 @@
         this.bookService.create(1113L, "No time for goodbye",0, false, 30, 50);
 
-        if("thriller".equals(genreService.findById(1L).toString()) && "Inferno".equals(bookService.findById(1L).getBookName())){
-            Genre genre1 = genreService.findById(1L);
-            Writer writer1 = writerService.findById(1L);
-            this.bookService.update(1111L, "Inferno",3, true, 30, 50, List.of(genre1.getId()), List.of(writer1.getId()), 1L);
-        }
+//        this.bookService.createB(1114L,"Seat 7A", 5, true, 30, 50, Collections.singletonList(((Long) bookService.findById(2L).getGenre().getId())),
+//                List.of(3L), 1L);
 
         //SCHOOLTYPES
@@ -84 +82 @@
         this.priceListService.create(3L, 300); //yearly - other
         this.priceListService.create(5L, 150); //yearly - primary school
-        this.priceListService.create(6L, 250); //yearly - high school
+        this.priceListService.create(6L, 300); //yearly - high school
 
         //ROOMS

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

@@ -33 +33 @@
     private List<Book> books;
 
+    public String getLibraryName() {
+        return libraryName;
+    }
+
     public void addBook(Book book) {
         this.books.add(book);

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

@@ -55 +55 @@
         this.freePlaces = freePlaces;
     }
+
+    public String getName() {
+        return name;
+    }
 }

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

@@ -5 +5 @@
 import org.springframework.stereotype.Repository;
 
+import java.util.List;
+
 @Repository
 public interface BookRepository extends JpaRepository<Book, Long> {
 
-    //TODO: listBooksByName, listBooksByNameAndGenre, listBooksByNameAndGenreAndWriter, listBooksByNameAndWriter
+    //TODO: listBooksByNameAndGenre, listBooksByNameAndGenreAndWriter, listBooksByNameAndWriter
     //TODO: listBooksByGenre, listBooksByWriter
+
+    List<Book> findByBookName(String bookName);
 }

src/main/java/mk/ukim/finki/db/library/repository/RoomRepository.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.Room;
 import org.springframework.data.jpa.repository.JpaRepository;
 import org.springframework.stereotype.Repository;
 
+import java.util.List;
+
 @Repository
 public interface RoomRepository extends JpaRepository<Room, Long> {
+
+    List<Room> findByName(String name);
 }

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

@@ -20 +20 @@
     Book createB(Long id, String bookName, int bookNumber, boolean isFree, int bookPrice, int bookPriceLate, List<Long> genreIds, List<Long> writerIds, Long libraryId); //, List<Long> genreIds, List<Long> writerIds
 
+    List<Book> findByBookName(String bookName);
 }

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

@@ -12 +12 @@
 
     Room create(Long id, String name, int places, int freePlaces);
+
+    List<Room> findByName(String name);
 }

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

@@ -2 +2 @@
 
 import mk.ukim.finki.db.library.model.*;
+import mk.ukim.finki.db.library.model.exception.InvalidArgumentsException;
 import mk.ukim.finki.db.library.model.exception.InvalidBookIdException;
 import mk.ukim.finki.db.library.model.exception.LibraryNotFoundException;
@@ -94 +95 @@
     }
 
+    @Override
+    public List<Book> findByBookName(String bookName) {
+        if(bookName == null || bookName.isEmpty()){
+            throw new InvalidArgumentsException();
+        }
+
+        return this.bookRepository.findByBookName(bookName);
+    }
+
     //in bookRepository
-    //TODO: listBooksByName, listBooksByNameAndGenre, listBooksByNameAndGenreAndWriter, listBooksByNameAndWriter
+    //TODO: listBooksByNameAndGenre, listBooksByNameAndGenreAndWriter, listBooksByNameAndWriter
     //TODO: listBooksByGenre, listBooksByWriter
 }

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

@@ -1 +1 @@
 package mk.ukim.finki.db.library.service.impl;
 
+import mk.ukim.finki.db.library.model.Book;
 import mk.ukim.finki.db.library.model.Room;
+import mk.ukim.finki.db.library.model.exception.InvalidArgumentsException;
 import mk.ukim.finki.db.library.model.exception.InvalidRoomIdException;
 import mk.ukim.finki.db.library.repository.RoomRepository;
@@ -33 +35 @@
         return this.roomRepository.save(room);
     }
+
+    @Override
+    public List<Room> findByName(String name) {
+        if(name == null || name.isEmpty()){
+            throw new InvalidArgumentsException();
+        }
+
+        return this.roomRepository.findByName(name);
+    }
 }

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

@@ -1 +1 @@
 package mk.ukim.finki.db.library.web;
 
+import mk.ukim.finki.db.library.model.Book;
+import mk.ukim.finki.db.library.model.Genre;
+import mk.ukim.finki.db.library.model.Library;
+import mk.ukim.finki.db.library.model.Writer;
 import mk.ukim.finki.db.library.service.BookService;
+import mk.ukim.finki.db.library.service.GenreService;
+import mk.ukim.finki.db.library.service.LibraryService;
+import mk.ukim.finki.db.library.service.WriterService;
 import org.springframework.stereotype.Controller;
+import org.springframework.ui.Model;
+import org.springframework.web.bind.annotation.GetMapping;
 import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RequestParam;
+
+import java.util.List;
 
 @Controller
@@ -10 +22 @@
 
     private final BookService bookService;
+    private final WriterService writerService;
+    private final GenreService genreService;
+    private final LibraryService libraryService;
 
-    public BookController(BookService bookService) {
+    public BookController(BookService bookService, WriterService writerService, GenreService genreService, LibraryService libraryService) {
         this.bookService = bookService;
+        this.writerService = writerService;
+        this.genreService = genreService;
+        this.libraryService = libraryService;
     }
 
+    //List<Long> genreIds, List<Long> writerIds, Long libraryId
+    //will show all books that are available in a library
+    @GetMapping
+    public String showBooks(@RequestParam(required = false) String bookName,
+                            Model model){
 
+        List<Book> books;
+        //List<Writer> writers;
+        //List<Genre> genres;
+        //List<Library> libraries;
 
+        if(bookName == null){
+            books = this.bookService.listAllBooks();
+           // writers = this.writerService.listAll();
+           // genres = this.genreService.listAll();
+
+        } else {
+            books = this.bookService.findByBookName(bookName);
+//            writers = this.writerService.listAll();
+//            genres = this.genreService.listAll();
+        }
+
+        model.addAttribute("books", books);
+//        model.addAttribute("writers", writers);
+//        model.addAttribute("genres", genres);
+        //model.addAttribute("libraries", libraries);
+
+        return "book.html";
+    }
 }

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

@@ -35 +35 @@
                     request.getParameter("password"));
             request.getSession().setAttribute("username", member);
-            return "redirect:/books";
+            return "redirect:/book";
         }
         catch (InvalidUserCredentialsException exception) {

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

@@ -5 +5 @@
 
 @Controller
-@RequestMapping("/reservationBook")
+@RequestMapping("/resBook")
 public class ReservationBookController {
+
+
 }