Skip to content

Commit d11ae87

Browse files
chuminhhieu779chuminhhieu779
committed
refactor: improve bussiness logic for borrowing book
1 parent f7777fb commit d11ae87

File tree

15 files changed

+409
-80
lines changed

15 files changed

+409
-80
lines changed

‎src/java/com/library/controller/admin/user/ApproveBorrowServlet.java‎

Lines changed: 62 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,62 @@
1+
/*
2+
* Click nbfs://nbhost/SystemFileSystem/Templates/Licenses/license-default.txt to change this license
3+
* Click nbfs://nbhost/SystemFileSystem/Templates/JSP_Servlet/Servlet.java to edit this template
4+
*/
5+
package com.library.controller.admin.user;
6+
7+
import com.library.factory.ServiceFactory;
8+
import com.library.service.BorrowingService;
9+
import com.library.service.UserService;
10+
import java.io.IOException;
11+
import java.io.PrintWriter;
12+
import jakarta.servlet.ServletException;
13+
import jakarta.servlet.annotation.WebServlet;
14+
import jakarta.servlet.http.HttpServlet;
15+
import jakarta.servlet.http.HttpServletRequest;
16+
import jakarta.servlet.http.HttpServletResponse;
17+
import jakarta.servlet.http.HttpSession;
18+
import java.util.logging.Logger;
19+
import org.slf4j.LoggerFactory;
20+
21+
/**
22+
*
23+
* @author hieuchu
24+
*/
25+
@WebServlet(name = "ApproveBorrowServlet", urlPatterns = {"/admin/approveBorrow"})
26+
public class ApproveBorrowServlet extends HttpServlet {
27+
28+
private static final org.slf4j.Logger logger = LoggerFactory.getLogger(ApproveBorrowServlet.class);
29+
30+
private BorrowingService borrowService = ServiceFactory.getBorrowService();
31+
private UserService userService = ServiceFactory.getUserService();
32+
33+
@Override
34+
protected void doGet(HttpServletRequest request, HttpServletResponse response)
35+
throws ServletException, IOException {
36+
37+
}
38+
39+
@Override
40+
protected void doPost(HttpServletRequest request, HttpServletResponse response)
41+
throws ServletException, IOException {
42+
int borrowId = Integer.parseInt(request.getParameter("borrowId"));
43+
int bookID = Integer.parseInt(request.getParameter("bookID"));
44+
String account = (String) request.getSession().getAttribute("account");
45+
HttpSession session = request.getSession();
46+
logger.info("Received approve borrow request. borrowId='{}', account='{}'", borrowId, account);
47+
48+
int adminId = userService.getAminID(account);
49+
try {
50+
borrowService.approveBorrowRequest(borrowId, adminId , bookID);
51+
logger.info("Borrow request {} approved successfully by adminId={}", borrowId, adminId);
52+
session.setAttribute("success", "approved");
53+
response.sendRedirect(request.getContextPath() + "/admin/user-borrowing-record");
54+
} catch (Exception e) {
55+
e.printStackTrace();
56+
session.setAttribute("success", "failed");
57+
response.sendRedirect(request.getContextPath() + "/admin/user-borrowing-record");
58+
59+
}
60+
}
61+
62+
}

‎src/java/com/library/controller/admin/user/UserBorrowingRecordController.java‎

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -15,6 +15,7 @@
1515
import jakarta.servlet.http.HttpServlet;
1616
import jakarta.servlet.http.HttpServletRequest;
1717
import jakarta.servlet.http.HttpServletResponse;
18+
import jakarta.servlet.http.HttpSession;
1819
import java.util.List;
1920

