1.1 --- a/src/main/java/de/uapcore/lightpit/modules/UsersModule.java Fri Nov 06 10:50:32 2020 +0100
1.2 +++ b/src/main/java/de/uapcore/lightpit/modules/UsersModule.java Thu Nov 19 13:58:54 2020 +0100
1.3 @@ -32,7 +32,7 @@
1.4 import de.uapcore.lightpit.Constants;
1.5 import de.uapcore.lightpit.HttpMethod;
1.6 import de.uapcore.lightpit.RequestMapping;
1.7 -import de.uapcore.lightpit.dao.DataAccessObjects;
1.8 +import de.uapcore.lightpit.dao.DaoProvider;
1.9 import de.uapcore.lightpit.entities.User;
1.10 import de.uapcore.lightpit.viewmodel.UsersEditView;
1.11 import de.uapcore.lightpit.viewmodel.UsersView;
1.12 @@ -61,7 +61,7 @@
1.13 }
1.14
1.15 @RequestMapping(method = HttpMethod.GET)
1.16 - public void index(HttpServletRequest req, HttpServletResponse resp, DataAccessObjects dao) throws SQLException, ServletException, IOException {
1.17 + public void index(HttpServletRequest req, HttpServletResponse resp, DaoProvider dao) throws SQLException, ServletException, IOException {
1.18 final var userDao = dao.getUserDao();
1.19
1.20 final var viewModel = new UsersView();
1.21 @@ -73,7 +73,7 @@
1.22 }
1.23
1.24 @RequestMapping(requestPath = "edit", method = HttpMethod.GET)
1.25 - public void edit(HttpServletRequest req, HttpServletResponse resp, DataAccessObjects dao) throws SQLException, ServletException, IOException {
1.26 + public void edit(HttpServletRequest req, HttpServletResponse resp, DaoProvider dao) throws SQLException, ServletException, IOException {
1.27
1.28 final var viewModel = new UsersEditView();
1.29 viewModel.setUser(findByParameter(req, Integer.class, "id",
1.30 @@ -86,7 +86,7 @@
1.31 }
1.32
1.33 @RequestMapping(requestPath = "commit", method = HttpMethod.POST)
1.34 - public void commit(HttpServletRequest req, HttpServletResponse resp, DataAccessObjects dao) throws ServletException, IOException {
1.35 + public void commit(HttpServletRequest req, HttpServletResponse resp, DaoProvider dao) throws ServletException, IOException {
1.36
1.37 User user = new User(-1);
1.38 try {
1.39 @@ -96,13 +96,19 @@
1.40 getParameter(req, String.class, "lastname").ifPresent(user::setLastname);
1.41 getParameter(req, String.class, "mail").ifPresent(user::setMail);
1.42
1.43 - dao.getUserDao().saveOrUpdate(user);
1.44 + final var userDao = dao.getUserDao();
1.45 + if (user.getId() > 0) {
1.46 + // TODO: unused return value
1.47 + userDao.update(user);
1.48 + } else {
1.49 + userDao.save(user);
1.50 + }
1.51
1.52 setRedirectLocation(req, "./teams/");
1.53 setContentPage(req, Constants.JSP_COMMIT_SUCCESSFUL);
1.54
1.55 LOG.debug("Successfully updated user {}", user.getUsername());
1.56 - } catch (NoSuchElementException | IllegalArgumentException | SQLException ex) {
1.57 + } catch (NoSuchElementException | IllegalArgumentException ex) {
1.58 final var viewModel = new UsersEditView();
1.59 viewModel.setUser(user);
1.60 // TODO: viewModel.setErrorText()
