Sat, 23 Jan 2021 14:47:59 +0100
fixes issue query returning issues more than once
51
dd0a45ae25d7
adds the possibility to add users / developers
Mike Becker <universe@uap-core.de>
parents:
diff
changeset
|
1 | /* |
dd0a45ae25d7
adds the possibility to add users / developers
Mike Becker <universe@uap-core.de>
parents:
diff
changeset
|
2 | * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER. |
dd0a45ae25d7
adds the possibility to add users / developers
Mike Becker <universe@uap-core.de>
parents:
diff
changeset
|
3 | * |
180 | 4 | * Copyright 2021 Mike Becker. All rights reserved. |
51
dd0a45ae25d7
adds the possibility to add users / developers
Mike Becker <universe@uap-core.de>
parents:
diff
changeset
|
5 | * |
dd0a45ae25d7
adds the possibility to add users / developers
Mike Becker <universe@uap-core.de>
parents:
diff
changeset
|
6 | * Redistribution and use in source and binary forms, with or without |
dd0a45ae25d7
adds the possibility to add users / developers
Mike Becker <universe@uap-core.de>
parents:
diff
changeset
|
7 | * modification, are permitted provided that the following conditions are met: |
dd0a45ae25d7
adds the possibility to add users / developers
Mike Becker <universe@uap-core.de>
parents:
diff
changeset
|
8 | * |
dd0a45ae25d7
adds the possibility to add users / developers
Mike Becker <universe@uap-core.de>
parents:
diff
changeset
|
9 | * 1. Redistributions of source code must retain the above copyright |
dd0a45ae25d7
adds the possibility to add users / developers
Mike Becker <universe@uap-core.de>
parents:
diff
changeset
|
10 | * notice, this list of conditions and the following disclaimer. |
dd0a45ae25d7
adds the possibility to add users / developers
Mike Becker <universe@uap-core.de>
parents:
diff
changeset
|
11 | * |
dd0a45ae25d7
adds the possibility to add users / developers
Mike Becker <universe@uap-core.de>
parents:
diff
changeset
|
12 | * 2. Redistributions in binary form must reproduce the above copyright |
dd0a45ae25d7
adds the possibility to add users / developers
Mike Becker <universe@uap-core.de>
parents:
diff
changeset
|
13 | * notice, this list of conditions and the following disclaimer in the |
dd0a45ae25d7
adds the possibility to add users / developers
Mike Becker <universe@uap-core.de>
parents:
diff
changeset
|
14 | * documentation and/or other materials provided with the distribution. |
dd0a45ae25d7
adds the possibility to add users / developers
Mike Becker <universe@uap-core.de>
parents:
diff
changeset
|
15 | * |
dd0a45ae25d7
adds the possibility to add users / developers
Mike Becker <universe@uap-core.de>
parents:
diff
changeset
|
16 | * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" |
dd0a45ae25d7
adds the possibility to add users / developers
Mike Becker <universe@uap-core.de>
parents:
diff
changeset
|
17 | * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE |
dd0a45ae25d7
adds the possibility to add users / developers
Mike Becker <universe@uap-core.de>
parents:
diff
changeset
|
18 | * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE |
dd0a45ae25d7
adds the possibility to add users / developers
Mike Becker <universe@uap-core.de>
parents:
diff
changeset
|
19 | * ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE |
dd0a45ae25d7
adds the possibility to add users / developers
Mike Becker <universe@uap-core.de>
parents:
diff
changeset
|
20 | * LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR |
dd0a45ae25d7
adds the possibility to add users / developers
Mike Becker <universe@uap-core.de>
parents:
diff
changeset
|
21 | * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF |
dd0a45ae25d7
adds the possibility to add users / developers
Mike Becker <universe@uap-core.de>
parents:
diff
changeset
|
22 | * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS |
dd0a45ae25d7
adds the possibility to add users / developers
Mike Becker <universe@uap-core.de>
parents:
diff
changeset
|
23 | * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN |
dd0a45ae25d7
adds the possibility to add users / developers
Mike Becker <universe@uap-core.de>
parents:
diff
changeset
|
24 | * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) |
dd0a45ae25d7
adds the possibility to add users / developers
Mike Becker <universe@uap-core.de>
parents:
diff
changeset
|
25 | * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE |
dd0a45ae25d7
adds the possibility to add users / developers
Mike Becker <universe@uap-core.de>
parents:
diff
changeset
|
26 | * POSSIBILITY OF SUCH DAMAGE. |
dd0a45ae25d7
adds the possibility to add users / developers
Mike Becker <universe@uap-core.de>
parents:
diff
changeset
|
27 | * |
dd0a45ae25d7
adds the possibility to add users / developers
Mike Becker <universe@uap-core.de>
parents:
diff
changeset
|
28 | */ |
dd0a45ae25d7
adds the possibility to add users / developers
Mike Becker <universe@uap-core.de>
parents:
diff
changeset
|
29 | package de.uapcore.lightpit.modules; |
dd0a45ae25d7
adds the possibility to add users / developers
Mike Becker <universe@uap-core.de>
parents:
diff
changeset
|
30 | |
179
623c340058f3
migrates the utility classes for the AbstractServlet
Mike Becker <universe@uap-core.de>
parents:
167
diff
changeset
|
31 | import de.uapcore.lightpit.AbstractServlet; |
157
1e6f16fad3a5
removes ResponseType enum
Mike Becker <universe@uap-core.de>
parents:
86
diff
changeset
|
32 | import de.uapcore.lightpit.Constants; |
1e6f16fad3a5
removes ResponseType enum
Mike Becker <universe@uap-core.de>
parents:
86
diff
changeset
|
33 | import de.uapcore.lightpit.HttpMethod; |
1e6f16fad3a5
removes ResponseType enum
Mike Becker <universe@uap-core.de>
parents:
86
diff
changeset
|
34 | import de.uapcore.lightpit.RequestMapping; |
167
3f30adba1c63
major refactoring of DAO architecture - also fixes #114
Mike Becker <universe@uap-core.de>
parents:
159
diff
changeset
|
35 | import de.uapcore.lightpit.dao.DataAccessObject; |
51
dd0a45ae25d7
adds the possibility to add users / developers
Mike Becker <universe@uap-core.de>
parents:
diff
changeset
|
36 | import de.uapcore.lightpit.entities.User; |
86
0a658e53177c
improves issue overview and adds progress information
Mike Becker <universe@uap-core.de>
parents:
79
diff
changeset
|
37 | import de.uapcore.lightpit.viewmodel.UsersEditView; |
0a658e53177c
improves issue overview and adds progress information
Mike Becker <universe@uap-core.de>
parents:
79
diff
changeset
|
38 | import de.uapcore.lightpit.viewmodel.UsersView; |
59 | 39 | import org.slf4j.Logger; |
40 | import org.slf4j.LoggerFactory; | |
51
dd0a45ae25d7
adds the possibility to add users / developers
Mike Becker <universe@uap-core.de>
parents:
diff
changeset
|
41 | |
157
1e6f16fad3a5
removes ResponseType enum
Mike Becker <universe@uap-core.de>
parents:
86
diff
changeset
|
42 | import javax.servlet.ServletException; |
51
dd0a45ae25d7
adds the possibility to add users / developers
Mike Becker <universe@uap-core.de>
parents:
diff
changeset
|
43 | import javax.servlet.annotation.WebServlet; |
dd0a45ae25d7
adds the possibility to add users / developers
Mike Becker <universe@uap-core.de>
parents:
diff
changeset
|
44 | import javax.servlet.http.HttpServletRequest; |
157
1e6f16fad3a5
removes ResponseType enum
Mike Becker <universe@uap-core.de>
parents:
86
diff
changeset
|
45 | import javax.servlet.http.HttpServletResponse; |
1e6f16fad3a5
removes ResponseType enum
Mike Becker <universe@uap-core.de>
parents:
86
diff
changeset
|
46 | import java.io.IOException; |
51
dd0a45ae25d7
adds the possibility to add users / developers
Mike Becker <universe@uap-core.de>
parents:
diff
changeset
|
47 | import java.sql.SQLException; |
59 | 48 | import java.util.NoSuchElementException; |
51
dd0a45ae25d7
adds the possibility to add users / developers
Mike Becker <universe@uap-core.de>
parents:
diff
changeset
|
49 | |
dd0a45ae25d7
adds the possibility to add users / developers
Mike Becker <universe@uap-core.de>
parents:
diff
changeset
|
50 | @WebServlet( |
dd0a45ae25d7
adds the possibility to add users / developers
Mike Becker <universe@uap-core.de>
parents:
diff
changeset
|
51 | name = "UsersModule", |
dd0a45ae25d7
adds the possibility to add users / developers
Mike Becker <universe@uap-core.de>
parents:
diff
changeset
|
52 | urlPatterns = "/teams/*" |
dd0a45ae25d7
adds the possibility to add users / developers
Mike Becker <universe@uap-core.de>
parents:
diff
changeset
|
53 | ) |
179
623c340058f3
migrates the utility classes for the AbstractServlet
Mike Becker <universe@uap-core.de>
parents:
167
diff
changeset
|
54 | public final class UsersModule extends AbstractServlet { |
51
dd0a45ae25d7
adds the possibility to add users / developers
Mike Becker <universe@uap-core.de>
parents:
diff
changeset
|
55 | |
59 | 56 | private static final Logger LOG = LoggerFactory.getLogger(UsersModule.class); |
57 | ||
51
dd0a45ae25d7
adds the possibility to add users / developers
Mike Becker <universe@uap-core.de>
parents:
diff
changeset
|
58 | @RequestMapping(method = HttpMethod.GET) |
167
3f30adba1c63
major refactoring of DAO architecture - also fixes #114
Mike Becker <universe@uap-core.de>
parents:
159
diff
changeset
|
59 | public void index(HttpServletRequest req, HttpServletResponse resp, DataAccessObject dao) throws SQLException, ServletException, IOException { |
86
0a658e53177c
improves issue overview and adds progress information
Mike Becker <universe@uap-core.de>
parents:
79
diff
changeset
|
60 | final var viewModel = new UsersView(); |
167
3f30adba1c63
major refactoring of DAO architecture - also fixes #114
Mike Becker <universe@uap-core.de>
parents:
159
diff
changeset
|
61 | viewModel.setUsers(dao.listUsers()); |
86
0a658e53177c
improves issue overview and adds progress information
Mike Becker <universe@uap-core.de>
parents:
79
diff
changeset
|
62 | setViewModel(req, viewModel); |
74
91d1fc2a3a14
removes that dynamic_fragment bullshit
Mike Becker <universe@uap-core.de>
parents:
66
diff
changeset
|
63 | setContentPage(req, "users"); |
51
dd0a45ae25d7
adds the possibility to add users / developers
Mike Becker <universe@uap-core.de>
parents:
diff
changeset
|
64 | |
157
1e6f16fad3a5
removes ResponseType enum
Mike Becker <universe@uap-core.de>
parents:
86
diff
changeset
|
65 | renderSite(req, resp); |
51
dd0a45ae25d7
adds the possibility to add users / developers
Mike Becker <universe@uap-core.de>
parents:
diff
changeset
|
66 | } |
dd0a45ae25d7
adds the possibility to add users / developers
Mike Becker <universe@uap-core.de>
parents:
diff
changeset
|
67 | |
dd0a45ae25d7
adds the possibility to add users / developers
Mike Becker <universe@uap-core.de>
parents:
diff
changeset
|
68 | @RequestMapping(requestPath = "edit", method = HttpMethod.GET) |
167
3f30adba1c63
major refactoring of DAO architecture - also fixes #114
Mike Becker <universe@uap-core.de>
parents:
159
diff
changeset
|
69 | public void edit(HttpServletRequest req, HttpServletResponse resp, DataAccessObject dao) throws SQLException, ServletException, IOException { |
51
dd0a45ae25d7
adds the possibility to add users / developers
Mike Becker <universe@uap-core.de>
parents:
diff
changeset
|
70 | |
86
0a658e53177c
improves issue overview and adds progress information
Mike Becker <universe@uap-core.de>
parents:
79
diff
changeset
|
71 | final var viewModel = new UsersEditView(); |
167
3f30adba1c63
major refactoring of DAO architecture - also fixes #114
Mike Becker <universe@uap-core.de>
parents:
159
diff
changeset
|
72 | viewModel.setUser(findByParameter(req, Integer.class, "id", dao::findUser).orElse(new User(-1))); |
51
dd0a45ae25d7
adds the possibility to add users / developers
Mike Becker <universe@uap-core.de>
parents:
diff
changeset
|
73 | |
86
0a658e53177c
improves issue overview and adds progress information
Mike Becker <universe@uap-core.de>
parents:
79
diff
changeset
|
74 | setViewModel(req, viewModel); |
74
91d1fc2a3a14
removes that dynamic_fragment bullshit
Mike Becker <universe@uap-core.de>
parents:
66
diff
changeset
|
75 | setContentPage(req, "user-form"); |
51
dd0a45ae25d7
adds the possibility to add users / developers
Mike Becker <universe@uap-core.de>
parents:
diff
changeset
|
76 | |
157
1e6f16fad3a5
removes ResponseType enum
Mike Becker <universe@uap-core.de>
parents:
86
diff
changeset
|
77 | renderSite(req, resp); |
51
dd0a45ae25d7
adds the possibility to add users / developers
Mike Becker <universe@uap-core.de>
parents:
diff
changeset
|
78 | } |
dd0a45ae25d7
adds the possibility to add users / developers
Mike Becker <universe@uap-core.de>
parents:
diff
changeset
|
79 | |
dd0a45ae25d7
adds the possibility to add users / developers
Mike Becker <universe@uap-core.de>
parents:
diff
changeset
|
80 | @RequestMapping(requestPath = "commit", method = HttpMethod.POST) |
167
3f30adba1c63
major refactoring of DAO architecture - also fixes #114
Mike Becker <universe@uap-core.de>
parents:
159
diff
changeset
|
81 | public void commit(HttpServletRequest req, HttpServletResponse resp, DataAccessObject dao) throws ServletException, IOException { |
51
dd0a45ae25d7
adds the possibility to add users / developers
Mike Becker <universe@uap-core.de>
parents:
diff
changeset
|
82 | |
dd0a45ae25d7
adds the possibility to add users / developers
Mike Becker <universe@uap-core.de>
parents:
diff
changeset
|
83 | User user = new User(-1); |
dd0a45ae25d7
adds the possibility to add users / developers
Mike Becker <universe@uap-core.de>
parents:
diff
changeset
|
84 | try { |
dd0a45ae25d7
adds the possibility to add users / developers
Mike Becker <universe@uap-core.de>
parents:
diff
changeset
|
85 | user = new User(getParameter(req, Integer.class, "userid").orElseThrow()); |
dd0a45ae25d7
adds the possibility to add users / developers
Mike Becker <universe@uap-core.de>
parents:
diff
changeset
|
86 | user.setUsername(getParameter(req, String.class, "username").orElseThrow()); |
dd0a45ae25d7
adds the possibility to add users / developers
Mike Becker <universe@uap-core.de>
parents:
diff
changeset
|
87 | getParameter(req, String.class, "givenname").ifPresent(user::setGivenname); |
dd0a45ae25d7
adds the possibility to add users / developers
Mike Becker <universe@uap-core.de>
parents:
diff
changeset
|
88 | getParameter(req, String.class, "lastname").ifPresent(user::setLastname); |
dd0a45ae25d7
adds the possibility to add users / developers
Mike Becker <universe@uap-core.de>
parents:
diff
changeset
|
89 | getParameter(req, String.class, "mail").ifPresent(user::setMail); |
dd0a45ae25d7
adds the possibility to add users / developers
Mike Becker <universe@uap-core.de>
parents:
diff
changeset
|
90 | |
159 | 91 | if (user.getId() > 0) { |
167
3f30adba1c63
major refactoring of DAO architecture - also fixes #114
Mike Becker <universe@uap-core.de>
parents:
159
diff
changeset
|
92 | dao.updateUser(user); |
159 | 93 | } else { |
167
3f30adba1c63
major refactoring of DAO architecture - also fixes #114
Mike Becker <universe@uap-core.de>
parents:
159
diff
changeset
|
94 | dao.insertUser(user); |
159 | 95 | } |
51
dd0a45ae25d7
adds the possibility to add users / developers
Mike Becker <universe@uap-core.de>
parents:
diff
changeset
|
96 | |
dd0a45ae25d7
adds the possibility to add users / developers
Mike Becker <universe@uap-core.de>
parents:
diff
changeset
|
97 | setRedirectLocation(req, "./teams/"); |
74
91d1fc2a3a14
removes that dynamic_fragment bullshit
Mike Becker <universe@uap-core.de>
parents:
66
diff
changeset
|
98 | setContentPage(req, Constants.JSP_COMMIT_SUCCESSFUL); |
59 | 99 | |
100 | LOG.debug("Successfully updated user {}", user.getUsername()); | |
159 | 101 | } catch (NoSuchElementException | IllegalArgumentException ex) { |
86
0a658e53177c
improves issue overview and adds progress information
Mike Becker <universe@uap-core.de>
parents:
79
diff
changeset
|
102 | final var viewModel = new UsersEditView(); |
0a658e53177c
improves issue overview and adds progress information
Mike Becker <universe@uap-core.de>
parents:
79
diff
changeset
|
103 | viewModel.setUser(user); |
0a658e53177c
improves issue overview and adds progress information
Mike Becker <universe@uap-core.de>
parents:
79
diff
changeset
|
104 | // TODO: viewModel.setErrorText() |
0a658e53177c
improves issue overview and adds progress information
Mike Becker <universe@uap-core.de>
parents:
79
diff
changeset
|
105 | setViewModel(req, viewModel); |
74
91d1fc2a3a14
removes that dynamic_fragment bullshit
Mike Becker <universe@uap-core.de>
parents:
66
diff
changeset
|
106 | setContentPage(req, "user-form"); |
59 | 107 | LOG.warn("Form validation failure: {}", ex.getMessage()); |
108 | LOG.debug("Details:", ex); | |
51
dd0a45ae25d7
adds the possibility to add users / developers
Mike Becker <universe@uap-core.de>
parents:
diff
changeset
|
109 | } |
dd0a45ae25d7
adds the possibility to add users / developers
Mike Becker <universe@uap-core.de>
parents:
diff
changeset
|
110 | |
157
1e6f16fad3a5
removes ResponseType enum
Mike Becker <universe@uap-core.de>
parents:
86
diff
changeset
|
111 | renderSite(req, resp); |
51
dd0a45ae25d7
adds the possibility to add users / developers
Mike Becker <universe@uap-core.de>
parents:
diff
changeset
|
112 | } |
dd0a45ae25d7
adds the possibility to add users / developers
Mike Becker <universe@uap-core.de>
parents:
diff
changeset
|
113 | } |