2021
/**
@@ -31,7 +32,10 @@ protected void doGet(HttpServletRequest request, HttpServletResponse response)
3132
throws ServletException, IOException {
3233

3334
List<UserBorrowRecordDTO> list = userService.showUserInformation();
35+
HttpSession session = request.getSession(true);
36+
String success = (String) session.getAttribute("success");
3437
request.setAttribute("userList", list);
38+
request.setAttribute("sucess", success);
3539
request.getRequestDispatcher("/WEB-INF/views/admin/userborrowingrecord.jsp").forward(request, response);
3640
}
3741

‎src/java/com/library/controller/borrowing/BorrowBookController.java‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -37,7 +37,7 @@ protected void doGet(HttpServletRequest request, HttpServletResponse response)
3737

3838
HttpSession session = request.getSession(false);
3939
if (session == null || session.getAttribute("account") == null) {
40-
session.setAttribute("error", "Vui lòng đăng nhập để sử dụng chức năng!");
40+
session.setAttribute("error", "you have to login before using our service!");
4141
response.sendRedirect(request.getContextPath() + "/book/detail");
4242
return;
4343
}
@@ -50,7 +50,7 @@ protected void doGet(HttpServletRequest request, HttpServletResponse response)
5050
if (borrowService.canBorrowBook(bookID, userID)) {
5151
borrowService.borrowBook(slug, bookID, userID);
5252
activityService.BookActivityOfUser(account, 3, bookID);
53-
session.setAttribute("success", "you borrowed book !!");
53+
session.setAttribute("success", "borrow book request has sent !!");
5454
} else {
5555
session.setAttribute("failed", "you already borrowed this book !!!");
5656
}

‎src/java/com/library/controller/filter/AutholizationURLController.java‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -49,7 +49,7 @@ public static final String[] pageForAdmin() {
4949
"/admin/book/add",
5050
"/admin/books/edit",
5151
"/admin/books/delete",
52-
52+
"/admin/approveBorrow",
5353
"/admin/user-manager",
5454
"/admin/user-borrowing-record",
5555
"/admin/user/delete",

‎src/java/com/library/dao/AdminDaoImpl.java‎

Lines changed: 15 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -25,30 +25,34 @@ public class AdminDaoImpl implements AdminDao {
2525

2626
@Override
2727
public List<UserBorrowRecordDTO> getAllUserInformation() {
28-
String sql = "select users.user_id ,users.fullname , users.account, books.title ,borrowings.status from borrowings\n"
29-
+ "join books on books.book_id = borrowings.book_id\n"
30-
+ "join users on users.user_id = borrowings.user_id\n"
31-
+ "group by users.user_id ,users.fullname , users.account, borrowings.status , books.title";
28+
String sql = "SELECT b.book_id ,b.borrowing_id, u.user_id, u.fullname, u.account,\n"
29+
+ " bk.title, b.status\n"
30+
+ " FROM borrowings b\n"
31+
+ " JOIN books bk ON bk.book_id = b.book_id\n"
32+
+ " JOIN users u ON u.user_id = b.user_id\n"
33+
+ " ORDER BY b.borrowing_id DESC";
3234

3335
List<UserBorrowRecordDTO> list = new ArrayList<>();
3436

3537
try (
3638
Connection conn = DBConnection.getInstance().getConnection(); PreparedStatement ps = conn.prepareStatement(sql)) {
3739
ResultSet rs = ps.executeQuery();
3840
while (rs.next()) {
39-
UserBorrowRecordDTO dto = new UserBorrowRecordDTO();
40-
dto.setUserID(rs.getInt("user_id"));
41-
dto.setAccount(rs.getString("account"));
42-
dto.setFullName(rs.getString("fullname"));
43-
dto.setBorrowedBook(rs.getString("title"));
41+
UserBorrowRecordDTO dto = new UserBorrowRecordDTO();
42+
dto.setUserID(rs.getInt("user_id"));
43+
dto.setAccount(rs.getString("account"));
44+
dto.setFullName(rs.getString("fullname"));
45+
dto.setBorrowedBook(rs.getString("title"));
46+
dto.setBorrowingID(rs.getInt("borrowing_id"));
47+
dto.setBookID(rs.getInt("book_id"));
4448
Optional<UserStatus> opt = UserStatus.convertToEnum(rs.getString("status"));
4549
opt.ifPresent(status -> dto.setStatus(status));
46-
list.add(dto);
50+
list.add(dto);
4751
}
4852
} catch (SQLException s) {
4953
s.printStackTrace();
5054
}
51-
return list ;
55+
return list;
5256
}
5357

5458
}

‎src/java/com/library/dao/BorrowingDao.java‎

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -42,4 +42,8 @@ public interface BorrowingDao {
4242
void deleteBorrowingsByBookId(Connection conn ,int bookId);
4343

4444
public void deleteUserFromBorrowings(Connection conn ,int userId);
45+
46+
int numberOfBorrowBookOnPerUser();
47+
48+
void approveBorrowing(Connection conn, int borrowId, int adminId);
4549
}

‎src/java/com/library/dao/BorrowingDaoImpl.java‎

Lines changed: 44 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -17,6 +17,7 @@
1717
import java.util.HashMap;
1818
import java.util.List;
1919
import java.util.Map;
20+
import java.util.logging.Level;
2021
import org.slf4j.Logger;
2122
import org.slf4j.LoggerFactory;
2223

@@ -195,16 +196,15 @@ public boolean isBookAvailable(String slug, int bookID) {
195196

196197
@Override
197198
public void insertBook(Connection conn, int bookID, int userID) {
198-
String sql = "INSERT INTO borrowings (user_id, book_id, borrow_date, due_date, return_date, late_days, fine_amount, fine_paid, status) "
199-
+ "VALUES (?, ?, GETDATE(), DATEADD(MONTH, 2, GETDATE()), NULL, 0, 0.00, 'Unpaid', 'borrowing')";
200-
try (
201-
PreparedStatement ps = conn.prepareStatement(sql)) {
199+
String sql = "INSERT INTO borrowings (user_id, book_id, status, fine_paid)\n"
200+
+ " VALUES (?, ?, 'pending', 'Unpaid')";
201+
try (PreparedStatement ps = conn.prepareStatement(sql)) {
202202
ps.setInt(1, userID);
203203
ps.setInt(2, bookID);
204204
ps.executeUpdate();
205+
logger.info("Borrow request inserted: user_id={}, book_id={}", userID, bookID);
205206
} catch (SQLException s) {
206-
logger.error("Error executing: {}", s.getMessage(), s);
207-
207+
logger.error("Error inserting borrow request: {}", s.getMessage(), s);
208208
}
209209
}
210210

@@ -237,6 +237,7 @@ public boolean canDeleteBook(int bookID) {
237237
return false;
238238
}
239239
} catch (Exception e) {
240+
240241
}
241242
return true;
242243
}
@@ -266,4 +267,41 @@ public void deleteUserFromBorrowings(Connection conn, int userId) {
266267
}
267268

268269
}
270+
271+
@Override
272+
public int numberOfBorrowBookOnPerUser() {
273+
String sql = "SELECT user_id, count(book_id) AS borrow_count \n"
274+
+ "FROM borrowings\n"
275+
+ "GROUP BY user_id ";
276+
try (
277+
Connection conn = DBConnection.getInstance().getConnection(); PreparedStatement ps = conn.prepareStatement(sql)) {
278+
ResultSet rs = ps.executeQuery();
279+
if (rs.next()) {
280+
return rs.getInt("borrow_count");
281+
}
282+
} catch (SQLException e) {
283+
e.printStackTrace();
284+
}
285+
return -1;
286+
}
287+
288+
@Override
289+
public void approveBorrowing(Connection conn, int borrowId, int adminId) {
290+
String sql = "UPDATE borrowings\n"
291+
+ " SET status = 'borrowing',\n"
292+
+ " borrow_date = GETDATE(),\n"
293+
+ " due_date = DATEADD(DAY, 14, GETDATE()),\n"
294+
+ " approved_by = ?\n"
295+
+ " WHERE borrowing_id = ?";
296+
297+
try (PreparedStatement ps = conn.prepareStatement(sql)) {
298+
ps.setInt(1, adminId);
299+
ps.setInt(2, borrowId);
300+
ps.executeUpdate();
301+
} catch (SQLException ex) {
302+
ex.printStackTrace();
303+
}
304+
305+
}
306+
269307
}

‎src/java/com/library/dao/UserDao.java‎

Lines changed: 29 additions & 30 deletions
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,6 @@
44
*/
55
package com.library.dao;
66

