Revert "Suzune (#147)" (#148)

chuminhhieu779 · web-flow · commit f811755eb2d0 · 2025-11-14T03:53:23.000+07:00
This reverts commit 90fb4c9.
diff --git a/src/java/com/library/controller/admin/ApproveRequestController.java b/src/java/com/library/controller/admin/ApproveRequestController.java
diff --git a/src/java/com/library/controller/admin/ConfirmExtendController.java b/src/java/com/library/controller/admin/ConfirmExtendController.java
@@ -2,7 +2,7 @@
  * Click nbfs://nbhost/SystemFileSystem/Templates/Licenses/license-default.txt to change this license
  * Click nbfs://nbhost/SystemFileSystem/Templates/JSP_Servlet/Servlet.java to edit this template
  */
-package com.library.controller.user;
+package com.library.controller.admin;
 
 import com.library.enums.RequestStatus;
 import com.library.factory.ServiceFactory;
@@ -30,7 +30,7 @@
  * @author hieuchu
  */
 @WebServlet(name = "ConfirmExtendController", urlPatterns = {"/user/request-extend-book"})
-public class RequestExtendController extends HttpServlet {
+public class ConfirmExtendController extends HttpServlet {
 
     private final ExtendBookService extendSerivce = ServiceFactory.getExtendBookService();
     private final BorrowingService borrowService = ServiceFactory.getBorrowService();
@@ -63,10 +63,12 @@ protected void doPost(HttpServletRequest request, HttpServletResponse response)
         ExtendRequestDTO e = new ExtendRequestDTO();
         e.setBorrowing(borrow);
         e.setUser(u);
-        extendSerivce.insertData(e);
-        session.removeAttribute("bookExtend");
-        session.removeAttribute("targetBookID");
-        response.sendRedirect(request.getContextPath() + "/user/dashboard");
+        if (extendSerivce.limitExtend(dto.getBookID(), account) > 4) {
+            extendSerivce.insertData(e);
+            session.removeAttribute("bookExtend");
+            session.removeAttribute("targetBookID");
+            response.sendRedirect(request.getContextPath() + "/user/dashboard");
+        }
 
     }
 
diff --git a/src/java/com/library/controller/admin/ExtendRequestManagerController.java b/src/java/com/library/controller/admin/ExtendRequestManagerController.java
@@ -14,7 +14,6 @@
 import jakarta.servlet.http.HttpServlet;
 import jakarta.servlet.http.HttpServletRequest;
 import jakarta.servlet.http.HttpServletResponse;
-import jakarta.servlet.http.HttpSession;
 import java.util.List;
 
 /**
@@ -30,10 +29,8 @@ public class ExtendRequestManagerController extends HttpServlet {
     protected void doGet(HttpServletRequest request, HttpServletResponse response)
             throws ServletException, IOException {
         
-        HttpSession session = request.getSession();
         List<ExtendRequestViewDTO> list = extendSerivce.getAllExtendRequests();
         request.setAttribute("list", list);
-        session.setAttribute("extendDTO", list);
         request.getRequestDispatcher("/WEB-INF/views/admin/extend_request_manager.jsp").forward(request, response);
     }    
     
diff --git a/src/java/com/library/controller/admin/RejectRequestController.java b/src/java/com/library/controller/admin/RejectRequestController.java
diff --git a/src/java/com/library/controller/borrowing/BorrowedBooksListController.java b/src/java/com/library/controller/borrowing/BorrowedBooksListController.java
@@ -30,13 +30,12 @@ public class BorrowedBooksListController extends HttpServlet {
     @Override
     protected void doGet(HttpServletRequest request, HttpServletResponse response)
             throws ServletException, IOException {
-        HttpSession session = request.getSession(false);
-        session.removeAttribute("targetBookID");
-
+        HttpSession session = request.getSession(false);        
+        
         String account = (String) session.getAttribute("account");
-            
+        
         List<BorrowedBookDTO> borrowedBooks = borrowDao.borrowedBooksList(account);
-
+        
         request.setAttribute("borrowedBooks", borrowedBooks);
         request.getRequestDispatcher("/WEB-INF/views/borrowing/borrowedbooks.jsp").forward(request, response);
     }
diff --git a/src/java/com/library/controller/filter/AutholizationURLController.java b/src/java/com/library/controller/filter/AutholizationURLController.java
@@ -53,9 +53,7 @@ public static final String[] pageForAdmin() {
         "/admin/user/delete",
         "/admin/user/logout",
         "/admin/users/logout-all",
-        "/admin/extend-request-manger",
-        "/admin/approve-request",
-        "/admin/reject-request"
+        "/admin/extend-request-manger"
     };
        return tmp ;
     }
diff --git a/src/java/com/library/dao/BookDao.java b/src/java/com/library/dao/BookDao.java
@@ -46,5 +46,4 @@ public interface BookDao {
     int insertBook(Book b); 
     Map<String, Integer> countingBorrowedBookByCategory();
     
-    int getBookID(String title);
 }
diff --git a/src/java/com/library/dao/BookDaoImpl.java b/src/java/com/library/dao/BookDaoImpl.java
@@ -32,7 +32,7 @@ public class BookDaoImpl implements BookDao {
     private static final Logger logger = LoggerFactory.getLogger(BookDaoImpl.class);
 
     @Override
-    public List<Book> getAllBook() {
+    public List<Book> getAllBook(){
         List<Book> list = new ArrayList<>();
         String sql = " SELECT b.book_id, b.title ,b.slug,  b.author, b.quantity, c.category_id AS category_ID , c.name as category_name , b.cover_image FROM books b LEFT JOIN categories c ON b.category_id = c.category_id ";
         logger.debug("Executing SQL : ", sql);
@@ -47,7 +47,7 @@ public List<Book> getAllBook() {
                 b.setCoverImage(rs.getString("cover_image"));
 
                 Category category = new Category();
-                category.setCategoryID(rs.getInt("category_ID"));
+                category.setCategoryID(rs.getInt("category_ID"));             
                 category.setType(BookType.convert(rs.getString("category_name")));
                 b.setCategory(category);
                 list.add(b);
@@ -326,7 +326,9 @@ public Map<String, Integer> countingBorrowedBookByCategory() {
                 + "join categories on categories.category_id = books.category_id\n"
                 + "group by categories.name";
 
-        try (Connection conn = DBConnection.getInstance().getConnection(); PreparedStatement ps = conn.prepareStatement(sql); ResultSet rs = ps.executeQuery()) {
+        try (Connection conn = DBConnection.getInstance().getConnection(); 
+            PreparedStatement ps = conn.prepareStatement(sql); 
+             ResultSet rs = ps.executeQuery()) {
             while (rs.next()) {
                 map.put(rs.getString("name"), rs.getInt("totalBorrowed"));
             }
@@ -336,22 +338,4 @@ public Map<String, Integer> countingBorrowedBookByCategory() {
         return map;
     }
 
-    @Override
-    public int getBookID(String coverImage) {
-        String sql = "select book_id from books\n"
-                + "where cover_image = ? ";
-        try (
-                Connection conn = DBConnection.getInstance().getConnection();
-                PreparedStatement ps = conn.prepareStatement(sql)){                    
-               ps.setString(1, coverImage);
-                 ResultSet rs = ps.executeQuery() ;
-            while (rs.next()) {
-                return rs.getInt("book_id");
-            }
-        } catch (SQLException e) {
-            e.printStackTrace();
-        }
-        return -1;
-    }
-
 }
diff --git a/src/java/com/library/dao/BorrowingDaoImpl.java b/src/java/com/library/dao/BorrowingDaoImpl.java
@@ -72,7 +72,7 @@ public int totalReturnedBooks(String account) {
     @Override
     public List<BorrowedBookDTO> borrowedBooksList(String account) {
         List<BorrowedBookDTO> list = new ArrayList<>();
-        String sql = "SELECT bk.cover_image, b.borrow_date, b.due_date, bk.slug , bk.book_id , bk.title , b.extend_count "
+        String sql = "SELECT bk.cover_image, b.borrow_date, b.due_date, bk.slug , bk.book_id , bk.title "
                 + "FROM borrowings b "
                 + "JOIN users u ON u.user_id = b.user_id "
                 + "JOIN books bk ON bk.book_id = b.book_id "
@@ -89,7 +89,6 @@ public List<BorrowedBookDTO> borrowedBooksList(String account) {
                 dto.setDueDate(rs.getDate("due_date").toLocalDate());
                 dto.setCoverImage(rs.getString("cover_image"));
                 dto.setName(rs.getString("title"));
-                dto.setExtendTime(rs.getInt("extend_count"));
                 list.add(dto);
             }
         } catch (SQLException s) {
diff --git a/src/java/com/library/dao/ExtendRequestDao.java b/src/java/com/library/dao/ExtendRequestDao.java
@@ -16,6 +16,4 @@
 public interface ExtendRequestDao {
     boolean insertExtendRequest(ExtendRequestDTO request) ;
     List<ExtendRequestViewDTO> getAllExtendRequests();
-     boolean hasUserSentRequest(int borrowingID , int userID );
-     void updateStatus(int userID, String status);     
 }
diff --git a/src/java/com/library/dao/ExtendRequestDaoImpl.java b/src/java/com/library/dao/ExtendRequestDaoImpl.java
@@ -44,8 +44,7 @@ public List<ExtendRequestViewDTO> getAllExtendRequests() {
                 + "            FROM extend_requests\n"
                 + "            JOIN users ON users.user_id = extend_requests.user_id\n"
                 + "            JOIN borrowings ON borrowings.borrowing_id = extend_requests.borrowing_id\n"
-                + "            JOIN books ON books.book_id = borrowings.book_id\n"
-                + "            ORDER BY extend_requests.request_date DESC";
+                + "            JOIN books ON books.book_id = borrowings.book_id";
 
         try (
                 Connection conn = DBConnection.getInstance().getConnection(); PreparedStatement ps = conn.prepareStatement(sql); ResultSet rs = ps.executeQuery()) {
@@ -65,36 +64,4 @@ public List<ExtendRequestViewDTO> getAllExtendRequests() {
         return list;
     }
 
-    @Override
-    public boolean hasUserSentRequest(int borrowingID, int userID) {
-        String sql = "select * from extend_requests\n"
-                + "where borrowing_id  = ? and user_id = ? ";
-        try (
-                Connection conn = DBConnection.getInstance().getConnection(); PreparedStatement ps = conn.prepareStatement(sql)) {
-            ps.setInt(1, borrowingID);
-            ps.setInt(2, userID);
-            ResultSet rs = ps.executeQuery();
-            if (rs.next()) {
-                return true;
-            }
-        } catch (SQLException e) {
-            e.printStackTrace();
-        }
-        return false;
-    }
-
-    @Override
-    public void updateStatus(int userID, String status) {
-        String sql = "update extend_requests set status = ? \n"
-                + "where user_id = ? ";
-        try (
-                Connection conn = DBConnection.getInstance().getConnection(); PreparedStatement ps = conn.prepareStatement(sql)) {
-            ps.setInt(1, userID);
-            ps.setString(2, status);
-            ps.executeUpdate();
-        } catch (SQLException e) {
-            e.printStackTrace();
-        }
-    }
-
 }
diff --git a/src/java/com/library/model/dto/BorrowedBookDTO.java b/src/java/com/library/model/dto/BorrowedBookDTO.java
@@ -15,33 +15,21 @@ public class BorrowedBookDTO {
     private String coverImage ;
     private String name ;
     private String slug ;
-    private int extendTime ;
     private LocalDate borrowDate ;
     private LocalDate dueDate ;
 
     public BorrowedBookDTO() {
     }
 
-    public BorrowedBookDTO(int bookID, String coverImage, String name, String slug, int extendTime, LocalDate borrowDate, LocalDate dueDate) {
+    public BorrowedBookDTO(int bookID, String coverImage, String name, String slug, LocalDate borrowDate, LocalDate dueDate) {
         this.bookID = bookID;
         this.coverImage = coverImage;
         this.name = name;
         this.slug = slug;
-        this.extendTime = extendTime;
         this.borrowDate = borrowDate;
         this.dueDate = dueDate;
     }
 
-    public int getExtendTime() {
-        return extendTime;
-    }
-
-    public void setExtendTime(int extendTime) {
-        this.extendTime = extendTime;
-    }
-
-   
-
     public String getName() {
         return name;
     }
diff --git a/src/java/com/library/model/dto/ExtendRequestViewDTO.java b/src/java/com/library/model/dto/ExtendRequestViewDTO.java
@@ -13,7 +13,7 @@
 public class ExtendRequestViewDTO {
     private String account;
     private String avatar;
-    private String title;   
+    private String title;
     private String coverImage;
     private LocalDateTime requestDate;
     private String status;
diff --git a/src/java/com/library/service/BookService.java b/src/java/com/library/service/BookService.java
@@ -84,9 +84,5 @@ public boolean addBook(Book b) {
      public Map<String, Integer> getNumberBorrowedBookByCategory() {
          return this.bookDao.countingBorrowedBookByCategory();
     }
-     
-     public int getBookIDByCover(String cover){
-         return this.bookDao.getBookID(cover);
-     }
     
 }
diff --git a/src/java/com/library/service/ExtendBookService.java b/src/java/com/library/service/ExtendBookService.java
diff --git a/web/WEB-INF/views/admin/extend_request_manager.jsp b/web/WEB-INF/views/admin/extend_request_manager.jsp
diff --git a/web/WEB-INF/views/borrowing/borrowedbooks.jsp b/web/WEB-INF/views/borrowing/borrowedbooks.jsp
diff --git a/web/WEB-INF/views/user/request_extend_book.jsp b/web/WEB-INF/views/user/request_extend_book.jsp

Original file line number	Diff line number	Diff line change
`@@ -46,5 +46,4 @@ public interface BookDao {`
`46`	`46`	`int insertBook(Book b);`
`47`	`47`	`Map<String, Integer> countingBorrowedBookByCategory();`
`48`	`48`
`49`		`- int getBookID(String title);`
`50`	`49`	`}`
Original file line number	Diff line number	Diff line change
`@@ -16,6 +16,4 @@`
`16`	`16`	`public interface ExtendRequestDao {`
`17`	`17`	`boolean insertExtendRequest(ExtendRequestDTO request) ;`
`18`	`18`	`List<ExtendRequestViewDTO> getAllExtendRequests();`
`19`		`- boolean hasUserSentRequest(int borrowingID , int userID );`
`20`		`- void updateStatus(int userID, String status);`
`21`	`19`	`}`