Mercurial > hg > LightPIT / file diff

     1.1 --- a/src/main/java/de/uapcore/lightpit/modules/UsersModule.java	Sun Dec 20 11:06:25 2020 +0100
     1.2 +++ b/src/main/java/de/uapcore/lightpit/modules/UsersModule.java	Mon Dec 21 18:29:34 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.DaoProvider;
     1.8 +import de.uapcore.lightpit.dao.DataAccessObject;
     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,11 +61,9 @@
    1.13      }
    1.14  
    1.15      @RequestMapping(method = HttpMethod.GET)
    1.16 -    public void index(HttpServletRequest req, HttpServletResponse resp, DaoProvider dao) throws SQLException, ServletException, IOException {
    1.17 -        final var userDao = dao.getUserDao();
    1.18 -
    1.19 +    public void index(HttpServletRequest req, HttpServletResponse resp, DataAccessObject dao) throws SQLException, ServletException, IOException {
    1.20          final var viewModel = new UsersView();
    1.21 -        viewModel.setUsers(userDao.list());
    1.22 +        viewModel.setUsers(dao.listUsers());
    1.23          setViewModel(req, viewModel);
    1.24          setContentPage(req, "users");
    1.25  
    1.26 @@ -73,11 +71,10 @@
    1.27      }
    1.28  
    1.29      @RequestMapping(requestPath = "edit", method = HttpMethod.GET)
    1.30 -    public void edit(HttpServletRequest req, HttpServletResponse resp, DaoProvider dao) throws SQLException, ServletException, IOException {
    1.31 +    public void edit(HttpServletRequest req, HttpServletResponse resp, DataAccessObject dao) throws SQLException, ServletException, IOException {
    1.32  
    1.33          final var viewModel = new UsersEditView();
    1.34 -        viewModel.setUser(findByParameter(req, Integer.class, "id",
    1.35 -                dao.getUserDao()::find).orElse(new User(-1)));
    1.36 +        viewModel.setUser(findByParameter(req, Integer.class, "id", dao::findUser).orElse(new User(-1)));
    1.37  
    1.38          setViewModel(req, viewModel);
    1.39          setContentPage(req, "user-form");
    1.40 @@ -86,7 +83,7 @@
    1.41      }
    1.42  
    1.43      @RequestMapping(requestPath = "commit", method = HttpMethod.POST)
    1.44 -    public void commit(HttpServletRequest req, HttpServletResponse resp, DaoProvider dao) throws ServletException, IOException {
    1.45 +    public void commit(HttpServletRequest req, HttpServletResponse resp, DataAccessObject dao) throws ServletException, IOException {
    1.46  
    1.47          User user = new User(-1);
    1.48          try {
    1.49 @@ -96,12 +93,10 @@
    1.50              getParameter(req, String.class, "lastname").ifPresent(user::setLastname);
    1.51              getParameter(req, String.class, "mail").ifPresent(user::setMail);
    1.52  
    1.53 -            final var userDao = dao.getUserDao();
    1.54              if (user.getId() > 0) {
    1.55 -                // TODO: unused return value
    1.56 -                userDao.update(user);
    1.57 +                dao.updateUser(user);
    1.58              } else {
    1.59 -                userDao.save(user);
    1.60 +                dao.insertUser(user);
    1.61              }
    1.62  
    1.63              setRedirectLocation(req, "./teams/");