7-
87
import com.library.model.dto.UserProfileDTO;
98
import com.library.model.entity.User;
109
import java.sql.Connection;
@@ -17,35 +16,35 @@
1716
*/
1817
public interface UserDao {
1918

20-
List<User> getALLUser();
21-
22-
boolean checkUserExistence(String username);
23-
24-
boolean addNewUser(String username,String account,String password);
25-
26-
boolean checkAdminLogin(String username,String pass);
27-
28-
int findUserID(String account);
29-
30-
Optional<User> getUser(String account);
31-
32-
boolean updateUser(String account , String avatar, String fullName, int userID);
33-
34-
boolean setOnline(String account);
35-
36-
boolean setOfflife(String account);
37-
38-
void setOfflineAll();
39-
40-
boolean checkUserStatus(int userID);
41-
42-
boolean deleteUser(Connection conn , int userID);
43-
44-
String findHashedPassword(String account);
45-
46-
List<Integer> getAllUserID();
47-
48-
boolean updatePassword(String account,String password);
19+
List<User> getALLUser();
20+
21+
boolean checkUserExistence(String username);
22+
23+
boolean addNewUser(String username, String account, String password);
24+
25+
boolean checkAdminLogin(String username, String pass);
26+
27+
int findUserID(String account);
28+
29+
Optional<User> getUser(String account);
30+
31+
boolean updateUser(String account, String avatar, String fullName, int userID);
32+
33+
boolean setOnline(String account);
34+
35+
boolean setOfflife(String account);
36+
37+
void setOfflineAll();
38+
39+
boolean checkUserStatus(int userID);
40+
41+
boolean deleteUser(Connection conn, int userID);
42+
43+
String findHashedPassword(String account);
44+
45+
List<Integer> getAllUserID();
4946

47+
boolean updatePassword(String account, String password);
5048

49+
int findAdminIDByAccount (String account);
5150
}

‎src/java/com/library/dao/UserDaoImpl.java‎

Lines changed: 16 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -296,5 +296,21 @@ public void setOfflineAll() {
296296
s.printStackTrace();
297297
}
298298
}
299+
@Override
300+
public int findAdminIDByAccount(String account) {
301+
String sql = "SELECT user_id FROM users WHERE account = ? AND role = 'admin'";
302+
try (Connection conn = DBConnection.getInstance().getConnection();
303+
PreparedStatement ps = conn.prepareStatement(sql)) {
304+
ps.setString(1, account);
305+
ResultSet rs = ps.executeQuery();
306+
if (rs.next()) {
307+
return rs.getInt("user_id");
308+
}
309+
} catch (SQLException e) {
310+
e.printStackTrace();
311+
}
312+
return -1;
313+
}
314+
299315

300316
}

‎src/java/com/library/enums/UserStatus.java‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -14,6 +14,7 @@ public enum UserStatus {
1414
ACTIVE("active"),
1515
INACTIVE("inactive"),
1616
BORROWING("borrowing"),
17+
PENDING("pending"),
1718
RETURNED("returned");
1819

1920
private final String value;

0 commit comments

Comments
 (0)