Thu, 15 Oct 2020 11:42:43 +0200
fixes progress percentages always floored resulting in 1% open even if there are no open issues
41
4f1c026a8aab
adds files for ProjectsModule
Mike Becker <universe@uap-core.de>
parents:
diff
changeset
|
1 | /* |
4f1c026a8aab
adds files for ProjectsModule
Mike Becker <universe@uap-core.de>
parents:
diff
changeset
|
2 | * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER. |
4f1c026a8aab
adds files for ProjectsModule
Mike Becker <universe@uap-core.de>
parents:
diff
changeset
|
3 | * |
4f1c026a8aab
adds files for ProjectsModule
Mike Becker <universe@uap-core.de>
parents:
diff
changeset
|
4 | * Copyright 2018 Mike Becker. All rights reserved. |
4f1c026a8aab
adds files for ProjectsModule
Mike Becker <universe@uap-core.de>
parents:
diff
changeset
|
5 | * |
4f1c026a8aab
adds files for ProjectsModule
Mike Becker <universe@uap-core.de>
parents:
diff
changeset
|
6 | * Redistribution and use in source and binary forms, with or without |
4f1c026a8aab
adds files for ProjectsModule
Mike Becker <universe@uap-core.de>
parents:
diff
changeset
|
7 | * modification, are permitted provided that the following conditions are met: |
4f1c026a8aab
adds files for ProjectsModule
Mike Becker <universe@uap-core.de>
parents:
diff
changeset
|
8 | * |
4f1c026a8aab
adds files for ProjectsModule
Mike Becker <universe@uap-core.de>
parents:
diff
changeset
|
9 | * 1. Redistributions of source code must retain the above copyright |
4f1c026a8aab
adds files for ProjectsModule
Mike Becker <universe@uap-core.de>
parents:
diff
changeset
|
10 | * notice, this list of conditions and the following disclaimer. |
4f1c026a8aab
adds files for ProjectsModule
Mike Becker <universe@uap-core.de>
parents:
diff
changeset
|
11 | * |
4f1c026a8aab
adds files for ProjectsModule
Mike Becker <universe@uap-core.de>
parents:
diff
changeset
|
12 | * 2. Redistributions in binary form must reproduce the above copyright |
4f1c026a8aab
adds files for ProjectsModule
Mike Becker <universe@uap-core.de>
parents:
diff
changeset
|
13 | * notice, this list of conditions and the following disclaimer in the |
4f1c026a8aab
adds files for ProjectsModule
Mike Becker <universe@uap-core.de>
parents:
diff
changeset
|
14 | * documentation and/or other materials provided with the distribution. |
4f1c026a8aab
adds files for ProjectsModule
Mike Becker <universe@uap-core.de>
parents:
diff
changeset
|
15 | * |
4f1c026a8aab
adds files for ProjectsModule
Mike Becker <universe@uap-core.de>
parents:
diff
changeset
|
16 | * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" |
4f1c026a8aab
adds files for ProjectsModule
Mike Becker <universe@uap-core.de>
parents:
diff
changeset
|
17 | * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE |
4f1c026a8aab
adds files for ProjectsModule
Mike Becker <universe@uap-core.de>
parents:
diff
changeset
|
18 | * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE |
4f1c026a8aab
adds files for ProjectsModule
Mike Becker <universe@uap-core.de>
parents:
diff
changeset
|
19 | * ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE |
4f1c026a8aab
adds files for ProjectsModule
Mike Becker <universe@uap-core.de>
parents:
diff
changeset
|
20 | * LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR |
4f1c026a8aab
adds files for ProjectsModule
Mike Becker <universe@uap-core.de>
parents:
diff
changeset
|
21 | * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF |
4f1c026a8aab
adds files for ProjectsModule
Mike Becker <universe@uap-core.de>
parents:
diff
changeset
|
22 | * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS |
4f1c026a8aab
adds files for ProjectsModule
Mike Becker <universe@uap-core.de>
parents:
diff
changeset
|
23 | * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN |
4f1c026a8aab
adds files for ProjectsModule
Mike Becker <universe@uap-core.de>
parents:
diff
changeset
|
24 | * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) |
4f1c026a8aab
adds files for ProjectsModule
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 |
4f1c026a8aab
adds files for ProjectsModule
Mike Becker <universe@uap-core.de>
parents:
diff
changeset
|
26 | * POSSIBILITY OF SUCH DAMAGE. |
4f1c026a8aab
adds files for ProjectsModule
Mike Becker <universe@uap-core.de>
parents:
diff
changeset
|
27 | * |
4f1c026a8aab
adds files for ProjectsModule
Mike Becker <universe@uap-core.de>
parents:
diff
changeset
|
28 | */ |
4f1c026a8aab
adds files for ProjectsModule
Mike Becker <universe@uap-core.de>
parents:
diff
changeset
|
29 | package de.uapcore.lightpit.modules; |
4f1c026a8aab
adds files for ProjectsModule
Mike Becker <universe@uap-core.de>
parents:
diff
changeset
|
30 | |
4f1c026a8aab
adds files for ProjectsModule
Mike Becker <universe@uap-core.de>
parents:
diff
changeset
|
31 | |
4f1c026a8aab
adds files for ProjectsModule
Mike Becker <universe@uap-core.de>
parents:
diff
changeset
|
32 | import de.uapcore.lightpit.*; |
4f1c026a8aab
adds files for ProjectsModule
Mike Becker <universe@uap-core.de>
parents:
diff
changeset
|
33 | import de.uapcore.lightpit.dao.DataAccessObjects; |
64
0f1746c6abfb
adds backend methods for issues (TODO: implement commitIssue())
Mike Becker <universe@uap-core.de>
parents:
61
diff
changeset
|
34 | import de.uapcore.lightpit.entities.*; |
86
0a658e53177c
improves issue overview and adds progress information
Mike Becker <universe@uap-core.de>
parents:
83
diff
changeset
|
35 | import de.uapcore.lightpit.viewmodel.*; |
121
428dca747d6b
adds application level issue sorting (fixes #19)
Mike Becker <universe@uap-core.de>
parents:
118
diff
changeset
|
36 | import de.uapcore.lightpit.viewmodel.util.IssueSorter; |
59 | 37 | import org.slf4j.Logger; |
38 | import org.slf4j.LoggerFactory; | |
41
4f1c026a8aab
adds files for ProjectsModule
Mike Becker <universe@uap-core.de>
parents:
diff
changeset
|
39 | |
4f1c026a8aab
adds files for ProjectsModule
Mike Becker <universe@uap-core.de>
parents:
diff
changeset
|
40 | import javax.servlet.annotation.WebServlet; |
4f1c026a8aab
adds files for ProjectsModule
Mike Becker <universe@uap-core.de>
parents:
diff
changeset
|
41 | import javax.servlet.http.HttpServletRequest; |
59 | 42 | import javax.servlet.http.HttpServletResponse; |
43 | import java.io.IOException; | |
75
33b6843fdf8a
adds the ability to create and edit issues
Mike Becker <universe@uap-core.de>
parents:
74
diff
changeset
|
44 | import java.sql.Date; |
47
57cfb94ab99f
projects can now be added and updated
Mike Becker <universe@uap-core.de>
parents:
45
diff
changeset
|
45 | import java.sql.SQLException; |
86
0a658e53177c
improves issue overview and adds progress information
Mike Becker <universe@uap-core.de>
parents:
83
diff
changeset
|
46 | import java.util.NoSuchElementException; |
99 | 47 | import java.util.Optional; |
83
24a3596b8f98
adds version selection in issue editor
Mike Becker <universe@uap-core.de>
parents:
81
diff
changeset
|
48 | import java.util.stream.Collectors; |
24a3596b8f98
adds version selection in issue editor
Mike Becker <universe@uap-core.de>
parents:
81
diff
changeset
|
49 | import java.util.stream.Stream; |
41
4f1c026a8aab
adds files for ProjectsModule
Mike Becker <universe@uap-core.de>
parents:
diff
changeset
|
50 | |
52 | 51 | import static de.uapcore.lightpit.Functions.fqn; |
52 | ||
41
4f1c026a8aab
adds files for ProjectsModule
Mike Becker <universe@uap-core.de>
parents:
diff
changeset
|
53 | @WebServlet( |
4f1c026a8aab
adds files for ProjectsModule
Mike Becker <universe@uap-core.de>
parents:
diff
changeset
|
54 | name = "ProjectsModule", |
4f1c026a8aab
adds files for ProjectsModule
Mike Becker <universe@uap-core.de>
parents:
diff
changeset
|
55 | urlPatterns = "/projects/*" |
4f1c026a8aab
adds files for ProjectsModule
Mike Becker <universe@uap-core.de>
parents:
diff
changeset
|
56 | ) |
4f1c026a8aab
adds files for ProjectsModule
Mike Becker <universe@uap-core.de>
parents:
diff
changeset
|
57 | public final class ProjectsModule extends AbstractLightPITServlet { |
4f1c026a8aab
adds files for ProjectsModule
Mike Becker <universe@uap-core.de>
parents:
diff
changeset
|
58 | |
59 | 59 | private static final Logger LOG = LoggerFactory.getLogger(ProjectsModule.class); |
60 | ||
99 | 61 | private static final String SESSION_ATTR_SELECTED_PROJECT = fqn(ProjectsModule.class, "selected_project"); |
62 | private static final String SESSION_ATTR_SELECTED_VERSION = fqn(ProjectsModule.class, "selected_version"); | |
63 | private static final String PARAMETER_SELECTED_PROJECT = "pid"; | |
64 | private static final String PARAMETER_SELECTED_VERSION = "vid"; | |
71 | 65 | |
78
bb4c52bf3439
bloat removal 2/3 - moduleInfo
Mike Becker <universe@uap-core.de>
parents:
76
diff
changeset
|
66 | @Override |
bb4c52bf3439
bloat removal 2/3 - moduleInfo
Mike Becker <universe@uap-core.de>
parents:
76
diff
changeset
|
67 | protected String getResourceBundleName() { |
bb4c52bf3439
bloat removal 2/3 - moduleInfo
Mike Becker <universe@uap-core.de>
parents:
76
diff
changeset
|
68 | return "localization.projects"; |
bb4c52bf3439
bloat removal 2/3 - moduleInfo
Mike Becker <universe@uap-core.de>
parents:
76
diff
changeset
|
69 | } |
71 | 70 | |
99 | 71 | private int syncParamWithSession(HttpServletRequest req, String param, String attr) { |
72 | final var session = req.getSession(); | |
73 | final var idParam = getParameter(req, Integer.class, param); | |
74 | final int id; | |
75 | if (idParam.isPresent()) { | |
76 | id = idParam.get(); | |
77 | session.setAttribute(attr, id); | |
78 | } else { | |
79 | id = Optional.ofNullable(session.getAttribute(attr)).map(x->(Integer)x).orElse(-1); | |
80 | } | |
81 | return id; | |
82 | } | |
83 | ||
84 | private void populate(ProjectView viewModel, HttpServletRequest req, DataAccessObjects dao) throws SQLException { | |
85 | final var projectDao = dao.getProjectDao(); | |
86 | final var versionDao = dao.getVersionDao(); | |
87 | ||
88 | projectDao.list().stream().map(ProjectInfo::new).forEach(viewModel.getProjectList()::add); | |
89 | ||
90 | // Select Project | |
91 | final int pid = syncParamWithSession(req, PARAMETER_SELECTED_PROJECT, SESSION_ATTR_SELECTED_PROJECT); | |
92 | if (pid >= 0) { | |
93 | final var project = projectDao.find(pid); | |
107
b5f740a87af4
fixes misbehavior when a non-existing project ID is selected
Mike Becker <universe@uap-core.de>
parents:
105
diff
changeset
|
94 | if (project == null) { |
b5f740a87af4
fixes misbehavior when a non-existing project ID is selected
Mike Becker <universe@uap-core.de>
parents:
105
diff
changeset
|
95 | req.setAttribute(SESSION_ATTR_SELECTED_PROJECT, -1); |
b5f740a87af4
fixes misbehavior when a non-existing project ID is selected
Mike Becker <universe@uap-core.de>
parents:
105
diff
changeset
|
96 | } else { |
b5f740a87af4
fixes misbehavior when a non-existing project ID is selected
Mike Becker <universe@uap-core.de>
parents:
105
diff
changeset
|
97 | final var info = new ProjectInfo(project); |
b5f740a87af4
fixes misbehavior when a non-existing project ID is selected
Mike Becker <universe@uap-core.de>
parents:
105
diff
changeset
|
98 | info.setVersions(versionDao.list(project)); |
b5f740a87af4
fixes misbehavior when a non-existing project ID is selected
Mike Becker <universe@uap-core.de>
parents:
105
diff
changeset
|
99 | info.setIssueSummary(projectDao.getIssueSummary(project)); |
b5f740a87af4
fixes misbehavior when a non-existing project ID is selected
Mike Becker <universe@uap-core.de>
parents:
105
diff
changeset
|
100 | viewModel.setProjectInfo(info); |
b5f740a87af4
fixes misbehavior when a non-existing project ID is selected
Mike Becker <universe@uap-core.de>
parents:
105
diff
changeset
|
101 | } |
99 | 102 | } |
103 | ||
104 | // Select Version | |
105 | final int vid = syncParamWithSession(req, PARAMETER_SELECTED_VERSION, SESSION_ATTR_SELECTED_VERSION); | |
106 | if (vid >= 0) { | |
107 | viewModel.setVersionFilter(versionDao.find(vid)); | |
108 | } | |
109 | } | |
110 | ||
111 | private ResponseType forwardView(HttpServletRequest req, ProjectView viewModel, String name) { | |
112 | setViewModel(req, viewModel); | |
113 | setContentPage(req, name); | |
114 | setStylesheet(req, "projects"); | |
109 | 115 | setNavigationMenu(req, "project-navmenu"); |
99 | 116 | return ResponseType.HTML; |
64
0f1746c6abfb
adds backend methods for issues (TODO: implement commitIssue())
Mike Becker <universe@uap-core.de>
parents:
61
diff
changeset
|
117 | } |
0f1746c6abfb
adds backend methods for issues (TODO: implement commitIssue())
Mike Becker <universe@uap-core.de>
parents:
61
diff
changeset
|
118 | |
61
3e287f361c7a
moves project index to separate sub path
Mike Becker <universe@uap-core.de>
parents:
59
diff
changeset
|
119 | @RequestMapping(method = HttpMethod.GET) |
47
57cfb94ab99f
projects can now be added and updated
Mike Becker <universe@uap-core.de>
parents:
45
diff
changeset
|
120 | public ResponseType index(HttpServletRequest req, DataAccessObjects dao) throws SQLException { |
99 | 121 | final var viewModel = new ProjectView(); |
122 | populate(viewModel, req, dao); | |
86
0a658e53177c
improves issue overview and adds progress information
Mike Becker <universe@uap-core.de>
parents:
83
diff
changeset
|
123 | |
0a658e53177c
improves issue overview and adds progress information
Mike Becker <universe@uap-core.de>
parents:
83
diff
changeset
|
124 | final var projectDao = dao.getProjectDao(); |
0a658e53177c
improves issue overview and adds progress information
Mike Becker <universe@uap-core.de>
parents:
83
diff
changeset
|
125 | final var versionDao = dao.getVersionDao(); |
0a658e53177c
improves issue overview and adds progress information
Mike Becker <universe@uap-core.de>
parents:
83
diff
changeset
|
126 | |
99 | 127 | for (var info : viewModel.getProjectList()) { |
128 | info.setVersions(versionDao.list(info.getProject())); | |
129 | info.setIssueSummary(projectDao.getIssueSummary(info.getProject())); | |
86
0a658e53177c
improves issue overview and adds progress information
Mike Becker <universe@uap-core.de>
parents:
83
diff
changeset
|
130 | } |
0a658e53177c
improves issue overview and adds progress information
Mike Becker <universe@uap-core.de>
parents:
83
diff
changeset
|
131 | |
99 | 132 | return forwardView(req, viewModel, "projects"); |
47
57cfb94ab99f
projects can now be added and updated
Mike Becker <universe@uap-core.de>
parents:
45
diff
changeset
|
133 | } |
57cfb94ab99f
projects can now be added and updated
Mike Becker <universe@uap-core.de>
parents:
45
diff
changeset
|
134 | |
99 | 135 | private void configure(ProjectEditView viewModel, Project project, DataAccessObjects dao) throws SQLException { |
136 | viewModel.setProject(project); | |
86
0a658e53177c
improves issue overview and adds progress information
Mike Becker <universe@uap-core.de>
parents:
83
diff
changeset
|
137 | viewModel.setUsers(dao.getUserDao().list()); |
71 | 138 | } |
139 | ||
47
57cfb94ab99f
projects can now be added and updated
Mike Becker <universe@uap-core.de>
parents:
45
diff
changeset
|
140 | @RequestMapping(requestPath = "edit", method = HttpMethod.GET) |
51
dd0a45ae25d7
adds the possibility to add users / developers
Mike Becker <universe@uap-core.de>
parents:
47
diff
changeset
|
141 | public ResponseType edit(HttpServletRequest req, DataAccessObjects dao) throws SQLException { |
99 | 142 | final var viewModel = new ProjectEditView(); |
143 | populate(viewModel, req, dao); | |
47
57cfb94ab99f
projects can now be added and updated
Mike Becker <universe@uap-core.de>
parents:
45
diff
changeset
|
144 | |
99 | 145 | final var project = Optional.ofNullable(viewModel.getProjectInfo()) |
146 | .map(ProjectInfo::getProject) | |
147 | .orElse(new Project(-1)); | |
148 | configure(viewModel, project, dao); | |
45
cc7f082c5ef3
simplifies menu generation, adds submenus and removes VersionsModule (versions will be part of the ProjectsModule)
Mike Becker <universe@uap-core.de>
parents:
43
diff
changeset
|
149 | |
99 | 150 | return forwardView(req, viewModel, "project-form"); |
45
cc7f082c5ef3
simplifies menu generation, adds submenus and removes VersionsModule (versions will be part of the ProjectsModule)
Mike Becker <universe@uap-core.de>
parents:
43
diff
changeset
|
151 | } |
cc7f082c5ef3
simplifies menu generation, adds submenus and removes VersionsModule (versions will be part of the ProjectsModule)
Mike Becker <universe@uap-core.de>
parents:
43
diff
changeset
|
152 | |
47
57cfb94ab99f
projects can now be added and updated
Mike Becker <universe@uap-core.de>
parents:
45
diff
changeset
|
153 | @RequestMapping(requestPath = "commit", method = HttpMethod.POST) |
68
ded1b5639bd3
adds request attribute users in commit() error path
Mike Becker <universe@uap-core.de>
parents:
67
diff
changeset
|
154 | public ResponseType commit(HttpServletRequest req, DataAccessObjects dao) throws SQLException { |
47
57cfb94ab99f
projects can now be added and updated
Mike Becker <universe@uap-core.de>
parents:
45
diff
changeset
|
155 | |
75
33b6843fdf8a
adds the ability to create and edit issues
Mike Becker <universe@uap-core.de>
parents:
74
diff
changeset
|
156 | Project project = new Project(-1); |
47
57cfb94ab99f
projects can now be added and updated
Mike Becker <universe@uap-core.de>
parents:
45
diff
changeset
|
157 | try { |
99 | 158 | project = new Project(getParameter(req, Integer.class, "pid").orElseThrow()); |
47
57cfb94ab99f
projects can now be added and updated
Mike Becker <universe@uap-core.de>
parents:
45
diff
changeset
|
159 | project.setName(getParameter(req, String.class, "name").orElseThrow()); |
57cfb94ab99f
projects can now be added and updated
Mike Becker <universe@uap-core.de>
parents:
45
diff
changeset
|
160 | getParameter(req, String.class, "description").ifPresent(project::setDescription); |
57cfb94ab99f
projects can now be added and updated
Mike Becker <universe@uap-core.de>
parents:
45
diff
changeset
|
161 | getParameter(req, String.class, "repoUrl").ifPresent(project::setRepoUrl); |
57cfb94ab99f
projects can now be added and updated
Mike Becker <universe@uap-core.de>
parents:
45
diff
changeset
|
162 | getParameter(req, Integer.class, "owner").map( |
57cfb94ab99f
projects can now be added and updated
Mike Becker <universe@uap-core.de>
parents:
45
diff
changeset
|
163 | ownerId -> ownerId >= 0 ? new User(ownerId) : null |
57cfb94ab99f
projects can now be added and updated
Mike Becker <universe@uap-core.de>
parents:
45
diff
changeset
|
164 | ).ifPresent(project::setOwner); |
57cfb94ab99f
projects can now be added and updated
Mike Becker <universe@uap-core.de>
parents:
45
diff
changeset
|
165 | |
57cfb94ab99f
projects can now be added and updated
Mike Becker <universe@uap-core.de>
parents:
45
diff
changeset
|
166 | dao.getProjectDao().saveOrUpdate(project); |
57cfb94ab99f
projects can now be added and updated
Mike Becker <universe@uap-core.de>
parents:
45
diff
changeset
|
167 | |
118
d3583959c875
adding a new project redirects to the projects overview (because we do not retrieve the ID of the inserted project yet)
Mike Becker <universe@uap-core.de>
parents:
110
diff
changeset
|
168 | setRedirectLocation(req, "./projects/"); |
74
91d1fc2a3a14
removes that dynamic_fragment bullshit
Mike Becker <universe@uap-core.de>
parents:
71
diff
changeset
|
169 | setContentPage(req, Constants.JSP_COMMIT_SUCCESSFUL); |
59 | 170 | LOG.debug("Successfully updated project {}", project.getName()); |
99 | 171 | |
172 | return ResponseType.HTML; | |
75
33b6843fdf8a
adds the ability to create and edit issues
Mike Becker <universe@uap-core.de>
parents:
74
diff
changeset
|
173 | } catch (NoSuchElementException | IllegalArgumentException | SQLException ex) { |
59 | 174 | LOG.warn("Form validation failure: {}", ex.getMessage()); |
175 | LOG.debug("Details:", ex); | |
99 | 176 | final var viewModel = new ProjectEditView(); |
177 | populate(viewModel, req, dao); | |
178 | configure(viewModel, project, dao); | |
179 | // TODO: error text | |
180 | return forwardView(req, viewModel, "project-form"); | |
47
57cfb94ab99f
projects can now be added and updated
Mike Becker <universe@uap-core.de>
parents:
45
diff
changeset
|
181 | } |
57cfb94ab99f
projects can now be added and updated
Mike Becker <universe@uap-core.de>
parents:
45
diff
changeset
|
182 | } |
57cfb94ab99f
projects can now be added and updated
Mike Becker <universe@uap-core.de>
parents:
45
diff
changeset
|
183 | |
70
821c4950b619
removes the sub menu and removes the home module
Mike Becker <universe@uap-core.de>
parents:
68
diff
changeset
|
184 | @RequestMapping(requestPath = "view", method = HttpMethod.GET) |
80
27a25f32048e
adds project overview page
Mike Becker <universe@uap-core.de>
parents:
79
diff
changeset
|
185 | public ResponseType view(HttpServletRequest req, HttpServletResponse resp, DataAccessObjects dao) throws SQLException, IOException { |
99 | 186 | final var viewModel = new ProjectDetailsView(); |
187 | populate(viewModel, req, dao); | |
86
0a658e53177c
improves issue overview and adds progress information
Mike Becker <universe@uap-core.de>
parents:
83
diff
changeset
|
188 | |
99 | 189 | if (viewModel.getProjectInfo() == null) { |
80
27a25f32048e
adds project overview page
Mike Becker <universe@uap-core.de>
parents:
79
diff
changeset
|
190 | resp.sendError(HttpServletResponse.SC_NOT_FOUND, "No project selected."); |
27a25f32048e
adds project overview page
Mike Becker <universe@uap-core.de>
parents:
79
diff
changeset
|
191 | return ResponseType.NONE; |
27a25f32048e
adds project overview page
Mike Becker <universe@uap-core.de>
parents:
79
diff
changeset
|
192 | } |
47
57cfb94ab99f
projects can now be added and updated
Mike Becker <universe@uap-core.de>
parents:
45
diff
changeset
|
193 | |
86
0a658e53177c
improves issue overview and adds progress information
Mike Becker <universe@uap-core.de>
parents:
83
diff
changeset
|
194 | final var issueDao = dao.getIssueDao(); |
70
821c4950b619
removes the sub menu and removes the home module
Mike Becker <universe@uap-core.de>
parents:
68
diff
changeset
|
195 | |
105
250c5cbb8276
simplifies issues per version view and re-adds edit version button
Mike Becker <universe@uap-core.de>
parents:
104
diff
changeset
|
196 | final var version = viewModel.getVersionFilter(); |
71 | 197 | |
99 | 198 | final var detailView = viewModel.getProjectDetails(); |
105
250c5cbb8276
simplifies issues per version view and re-adds edit version button
Mike Becker <universe@uap-core.de>
parents:
104
diff
changeset
|
199 | final var issues = issueDao.list(version); |
100
7e3c61c340d3
fixes issues and version information not set in correct order
Mike Becker <universe@uap-core.de>
parents:
99
diff
changeset
|
200 | for (var issue : issues) issueDao.joinVersionInformation(issue); |
121
428dca747d6b
adds application level issue sorting (fixes #19)
Mike Becker <universe@uap-core.de>
parents:
118
diff
changeset
|
201 | issues.sort(new IssueSorter( |
428dca747d6b
adds application level issue sorting (fixes #19)
Mike Becker <universe@uap-core.de>
parents:
118
diff
changeset
|
202 | new IssueSorter.Criteria(IssueSorter.Field.PHASE, true), |
428dca747d6b
adds application level issue sorting (fixes #19)
Mike Becker <universe@uap-core.de>
parents:
118
diff
changeset
|
203 | new IssueSorter.Criteria(IssueSorter.Field.ETA, true), |
428dca747d6b
adds application level issue sorting (fixes #19)
Mike Becker <universe@uap-core.de>
parents:
118
diff
changeset
|
204 | new IssueSorter.Criteria(IssueSorter.Field.UPDATED, false) |
428dca747d6b
adds application level issue sorting (fixes #19)
Mike Becker <universe@uap-core.de>
parents:
118
diff
changeset
|
205 | )); |
105
250c5cbb8276
simplifies issues per version view and re-adds edit version button
Mike Becker <universe@uap-core.de>
parents:
104
diff
changeset
|
206 | detailView.updateDetails(issues, version); |
86
0a658e53177c
improves issue overview and adds progress information
Mike Becker <universe@uap-core.de>
parents:
83
diff
changeset
|
207 | |
99 | 208 | return forwardView(req, viewModel, "project-details"); |
71 | 209 | } |
210 | ||
109 | 211 | @RequestMapping(requestPath = "versions", method = HttpMethod.GET) |
212 | public ResponseType versions(HttpServletRequest req, HttpServletResponse resp, DataAccessObjects dao) throws IOException, SQLException { | |
213 | final var viewModel = new VersionsView(); | |
214 | populate(viewModel, req, dao); | |
215 | viewModel.setVersionFilter(null); | |
216 | ||
217 | final var projectInfo = viewModel.getProjectInfo(); | |
218 | if (projectInfo == null) { | |
219 | resp.sendError(HttpServletResponse.SC_NOT_FOUND, "No project selected."); | |
220 | return ResponseType.NONE; | |
221 | } | |
222 | ||
223 | final var issueDao = dao.getIssueDao(); | |
224 | final var issues = issueDao.list(projectInfo.getProject()); | |
225 | for (var issue : issues) issueDao.joinVersionInformation(issue); | |
226 | viewModel.update(projectInfo.getVersions(), issues); | |
227 | ||
228 | return forwardView(req, viewModel, "versions"); | |
229 | } | |
230 | ||
59 | 231 | @RequestMapping(requestPath = "versions/edit", method = HttpMethod.GET) |
110
9d0be0b1580f
adds indicators for version status
Mike Becker <universe@uap-core.de>
parents:
109
diff
changeset
|
232 | public ResponseType editVersion(HttpServletRequest req, HttpServletResponse resp, DataAccessObjects dao) throws IOException, SQLException { |
99 | 233 | final var viewModel = new VersionEditView(); |
234 | populate(viewModel, req, dao); | |
235 | ||
110
9d0be0b1580f
adds indicators for version status
Mike Becker <universe@uap-core.de>
parents:
109
diff
changeset
|
236 | if (viewModel.getProjectInfo() == null) { |
9d0be0b1580f
adds indicators for version status
Mike Becker <universe@uap-core.de>
parents:
109
diff
changeset
|
237 | resp.sendError(HttpServletResponse.SC_NOT_FOUND, "No project selected."); |
9d0be0b1580f
adds indicators for version status
Mike Becker <universe@uap-core.de>
parents:
109
diff
changeset
|
238 | return ResponseType.NONE; |
9d0be0b1580f
adds indicators for version status
Mike Becker <universe@uap-core.de>
parents:
109
diff
changeset
|
239 | } |
9d0be0b1580f
adds indicators for version status
Mike Becker <universe@uap-core.de>
parents:
109
diff
changeset
|
240 | |
99 | 241 | if (viewModel.getVersionFilter() == null) { |
110
9d0be0b1580f
adds indicators for version status
Mike Becker <universe@uap-core.de>
parents:
109
diff
changeset
|
242 | final var version = new Version(-1); |
9d0be0b1580f
adds indicators for version status
Mike Becker <universe@uap-core.de>
parents:
109
diff
changeset
|
243 | version.setProject(viewModel.getProjectInfo().getProject()); |
9d0be0b1580f
adds indicators for version status
Mike Becker <universe@uap-core.de>
parents:
109
diff
changeset
|
244 | viewModel.setVersion(version); |
86
0a658e53177c
improves issue overview and adds progress information
Mike Becker <universe@uap-core.de>
parents:
83
diff
changeset
|
245 | } else { |
99 | 246 | viewModel.setVersion(viewModel.getVersionFilter()); |
86
0a658e53177c
improves issue overview and adds progress information
Mike Becker <universe@uap-core.de>
parents:
83
diff
changeset
|
247 | } |
59 | 248 | |
99 | 249 | return forwardView(req, viewModel, "version-form"); |
59 | 250 | } |
251 | ||
252 | @RequestMapping(requestPath = "versions/commit", method = HttpMethod.POST) | |
80
27a25f32048e
adds project overview page
Mike Becker <universe@uap-core.de>
parents:
79
diff
changeset
|
253 | public ResponseType commitVersion(HttpServletRequest req, HttpServletResponse resp, DataAccessObjects dao) throws SQLException { |
59 | 254 | |
86
0a658e53177c
improves issue overview and adds progress information
Mike Becker <universe@uap-core.de>
parents:
83
diff
changeset
|
255 | var version = new Version(-1); |
59 | 256 | try { |
86
0a658e53177c
improves issue overview and adds progress information
Mike Becker <universe@uap-core.de>
parents:
83
diff
changeset
|
257 | version = new Version(getParameter(req, Integer.class, "id").orElseThrow()); |
0a658e53177c
improves issue overview and adds progress information
Mike Becker <universe@uap-core.de>
parents:
83
diff
changeset
|
258 | version.setProject(new Project(getParameter(req, Integer.class, "pid").orElseThrow())); |
59 | 259 | version.setName(getParameter(req, String.class, "name").orElseThrow()); |
260 | getParameter(req, Integer.class, "ordinal").ifPresent(version::setOrdinal); | |
261 | version.setStatus(VersionStatus.valueOf(getParameter(req, String.class, "status").orElseThrow())); | |
262 | dao.getVersionDao().saveOrUpdate(version); | |
263 | ||
75
33b6843fdf8a
adds the ability to create and edit issues
Mike Becker <universe@uap-core.de>
parents:
74
diff
changeset
|
264 | // specifying the pid parameter will purposely reset the session selected version! |
109 | 265 | setRedirectLocation(req, "./projects/versions?pid=" + version.getProject().getId()); |
74
91d1fc2a3a14
removes that dynamic_fragment bullshit
Mike Becker <universe@uap-core.de>
parents:
71
diff
changeset
|
266 | setContentPage(req, Constants.JSP_COMMIT_SUCCESSFUL); |
75
33b6843fdf8a
adds the ability to create and edit issues
Mike Becker <universe@uap-core.de>
parents:
74
diff
changeset
|
267 | } catch (NoSuchElementException | IllegalArgumentException | SQLException ex) { |
59 | 268 | LOG.warn("Form validation failure: {}", ex.getMessage()); |
269 | LOG.debug("Details:", ex); | |
99 | 270 | final var viewModel = new VersionEditView(); |
271 | populate(viewModel, req, dao); | |
272 | viewModel.setVersion(version); | |
86
0a658e53177c
improves issue overview and adds progress information
Mike Becker <universe@uap-core.de>
parents:
83
diff
changeset
|
273 | // TODO: set Error Text |
99 | 274 | return forwardView(req, viewModel, "version-form"); |
59 | 275 | } |
41
4f1c026a8aab
adds files for ProjectsModule
Mike Becker <universe@uap-core.de>
parents:
diff
changeset
|
276 | |
43
9abf0bf44c7b
renames some crappy constants
Mike Becker <universe@uap-core.de>
parents:
42
diff
changeset
|
277 | return ResponseType.HTML; |
41
4f1c026a8aab
adds files for ProjectsModule
Mike Becker <universe@uap-core.de>
parents:
diff
changeset
|
278 | } |
64
0f1746c6abfb
adds backend methods for issues (TODO: implement commitIssue())
Mike Becker <universe@uap-core.de>
parents:
61
diff
changeset
|
279 | |
99 | 280 | private void configure(IssueEditView viewModel, Issue issue, DataAccessObjects dao) throws SQLException { |
281 | issue.setProject(viewModel.getProjectInfo().getProject()); | |
282 | viewModel.setIssue(issue); | |
283 | viewModel.configureVersionSelectors(viewModel.getProjectInfo().getVersions()); | |
86
0a658e53177c
improves issue overview and adds progress information
Mike Becker <universe@uap-core.de>
parents:
83
diff
changeset
|
284 | viewModel.setUsers(dao.getUserDao().list()); |
124 | 285 | if (issue.getId() >= 0) { |
286 | viewModel.setComments(dao.getIssueDao().listComments(issue)); | |
287 | } | |
71 | 288 | } |
289 | ||
64
0f1746c6abfb
adds backend methods for issues (TODO: implement commitIssue())
Mike Becker <universe@uap-core.de>
parents:
61
diff
changeset
|
290 | @RequestMapping(requestPath = "issues/edit", method = HttpMethod.GET) |
80
27a25f32048e
adds project overview page
Mike Becker <universe@uap-core.de>
parents:
79
diff
changeset
|
291 | public ResponseType editIssue(HttpServletRequest req, HttpServletResponse resp, DataAccessObjects dao) throws SQLException { |
99 | 292 | final var viewModel = new IssueEditView(); |
124 | 293 | populate(viewModel, req, dao); |
99 | 294 | |
295 | final var issueParam = getParameter(req, Integer.class, "issue"); | |
296 | if (issueParam.isPresent()) { | |
104
8be80ea4f52b
fixes issue not containing version information in issue form
Mike Becker <universe@uap-core.de>
parents:
102
diff
changeset
|
297 | final var issueDao = dao.getIssueDao(); |
8be80ea4f52b
fixes issue not containing version information in issue form
Mike Becker <universe@uap-core.de>
parents:
102
diff
changeset
|
298 | final var issue = issueDao.find(issueParam.get()); |
8be80ea4f52b
fixes issue not containing version information in issue form
Mike Becker <universe@uap-core.de>
parents:
102
diff
changeset
|
299 | issueDao.joinVersionInformation(issue); |
99 | 300 | req.getSession().setAttribute(SESSION_ATTR_SELECTED_PROJECT, issue.getProject().getId()); |
301 | configure(viewModel, issue, dao); | |
86
0a658e53177c
improves issue overview and adds progress information
Mike Becker <universe@uap-core.de>
parents:
83
diff
changeset
|
302 | } else { |
99 | 303 | configure(viewModel, new Issue(-1), dao); |
86
0a658e53177c
improves issue overview and adds progress information
Mike Becker <universe@uap-core.de>
parents:
83
diff
changeset
|
304 | } |
64
0f1746c6abfb
adds backend methods for issues (TODO: implement commitIssue())
Mike Becker <universe@uap-core.de>
parents:
61
diff
changeset
|
305 | |
99 | 306 | return forwardView(req, viewModel, "issue-form"); |
64
0f1746c6abfb
adds backend methods for issues (TODO: implement commitIssue())
Mike Becker <universe@uap-core.de>
parents:
61
diff
changeset
|
307 | } |
0f1746c6abfb
adds backend methods for issues (TODO: implement commitIssue())
Mike Becker <universe@uap-core.de>
parents:
61
diff
changeset
|
308 | |
0f1746c6abfb
adds backend methods for issues (TODO: implement commitIssue())
Mike Becker <universe@uap-core.de>
parents:
61
diff
changeset
|
309 | @RequestMapping(requestPath = "issues/commit", method = HttpMethod.POST) |
124 | 310 | public ResponseType commitIssue(HttpServletRequest req, DataAccessObjects dao) throws SQLException { |
86
0a658e53177c
improves issue overview and adds progress information
Mike Becker <universe@uap-core.de>
parents:
83
diff
changeset
|
311 | Issue issue = new Issue(-1); |
64
0f1746c6abfb
adds backend methods for issues (TODO: implement commitIssue())
Mike Becker <universe@uap-core.de>
parents:
61
diff
changeset
|
312 | try { |
86
0a658e53177c
improves issue overview and adds progress information
Mike Becker <universe@uap-core.de>
parents:
83
diff
changeset
|
313 | issue = new Issue(getParameter(req, Integer.class, "id").orElseThrow()); |
0a658e53177c
improves issue overview and adds progress information
Mike Becker <universe@uap-core.de>
parents:
83
diff
changeset
|
314 | issue.setProject(new Project(getParameter(req, Integer.class, "pid").orElseThrow())); |
75
33b6843fdf8a
adds the ability to create and edit issues
Mike Becker <universe@uap-core.de>
parents:
74
diff
changeset
|
315 | getParameter(req, String.class, "category").map(IssueCategory::valueOf).ifPresent(issue::setCategory); |
33b6843fdf8a
adds the ability to create and edit issues
Mike Becker <universe@uap-core.de>
parents:
74
diff
changeset
|
316 | getParameter(req, String.class, "status").map(IssueStatus::valueOf).ifPresent(issue::setStatus); |
33b6843fdf8a
adds the ability to create and edit issues
Mike Becker <universe@uap-core.de>
parents:
74
diff
changeset
|
317 | issue.setSubject(getParameter(req, String.class, "subject").orElseThrow()); |
33b6843fdf8a
adds the ability to create and edit issues
Mike Becker <universe@uap-core.de>
parents:
74
diff
changeset
|
318 | getParameter(req, Integer.class, "assignee").map( |
33b6843fdf8a
adds the ability to create and edit issues
Mike Becker <universe@uap-core.de>
parents:
74
diff
changeset
|
319 | userid -> userid >= 0 ? new User(userid) : null |
33b6843fdf8a
adds the ability to create and edit issues
Mike Becker <universe@uap-core.de>
parents:
74
diff
changeset
|
320 | ).ifPresent(issue::setAssignee); |
33b6843fdf8a
adds the ability to create and edit issues
Mike Becker <universe@uap-core.de>
parents:
74
diff
changeset
|
321 | getParameter(req, String.class, "description").ifPresent(issue::setDescription); |
33b6843fdf8a
adds the ability to create and edit issues
Mike Becker <universe@uap-core.de>
parents:
74
diff
changeset
|
322 | getParameter(req, Date.class, "eta").ifPresent(issue::setEta); |
83
24a3596b8f98
adds version selection in issue editor
Mike Becker <universe@uap-core.de>
parents:
81
diff
changeset
|
323 | |
24a3596b8f98
adds version selection in issue editor
Mike Becker <universe@uap-core.de>
parents:
81
diff
changeset
|
324 | getParameter(req, Integer[].class, "affected") |
24a3596b8f98
adds version selection in issue editor
Mike Becker <universe@uap-core.de>
parents:
81
diff
changeset
|
325 | .map(Stream::of) |
24a3596b8f98
adds version selection in issue editor
Mike Becker <universe@uap-core.de>
parents:
81
diff
changeset
|
326 | .map(stream -> |
96
b7b685f31e39
breadcrumb menu is now a sidebar navigation menu
Mike Becker <universe@uap-core.de>
parents:
88
diff
changeset
|
327 | stream.map(Version::new).collect(Collectors.toList()) |
83
24a3596b8f98
adds version selection in issue editor
Mike Becker <universe@uap-core.de>
parents:
81
diff
changeset
|
328 | ).ifPresent(issue::setAffectedVersions); |
24a3596b8f98
adds version selection in issue editor
Mike Becker <universe@uap-core.de>
parents:
81
diff
changeset
|
329 | getParameter(req, Integer[].class, "resolved") |
24a3596b8f98
adds version selection in issue editor
Mike Becker <universe@uap-core.de>
parents:
81
diff
changeset
|
330 | .map(Stream::of) |
24a3596b8f98
adds version selection in issue editor
Mike Becker <universe@uap-core.de>
parents:
81
diff
changeset
|
331 | .map(stream -> |
86
0a658e53177c
improves issue overview and adds progress information
Mike Becker <universe@uap-core.de>
parents:
83
diff
changeset
|
332 | stream.map(Version::new).collect(Collectors.toList()) |
83
24a3596b8f98
adds version selection in issue editor
Mike Becker <universe@uap-core.de>
parents:
81
diff
changeset
|
333 | ).ifPresent(issue::setResolvedVersions); |
24a3596b8f98
adds version selection in issue editor
Mike Becker <universe@uap-core.de>
parents:
81
diff
changeset
|
334 | |
64
0f1746c6abfb
adds backend methods for issues (TODO: implement commitIssue())
Mike Becker <universe@uap-core.de>
parents:
61
diff
changeset
|
335 | dao.getIssueDao().saveOrUpdate(issue); |
0f1746c6abfb
adds backend methods for issues (TODO: implement commitIssue())
Mike Becker <universe@uap-core.de>
parents:
61
diff
changeset
|
336 | |
96
b7b685f31e39
breadcrumb menu is now a sidebar navigation menu
Mike Becker <universe@uap-core.de>
parents:
88
diff
changeset
|
337 | // specifying the issue parameter keeps the edited issue as menu item |
102
7eee7cad093d
fixes wrong redirect url after committing an issue
Mike Becker <universe@uap-core.de>
parents:
100
diff
changeset
|
338 | setRedirectLocation(req, "./projects/view?pid=" + issue.getProject().getId()); |
74
91d1fc2a3a14
removes that dynamic_fragment bullshit
Mike Becker <universe@uap-core.de>
parents:
71
diff
changeset
|
339 | setContentPage(req, Constants.JSP_COMMIT_SUCCESSFUL); |
124 | 340 | |
341 | return ResponseType.HTML; | |
75
33b6843fdf8a
adds the ability to create and edit issues
Mike Becker <universe@uap-core.de>
parents:
74
diff
changeset
|
342 | } catch (NoSuchElementException | IllegalArgumentException | SQLException ex) { |
64
0f1746c6abfb
adds backend methods for issues (TODO: implement commitIssue())
Mike Becker <universe@uap-core.de>
parents:
61
diff
changeset
|
343 | // TODO: set request attribute with error text |
0f1746c6abfb
adds backend methods for issues (TODO: implement commitIssue())
Mike Becker <universe@uap-core.de>
parents:
61
diff
changeset
|
344 | LOG.warn("Form validation failure: {}", ex.getMessage()); |
0f1746c6abfb
adds backend methods for issues (TODO: implement commitIssue())
Mike Becker <universe@uap-core.de>
parents:
61
diff
changeset
|
345 | LOG.debug("Details:", ex); |
99 | 346 | final var viewModel = new IssueEditView(); |
124 | 347 | populate(viewModel, req, dao); |
99 | 348 | configure(viewModel, issue, dao); |
86
0a658e53177c
improves issue overview and adds progress information
Mike Becker <universe@uap-core.de>
parents:
83
diff
changeset
|
349 | // TODO: set Error Text |
99 | 350 | return forwardView(req, viewModel, "issue-form"); |
64
0f1746c6abfb
adds backend methods for issues (TODO: implement commitIssue())
Mike Becker <universe@uap-core.de>
parents:
61
diff
changeset
|
351 | } |
124 | 352 | } |
64
0f1746c6abfb
adds backend methods for issues (TODO: implement commitIssue())
Mike Becker <universe@uap-core.de>
parents:
61
diff
changeset
|
353 | |
124 | 354 | @RequestMapping(requestPath = "issues/comment", method = HttpMethod.POST) |
355 | public ResponseType commentIssue(HttpServletRequest req, HttpServletResponse resp, DataAccessObjects dao) throws SQLException, IOException { | |
356 | final var issueIdParam = getParameter(req, Integer.class, "issueid"); | |
357 | if (issueIdParam.isEmpty()) { | |
358 | resp.sendError(HttpServletResponse.SC_FORBIDDEN, "Detected manipulated form."); | |
359 | return ResponseType.NONE; | |
360 | } | |
361 | final var issue = new Issue(issueIdParam.get()); | |
362 | try { | |
363 | final var issueComment = new IssueComment(getParameter(req, Integer.class, "commentid").orElse(-1), issue); | |
364 | issueComment.setComment(getParameter(req, String.class, "comment").orElse("")); | |
365 | ||
366 | if (issueComment.getComment().isBlank()) { | |
367 | throw new IllegalArgumentException("comment.null"); | |
368 | } | |
369 | ||
370 | LOG.debug("User {} is commenting on issue #{}", req.getRemoteUser(), issue.getId()); | |
371 | if (req.getRemoteUser() != null) { | |
372 | dao.getUserDao().findByUsername(req.getRemoteUser()).ifPresent(issueComment::setAuthor); | |
373 | } | |
374 | ||
375 | dao.getIssueDao().saveComment(issueComment); | |
376 | ||
377 | // specifying the issue parameter keeps the edited issue as menu item | |
378 | setRedirectLocation(req, "./projects/issues/edit?issue=" + issue.getId()); | |
379 | setContentPage(req, Constants.JSP_COMMIT_SUCCESSFUL); | |
380 | ||
381 | return ResponseType.HTML; | |
382 | } catch (NoSuchElementException | IllegalArgumentException | SQLException ex) { | |
383 | // TODO: set request attribute with error text | |
384 | LOG.warn("Form validation failure: {}", ex.getMessage()); | |
385 | LOG.debug("Details:", ex); | |
386 | final var viewModel = new IssueEditView(); | |
387 | populate(viewModel, req, dao); | |
388 | configure(viewModel, issue, dao); | |
389 | // TODO: set Error Text | |
390 | return forwardView(req, viewModel, "issue-form"); | |
391 | } | |
64
0f1746c6abfb
adds backend methods for issues (TODO: implement commitIssue())
Mike Becker <universe@uap-core.de>
parents:
61
diff
changeset
|
392 | } |
41
4f1c026a8aab
adds files for ProjectsModule
Mike Becker <universe@uap-core.de>
parents:
diff
changeset
|
393 | } |