Skip to content
This repository was archived by the owner on Jun 11, 2022. It is now read-only.

Commit 67f907a

Browse files
committed
Small fixes
1 parent 678763e commit 67f907a

File tree

3 files changed

+11
-1
lines changed

3 files changed

+11
-1
lines changed

server/src/main/java/com/balinski/api_project/database/dao/Dao.java

+8
Original file line numberDiff line numberDiff line change
@@ -19,6 +19,14 @@ public int getCount() throws DaoException {
1919
return ((Long)result.get(0).get("COUNT")).intValue();
2020
}
2121

22+
public int getMaxId() throws DaoException {
23+
List<Map<String, Object>> result = DaoManager.getData(
24+
String.format("SELECT MAX(%s_ID) AS ID FROM %s;", type.toString(), type.toString())
25+
);
26+
27+
return result.size() > 0 ? (int)result.get(0).get("ID") : 0;
28+
}
29+
2230
public List<T> getById(int id) throws DaoException {
2331
List<Map<String, Object>> result = DaoManager.getData(
2432
String.format("SELECT * FROM %s T WHERE T.%s_ID = %d;", type.toString(), type.toString(), id)

server/src/main/java/com/balinski/api_project/servlet/AddUserServlet.java

+1-1
Original file line numberDiff line numberDiff line change
@@ -49,7 +49,7 @@ public void doGet(HttpServletRequest req, HttpServletResponse resp) throws IOExc
4949
if(limit < 0)
5050
throw new DaoException("Limit can not be a negative number.");
5151

52-
int newId = DaoManager.getUserDao().getCount()+1;
52+
int newId = DaoManager.getUserDao().getMaxId()+1;
5353
User user = new User(newId, name, sha256(name), 0, limit, LocalDateTime.now(), LocalDateTime.now());
5454
DaoManager.getUserDao().add(user);
5555

server/src/main/java/com/balinski/api_project/servlet/UserServlet.java

+2
Original file line numberDiff line numberDiff line change
@@ -18,6 +18,8 @@ public void doGet(HttpServletRequest req, HttpServletResponse resp) throws IOExc
1818
PrintWriter writer = resp.getWriter();
1919

2020
try {
21+
int newId = DaoManager.getUserDao().getMaxId()+1;
22+
System.out.println(newId);
2123
List<User> users = DaoManager.getUserDao().getAll();
2224
String response = JsonResponseBuilder.mergeFromList(users);
2325
writer.print(response);

0 commit comments

Comments
 (0)