Add posibility to send requests with multiple values in one parameter

Author: balins

server/src/main/java/com/balinski/api_project/database/DatabaseProxy.java

@@ -25,14 +25,13 @@ public class DatabaseProxy {
     private DatabaseProxy(){};
 
     public static List<Map<String, Object>> querySelect(String sql) throws DatabaseException {
-        List<Map<String, Object>> data;
+        List<Map<String, Object>> data = new LinkedList<>();
 
         try(Connection connection = getConnection()) {
             try(Statement statement = connection.createStatement()) {
                 try(ResultSet rs = statement.executeQuery(sql)) {
                     ResultSetMetaData md = rs.getMetaData();
                     int columns = md.getColumnCount();
-                    data = new LinkedList<>();
 
                     while(rs.next()) {
                         Map<String, Object> row = new HashMap<>(columns);
@@ -53,15 +52,27 @@ public static List<Map<String, Object>> querySelect(String sql) throws DatabaseE
         return data;
     }
 
-    public static int queryUpdate(String sql, boolean transaction) throws DatabaseException {
-        int rowsAffected = 0;
+    public static List<Map<String, Object>> queryUpdate(String sql, boolean transaction) throws DatabaseException {
+        List<Map<String, Object>> data = new LinkedList<>();
 
         try(Connection connection = getConnection()) {
             if(transaction)
                 connection.setAutoCommit(false);
 
-            try(Statement statement = connection.createStatement()) {
-                rowsAffected = statement.executeUpdate(sql);
+            try(PreparedStatement statement = connection.prepareStatement(sql, Statement.RETURN_GENERATED_KEYS)) {
+                statement.executeUpdate();
+                ResultSet rs = statement.getGeneratedKeys();
+                ResultSetMetaData md = rs.getMetaData();
+                int columns = md.getColumnCount();
+
+                while(rs.next()) {
+                    Map<String, Object> row = new HashMap<>(columns);
+
+                    for (int i = 1; i <= columns; i++)
+                        row.put(md.getColumnName(i), rs.getObject(i));
+
+                    data.add(row);
+                }
             }
 
             if(transaction) {
@@ -75,7 +86,7 @@ public static int queryUpdate(String sql, boolean transaction) throws DatabaseEx
             closeConnection();
         }
 
-        return rowsAffected;
+        return data;
     }
 
     protected static Connection getConnection() throws DatabaseException {

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

@@ -52,18 +52,9 @@ public List<T> getIdBetween(int start, int stop) throws DaoException {
         return toListOfObjects(result);
     }
 
-    public int add(T obj) throws DaoException {
-        if(obj == null)
-            return 0;
-
-        String sql = String.format("INSERT INTO %s VALUES (%s);", type.toString(), obj.asCsv());
-
-        return DaoManager.modifyData(sql, false);
-    }
-
-    public int addAll(List<T> list, boolean transaction) throws DaoException {
+    public List<T> add(List<T> list, boolean transaction) throws DaoException {
         if(list == null || list.size() == 0)
-            return 0;
+            return Collections.emptyList();
 
         StringBuilder sql = new StringBuilder(String.format("INSERT INTO %s VALUES ", type.toString()));
 
@@ -75,13 +66,17 @@ public int addAll(List<T> list, boolean transaction) throws DaoException {
 
         sql.replace(sql.lastIndexOf(", "), sql.length(), ";");
 
-        return DaoManager.modifyData(sql.toString(), transaction);
+        List<Map<String, Object>> result = DaoManager.modifyData(sql.toString(), transaction);
+
+        return toListOfObjects(result);
     }
 
-    public boolean delete(int id) throws DaoException {
-        return DaoManager.modifyData(
+    public List<T> delete(int id) throws DaoException {
+        List<Map<String, Object>> result = DaoManager.modifyData(
                 String.format("DELETE FROM %s WHERE %s_ID=%d;", type.toString(), type.toString(), id),
-                false) > 0;
+                false);
+
+        return toListOfObjects(result);
     }
 
     protected List<T> toListOfObjects(List<Map<String, Object>> listOfMaps) throws DaoException {

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

@@ -33,7 +33,7 @@ static List<Map<String, Object>> getData(String sql) throws DaoException {
         }
     }
 
-    static int modifyData(String sql, boolean transaction) throws DaoException {
+    static List<Map<String, Object>> modifyData(String sql, boolean transaction) throws DaoException {
         try {
             return DatabaseProxy.queryUpdate(sql, transaction);
         } catch (DatabaseException e) {

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

@@ -37,19 +37,23 @@ public List<User> getByToken(String token) throws DaoException {
         return toListOfObjects(result);
     }
 
-    public boolean renewAccess(int id, int newLimit) throws DaoException {
-        return DaoManager.modifyData(
+    public List<User> renewAccess(int id, int newLimit) throws DaoException {
+        List<Map<String, Object>> result = DaoManager.modifyData(
                 String.format("UPDATE USER SET REQUESTS_SENT=0, USE_LIMIT=%d, LAST_UPDATE='%s' WHERE USER_ID=%d;",
                         newLimit, LocalDateTime.now().format(toDateTime), id),
-                false) > 0;
+                false);
+
+        return toListOfObjects(result);
     }
 
-    public boolean incrementUses(int id) throws DaoException {
-        return DaoManager.modifyData(
+    public List<User> incrementUses(int id) throws DaoException {
+        List<Map<String, Object>> result = DaoManager.modifyData(
                 String.format("UPDATE USER SET REQUESTS_SENT=" +
                         "((SELECT U.REQUESTS_SENT FROM USER U WHERE U.USER_ID=%d)+1), " +
                         "LAST_UPDATE='%s' " +
                         "WHERE USER_ID=%d;", id, LocalDateTime.now().format(toDateTime), id),
-                false) > 0;
+                false);
+
+        return toListOfObjects(result);
     }
 }

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

@@ -35,15 +35,21 @@ public void doGet(HttpServletRequest req, HttpServletResponse resp) throws IOExc
             User user = UserAuthenticator.authenticateAndGet(param.get("user"), param.get("token"));
             UserAuthenticator.incrementUses(user);
 
-            List<Actor> actors;
+            List<Actor> actors = new LinkedList<>();
             var dao = DaoManager.getActorDao();
 
-            if(param.get("id") != null)
-                actors = dao.getById(Integer.parseInt(param.get("id")));
-            else if(param.get("firstName") != null)
-                actors = dao.getByFirstName(param.get("firstName"));
-            else if(param.get("lastName") != null)
-                actors = dao.getByLastName(param.get("lastName"));
+            if(param.get("id") != null) {
+                for(var id : param.get("id").split(","))
+                    actors.addAll(dao.getById(Integer.parseInt(id)));
+            }
+            else if(param.get("firstName") != null) {
+                for(var firstName : param.get("firstName").split(","))
+                    actors.addAll(dao.getByFirstName(firstName));
+            }
+            else if(param.get("lastName") != null) {
+                for(var lastName : param.get("lastName").split(","))
+                    actors.addAll(dao.getByFirstName(lastName));
+            }
             else
                 actors = dao.getAll();
 

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

@@ -2,6 +2,7 @@
 
 import com.balinski.api_project.database.dao.DaoException;
 import com.balinski.api_project.database.dao.DaoManager;
+import com.balinski.api_project.database.dao.UserDao;
 import com.balinski.api_project.database.model.User;
 import com.balinski.api_project.servlet.util.JsonResponseBuilder;
 import com.balinski.api_project.servlet.util.UserAuthenticator;
@@ -15,6 +16,7 @@
 import java.security.MessageDigest;
 import java.security.NoSuchAlgorithmException;
 import java.time.LocalDateTime;
+import java.util.ArrayList;
 import java.util.List;
 
 
@@ -35,16 +37,46 @@ private String sha256(String name) throws NoSuchAlgorithmException {
         return hexString.toString();
     }
 
-    private User addUser(String name, int limit) throws DaoException, NoSuchAlgorithmException {
-        if(limit < 0)
-            throw new DaoException("Limit can not be a negative number.");
+    private List<User> addUsers(String[] names, String[] limits) throws DaoException, NoSuchAlgorithmException {
+        if(names.length != limits.length)
+            throw new DaoException("Quantity of names and limits do not match.");
 
-        int newId = DaoManager.getUserDao().getMaxId()+1;
-        User user = new User(newId, "user", name, sha256(name), 0,
-                limit, LocalDateTime.now(), LocalDateTime.now());
-        DaoManager.getUserDao().add(user);
+        UserDao dao = DaoManager.getUserDao();
+        int id = dao.getMaxId()+1;
+        List<User> users = new ArrayList<>(names.length);
 
-        return user;
+        for(int i = 0; i < names.length; i++) {
+            if(Integer.parseInt(limits[i]) < 0)
+                limits[i] = "0";
+
+            users.add(new User(id, "user", names[i], sha256(names[i]), 0,
+                    Integer.parseInt(limits[i]), LocalDateTime.now(), LocalDateTime.now()));
+
+            id++;
+        }
+
+        return DaoManager.getUserDao().add(users, true);
+    }
+
+    private List<User> renewAccess(String[] ids, String[] limits) throws DaoException {
+        List<User> users = new ArrayList<>(ids.length);
+
+        for(int i = 0; i < ids.length; i++) {
+            if(Integer.parseInt(limits[i]) < 0)
+                limits[i] = "0";
+
+            users.addAll(DaoManager.getUserDao().renewAccess(Integer.parseInt(ids[i]), Integer.parseInt(limits[i])));
+        }
+
+        return users;
+    }
+
+    private List<User> deleteUsers(String[] ids) throws DaoException {
+        List<User> users = new ArrayList<>(ids.length);
+        for (String id : ids)
+            users.addAll(DaoManager.getUserDao().delete(Integer.parseInt(id)));
+
+        return users;
     }
 
     @Override
@@ -64,42 +96,46 @@ public void doGet(HttpServletRequest req, HttpServletResponse resp) throws IOExc
 
             String action = req.getParameter("action").toLowerCase();
             String response;
-            User user;
-            boolean success;
+            List<User> users;
+            String[] userIds, userNames, userLimits;
 
             switch(action) {
                 case "add":
                     if(req.getParameter("name") == null || req.getParameter("limit") == null)
                         throw new DaoException("You have to provide name and limit to add new user.");
 
-                    user = addUser(req.getParameter("name"), Integer.parseInt(req.getParameter("limit")));
-                    response = JsonResponseBuilder.mergeFromList(List.of(user));
+                    userNames = req.getParameter("name").split(",");
+                    userLimits = req.getParameter("limit").split(",");
+
+                    users = addUsers(userNames, userLimits);
+
+                    response = JsonResponseBuilder.mergeFromList(users);
                     break;
 
                 case "renew":
                     if(req.getParameter("id") == null || req.getParameter("limit") == null)
                         throw new DaoException("You have to provide id and new limit to renew user's access.");
 
-                    success = DaoManager.getUserDao()
-                            .renewAccess(Integer.parseInt(req.getParameter("id")),
-                                    Integer.parseInt(req.getParameter("limit")));
-                    if(!success)
-                        throw new DaoException("Could not update the user. Check if provided parameters are valid.");
+                    userIds = req.getParameter("id").split(",");
+                    userLimits = req.getParameter("limit").split(",");
+
+                    if(userIds.length != userLimits.length)
+                        throw new DaoException("Quantity of IDs and limits do not match.");
+
+                    users = renewAccess(userIds, userLimits);
 
-                    response = "User's access has been successfully renewed.";
+                    response = JsonResponseBuilder.mergeFromList(users);
                     break;
 
                 case "delete":
                     if(req.getParameter("id") == null)
                         throw new DaoException("You have to provide id of user that you want to be deleted.");
 
-                    success = DaoManager.getUserDao()
-                            .delete(Integer.parseInt(req.getParameter("id")));
+                    userIds = req.getParameter("id").split(",");
 
-                    if(!success)
-                        throw new DaoException("Could not delete the user. Check if provided id is valid.");
+                    users = deleteUsers(userIds);
 
-                    response = "The user has been successfully removed.";
+                    response = JsonResponseBuilder.mergeFromList(users);
                     break;
 
                 default:

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

@@ -12,10 +12,7 @@
 import javax.servlet.http.HttpServletResponse;
 import java.io.IOException;
 import java.io.PrintWriter;
-import java.util.Collections;
-import java.util.Comparator;
-import java.util.List;
-import java.util.Set;
+import java.util.*;
 import java.util.stream.Collectors;
 
 public class FilmServlet extends HttpServlet {
@@ -36,15 +33,21 @@ public void doGet(HttpServletRequest req, HttpServletResponse resp) throws IOExc
             User user = UserAuthenticator.authenticateAndGet(param.get("user"), param.get("token"));
             UserAuthenticator.incrementUses(user);
 
-            List<Film> films;
+            List<Film> films = new LinkedList<>();
             var dao = DaoManager.getFilmDao();
 
-            if(param.get("id") != null)
-                films = dao.getById(Integer.parseInt(param.get("id")));
-            else if(param.get("title") != null)
-                films = dao.getByTitle(param.get("title"));
-            else if(param.get("language") != null)
-                films = dao.getAvailableInLanguage(param.get("language"));
+            if(param.get("id") != null){
+                for(var id : param.get("id").split(","))
+                    films.addAll(dao.getById(Integer.parseInt(id)));
+            }
+            else if(param.get("title") != null){
+                for(var title : param.get("title").split(","))
+                    films.addAll(dao.getByTitle(title));
+            }
+            else if(param.get("language") != null){
+                for(var language : param.get("language").split(","))
+                    films.addAll(dao.getByTitle(language));
+            }
             else if(param.get("minLength") != null) {
                 films = dao.getLongerThan(Integer.parseInt(param.get("minLength")));
                 films.sort(Comparator.comparing(Film::getLength).thenComparing(Film::getTitle));

server/src/main/java/com/balinski/api_project/servlet/util/UserAuthenticator.java

@@ -30,10 +30,6 @@ public static User authenticateAndGet(String username, String token) throws DaoE
     }
 
     public static void incrementUses(User user) throws DaoException {
-        boolean success = DaoManager.getUserDao().incrementUses(user.getId());
-
-        if(!success)
-            throw new DaoException("There was an error with authentication. " +
-                    "Please try again later or contact us if problem still occurs.");
+        DaoManager.getUserDao().incrementUses(user.getId());
     }
 }