Sat, 23 Jan 2021 14:47:59 +0100
fixes issue query returning issues more than once
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 | * |
180 | 4 | * Copyright 2021 Mike Becker. All rights reserved. |
41
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.*; |
167
3f30adba1c63
major refactoring of DAO architecture - also fixes #114
Mike Becker <universe@uap-core.de>
parents:
162
diff
changeset
|
33 | import de.uapcore.lightpit.dao.DataAccessObject; |
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.*; |
167
3f30adba1c63
major refactoring of DAO architecture - also fixes #114
Mike Becker <universe@uap-core.de>
parents:
162
diff
changeset
|
35 | import de.uapcore.lightpit.filter.AllFilter; |
3f30adba1c63
major refactoring of DAO architecture - also fixes #114
Mike Becker <universe@uap-core.de>
parents:
162
diff
changeset
|
36 | import de.uapcore.lightpit.filter.IssueFilter; |
3f30adba1c63
major refactoring of DAO architecture - also fixes #114
Mike Becker <universe@uap-core.de>
parents:
162
diff
changeset
|
37 | import de.uapcore.lightpit.filter.NoneFilter; |
3f30adba1c63
major refactoring of DAO architecture - also fixes #114
Mike Becker <universe@uap-core.de>
parents:
162
diff
changeset
|
38 | import de.uapcore.lightpit.filter.SpecificFilter; |
3f30adba1c63
major refactoring of DAO architecture - also fixes #114
Mike Becker <universe@uap-core.de>
parents:
162
diff
changeset
|
39 | import de.uapcore.lightpit.types.IssueCategory; |
3f30adba1c63
major refactoring of DAO architecture - also fixes #114
Mike Becker <universe@uap-core.de>
parents:
162
diff
changeset
|
40 | import de.uapcore.lightpit.types.IssueStatus; |
3f30adba1c63
major refactoring of DAO architecture - also fixes #114
Mike Becker <universe@uap-core.de>
parents:
162
diff
changeset
|
41 | import de.uapcore.lightpit.types.VersionStatus; |
134
f47e82cd6077
completes feature: project components
Mike Becker <universe@uap-core.de>
parents:
133
diff
changeset
|
42 | import de.uapcore.lightpit.types.WebColor; |
86
0a658e53177c
improves issue overview and adds progress information
Mike Becker <universe@uap-core.de>
parents:
83
diff
changeset
|
43 | import de.uapcore.lightpit.viewmodel.*; |
121
428dca747d6b
adds application level issue sorting (fixes #19)
Mike Becker <universe@uap-core.de>
parents:
118
diff
changeset
|
44 | import de.uapcore.lightpit.viewmodel.util.IssueSorter; |
59 | 45 | import org.slf4j.Logger; |
46 | import org.slf4j.LoggerFactory; | |
41
4f1c026a8aab
adds files for ProjectsModule
Mike Becker <universe@uap-core.de>
parents:
diff
changeset
|
47 | |
157
1e6f16fad3a5
removes ResponseType enum
Mike Becker <universe@uap-core.de>
parents:
152
diff
changeset
|
48 | import javax.servlet.ServletException; |
41
4f1c026a8aab
adds files for ProjectsModule
Mike Becker <universe@uap-core.de>
parents:
diff
changeset
|
49 | import javax.servlet.annotation.WebServlet; |
4f1c026a8aab
adds files for ProjectsModule
Mike Becker <universe@uap-core.de>
parents:
diff
changeset
|
50 | import javax.servlet.http.HttpServletRequest; |
59 | 51 | import javax.servlet.http.HttpServletResponse; |
52 | import java.io.IOException; | |
75
33b6843fdf8a
adds the ability to create and edit issues
Mike Becker <universe@uap-core.de>
parents:
74
diff
changeset
|
53 | import java.sql.Date; |
47
57cfb94ab99f
projects can now be added and updated
Mike Becker <universe@uap-core.de>
parents:
45
diff
changeset
|
54 | import java.sql.SQLException; |
86
0a658e53177c
improves issue overview and adds progress information
Mike Becker <universe@uap-core.de>
parents:
83
diff
changeset
|
55 | import java.util.NoSuchElementException; |
136
7281bdf43c60
automatic assignment of component lead (if available) - fixes #28
Mike Becker <universe@uap-core.de>
parents:
134
diff
changeset
|
56 | import java.util.Optional; |
83
24a3596b8f98
adds version selection in issue editor
Mike Becker <universe@uap-core.de>
parents:
81
diff
changeset
|
57 | import java.util.stream.Collectors; |
24a3596b8f98
adds version selection in issue editor
Mike Becker <universe@uap-core.de>
parents:
81
diff
changeset
|
58 | import java.util.stream.Stream; |
41
4f1c026a8aab
adds files for ProjectsModule
Mike Becker <universe@uap-core.de>
parents:
diff
changeset
|
59 | |
4f1c026a8aab
adds files for ProjectsModule
Mike Becker <universe@uap-core.de>
parents:
diff
changeset
|
60 | @WebServlet( |
4f1c026a8aab
adds files for ProjectsModule
Mike Becker <universe@uap-core.de>
parents:
diff
changeset
|
61 | name = "ProjectsModule", |
4f1c026a8aab
adds files for ProjectsModule
Mike Becker <universe@uap-core.de>
parents:
diff
changeset
|
62 | urlPatterns = "/projects/*" |
4f1c026a8aab
adds files for ProjectsModule
Mike Becker <universe@uap-core.de>
parents:
diff
changeset
|
63 | ) |
179
623c340058f3
migrates the utility classes for the AbstractServlet
Mike Becker <universe@uap-core.de>
parents:
178
diff
changeset
|
64 | public final class ProjectsModule extends AbstractServlet { |
41
4f1c026a8aab
adds files for ProjectsModule
Mike Becker <universe@uap-core.de>
parents:
diff
changeset
|
65 | |
59 | 66 | private static final Logger LOG = LoggerFactory.getLogger(ProjectsModule.class); |
67 | ||
158
4f912cd42876
migrates constants and removes global functions
Mike Becker <universe@uap-core.de>
parents:
157
diff
changeset
|
68 | private static int parseIntOrZero(String str) { |
4f912cd42876
migrates constants and removes global functions
Mike Becker <universe@uap-core.de>
parents:
157
diff
changeset
|
69 | try { |
4f912cd42876
migrates constants and removes global functions
Mike Becker <universe@uap-core.de>
parents:
157
diff
changeset
|
70 | return Integer.parseInt(str); |
4f912cd42876
migrates constants and removes global functions
Mike Becker <universe@uap-core.de>
parents:
157
diff
changeset
|
71 | } catch (NumberFormatException ex) { |
4f912cd42876
migrates constants and removes global functions
Mike Becker <universe@uap-core.de>
parents:
157
diff
changeset
|
72 | return 0; |
4f912cd42876
migrates constants and removes global functions
Mike Becker <universe@uap-core.de>
parents:
157
diff
changeset
|
73 | } |
4f912cd42876
migrates constants and removes global functions
Mike Becker <universe@uap-core.de>
parents:
157
diff
changeset
|
74 | } |
4f912cd42876
migrates constants and removes global functions
Mike Becker <universe@uap-core.de>
parents:
157
diff
changeset
|
75 | |
167
3f30adba1c63
major refactoring of DAO architecture - also fixes #114
Mike Becker <universe@uap-core.de>
parents:
162
diff
changeset
|
76 | private void populate(ProjectView viewModel, PathParameters pathParameters, DataAccessObject dao) { |
3f30adba1c63
major refactoring of DAO architecture - also fixes #114
Mike Becker <universe@uap-core.de>
parents:
162
diff
changeset
|
77 | dao.listProjects().stream().map(ProjectInfo::new).forEach(viewModel.getProjectList()::add); |
99 | 78 | |
131
67df332e3146
changes request mapping to contain project and version ID as path parameters (this removes the session storage)
Mike Becker <universe@uap-core.de>
parents:
129
diff
changeset
|
79 | if (pathParameters == null) |
67df332e3146
changes request mapping to contain project and version ID as path parameters (this removes the session storage)
Mike Becker <universe@uap-core.de>
parents:
129
diff
changeset
|
80 | return; |
67df332e3146
changes request mapping to contain project and version ID as path parameters (this removes the session storage)
Mike Becker <universe@uap-core.de>
parents:
129
diff
changeset
|
81 | |
99 | 82 | // Select Project |
167
3f30adba1c63
major refactoring of DAO architecture - also fixes #114
Mike Becker <universe@uap-core.de>
parents:
162
diff
changeset
|
83 | final var project = dao.findProjectByNode(pathParameters.get("project")); |
138
e2aa673dd473
adds custom node names - fixes #27
Mike Becker <universe@uap-core.de>
parents:
137
diff
changeset
|
84 | if (project == null) |
e2aa673dd473
adds custom node names - fixes #27
Mike Becker <universe@uap-core.de>
parents:
137
diff
changeset
|
85 | return; |
e2aa673dd473
adds custom node names - fixes #27
Mike Becker <universe@uap-core.de>
parents:
137
diff
changeset
|
86 | |
e2aa673dd473
adds custom node names - fixes #27
Mike Becker <universe@uap-core.de>
parents:
137
diff
changeset
|
87 | final var info = new ProjectInfo(project); |
167
3f30adba1c63
major refactoring of DAO architecture - also fixes #114
Mike Becker <universe@uap-core.de>
parents:
162
diff
changeset
|
88 | info.setVersions(dao.listVersions(project)); |
3f30adba1c63
major refactoring of DAO architecture - also fixes #114
Mike Becker <universe@uap-core.de>
parents:
162
diff
changeset
|
89 | info.setComponents(dao.listComponents(project)); |
3f30adba1c63
major refactoring of DAO architecture - also fixes #114
Mike Becker <universe@uap-core.de>
parents:
162
diff
changeset
|
90 | info.setIssueSummary(dao.collectIssueSummary(project)); |
138
e2aa673dd473
adds custom node names - fixes #27
Mike Becker <universe@uap-core.de>
parents:
137
diff
changeset
|
91 | viewModel.setProjectInfo(info); |
99 | 92 | |
93 | // Select Version | |
138
e2aa673dd473
adds custom node names - fixes #27
Mike Becker <universe@uap-core.de>
parents:
137
diff
changeset
|
94 | final var versionNode = pathParameters.get("version"); |
161
3d9218457b62
temporarily fixes version and component filter settings
Mike Becker <universe@uap-core.de>
parents:
159
diff
changeset
|
95 | if (versionNode != null) { |
3d9218457b62
temporarily fixes version and component filter settings
Mike Becker <universe@uap-core.de>
parents:
159
diff
changeset
|
96 | if ("no-version".equals(versionNode)) { |
3d9218457b62
temporarily fixes version and component filter settings
Mike Becker <universe@uap-core.de>
parents:
159
diff
changeset
|
97 | viewModel.setVersionFilter(ProjectView.NO_VERSION); |
3d9218457b62
temporarily fixes version and component filter settings
Mike Becker <universe@uap-core.de>
parents:
159
diff
changeset
|
98 | } else if ("all-versions".equals(versionNode)) { |
3d9218457b62
temporarily fixes version and component filter settings
Mike Becker <universe@uap-core.de>
parents:
159
diff
changeset
|
99 | viewModel.setVersionFilter(ProjectView.ALL_VERSIONS); |
3d9218457b62
temporarily fixes version and component filter settings
Mike Becker <universe@uap-core.de>
parents:
159
diff
changeset
|
100 | } else { |
167
3f30adba1c63
major refactoring of DAO architecture - also fixes #114
Mike Becker <universe@uap-core.de>
parents:
162
diff
changeset
|
101 | viewModel.setVersionFilter(dao.findVersionByNode(project, versionNode)); |
161
3d9218457b62
temporarily fixes version and component filter settings
Mike Becker <universe@uap-core.de>
parents:
159
diff
changeset
|
102 | } |
131
67df332e3146
changes request mapping to contain project and version ID as path parameters (this removes the session storage)
Mike Becker <universe@uap-core.de>
parents:
129
diff
changeset
|
103 | } |
67df332e3146
changes request mapping to contain project and version ID as path parameters (this removes the session storage)
Mike Becker <universe@uap-core.de>
parents:
129
diff
changeset
|
104 | |
67df332e3146
changes request mapping to contain project and version ID as path parameters (this removes the session storage)
Mike Becker <universe@uap-core.de>
parents:
129
diff
changeset
|
105 | // Select Component |
138
e2aa673dd473
adds custom node names - fixes #27
Mike Becker <universe@uap-core.de>
parents:
137
diff
changeset
|
106 | final var componentNode = pathParameters.get("component"); |
161
3d9218457b62
temporarily fixes version and component filter settings
Mike Becker <universe@uap-core.de>
parents:
159
diff
changeset
|
107 | if (componentNode != null) { |
3d9218457b62
temporarily fixes version and component filter settings
Mike Becker <universe@uap-core.de>
parents:
159
diff
changeset
|
108 | if ("no-component".equals(componentNode)) { |
3d9218457b62
temporarily fixes version and component filter settings
Mike Becker <universe@uap-core.de>
parents:
159
diff
changeset
|
109 | viewModel.setComponentFilter(ProjectView.NO_COMPONENT); |
3d9218457b62
temporarily fixes version and component filter settings
Mike Becker <universe@uap-core.de>
parents:
159
diff
changeset
|
110 | } else if ("all-components".equals(componentNode)) { |
3d9218457b62
temporarily fixes version and component filter settings
Mike Becker <universe@uap-core.de>
parents:
159
diff
changeset
|
111 | viewModel.setComponentFilter(ProjectView.ALL_COMPONENTS); |
3d9218457b62
temporarily fixes version and component filter settings
Mike Becker <universe@uap-core.de>
parents:
159
diff
changeset
|
112 | } else { |
167
3f30adba1c63
major refactoring of DAO architecture - also fixes #114
Mike Becker <universe@uap-core.de>
parents:
162
diff
changeset
|
113 | viewModel.setComponentFilter(dao.findComponentByNode(project, componentNode)); |
161
3d9218457b62
temporarily fixes version and component filter settings
Mike Becker <universe@uap-core.de>
parents:
159
diff
changeset
|
114 | } |
138
e2aa673dd473
adds custom node names - fixes #27
Mike Becker <universe@uap-core.de>
parents:
137
diff
changeset
|
115 | } |
e2aa673dd473
adds custom node names - fixes #27
Mike Becker <universe@uap-core.de>
parents:
137
diff
changeset
|
116 | } |
e2aa673dd473
adds custom node names - fixes #27
Mike Becker <universe@uap-core.de>
parents:
137
diff
changeset
|
117 | |
e2aa673dd473
adds custom node names - fixes #27
Mike Becker <universe@uap-core.de>
parents:
137
diff
changeset
|
118 | private static String sanitizeNode(String node, String defaultValue) { |
e2aa673dd473
adds custom node names - fixes #27
Mike Becker <universe@uap-core.de>
parents:
137
diff
changeset
|
119 | String result = node == null || node.isBlank() ? defaultValue : node; |
e2aa673dd473
adds custom node names - fixes #27
Mike Becker <universe@uap-core.de>
parents:
137
diff
changeset
|
120 | result = result.replace('/', '-'); |
e2aa673dd473
adds custom node names - fixes #27
Mike Becker <universe@uap-core.de>
parents:
137
diff
changeset
|
121 | if (result.equals(".") || result.equals("..")) { |
e2aa673dd473
adds custom node names - fixes #27
Mike Becker <universe@uap-core.de>
parents:
137
diff
changeset
|
122 | return "_"+result; |
e2aa673dd473
adds custom node names - fixes #27
Mike Becker <universe@uap-core.de>
parents:
137
diff
changeset
|
123 | } else { |
e2aa673dd473
adds custom node names - fixes #27
Mike Becker <universe@uap-core.de>
parents:
137
diff
changeset
|
124 | return result; |
129
a09d5c59351a
add components to navmenu
Mike Becker <universe@uap-core.de>
parents:
128
diff
changeset
|
125 | } |
99 | 126 | } |
127 | ||
157
1e6f16fad3a5
removes ResponseType enum
Mike Becker <universe@uap-core.de>
parents:
152
diff
changeset
|
128 | private void forwardView(HttpServletRequest req, HttpServletResponse resp, ProjectView viewModel, String name) throws ServletException, IOException { |
99 | 129 | setViewModel(req, viewModel); |
130 | setContentPage(req, name); | |
131 | setStylesheet(req, "projects"); | |
109 | 132 | setNavigationMenu(req, "project-navmenu"); |
157
1e6f16fad3a5
removes ResponseType enum
Mike Becker <universe@uap-core.de>
parents:
152
diff
changeset
|
133 | renderSite(req, resp); |
64
0f1746c6abfb
adds backend methods for issues (TODO: implement commitIssue())
Mike Becker <universe@uap-core.de>
parents:
61
diff
changeset
|
134 | } |
0f1746c6abfb
adds backend methods for issues (TODO: implement commitIssue())
Mike Becker <universe@uap-core.de>
parents:
61
diff
changeset
|
135 | |
61
3e287f361c7a
moves project index to separate sub path
Mike Becker <universe@uap-core.de>
parents:
59
diff
changeset
|
136 | @RequestMapping(method = HttpMethod.GET) |
167
3f30adba1c63
major refactoring of DAO architecture - also fixes #114
Mike Becker <universe@uap-core.de>
parents:
162
diff
changeset
|
137 | public void index(HttpServletRequest req, HttpServletResponse resp, DataAccessObject dao) throws ServletException, IOException { |
99 | 138 | final var viewModel = new ProjectView(); |
131
67df332e3146
changes request mapping to contain project and version ID as path parameters (this removes the session storage)
Mike Becker <universe@uap-core.de>
parents:
129
diff
changeset
|
139 | populate(viewModel, null, dao); |
86
0a658e53177c
improves issue overview and adds progress information
Mike Becker <universe@uap-core.de>
parents:
83
diff
changeset
|
140 | |
99 | 141 | for (var info : viewModel.getProjectList()) { |
167
3f30adba1c63
major refactoring of DAO architecture - also fixes #114
Mike Becker <universe@uap-core.de>
parents:
162
diff
changeset
|
142 | info.setVersions(dao.listVersions(info.getProject())); |
3f30adba1c63
major refactoring of DAO architecture - also fixes #114
Mike Becker <universe@uap-core.de>
parents:
162
diff
changeset
|
143 | info.setIssueSummary(dao.collectIssueSummary(info.getProject())); |
86
0a658e53177c
improves issue overview and adds progress information
Mike Becker <universe@uap-core.de>
parents:
83
diff
changeset
|
144 | } |
0a658e53177c
improves issue overview and adds progress information
Mike Becker <universe@uap-core.de>
parents:
83
diff
changeset
|
145 | |
157
1e6f16fad3a5
removes ResponseType enum
Mike Becker <universe@uap-core.de>
parents:
152
diff
changeset
|
146 | forwardView(req, resp, viewModel, "projects"); |
47
57cfb94ab99f
projects can now be added and updated
Mike Becker <universe@uap-core.de>
parents:
45
diff
changeset
|
147 | } |
57cfb94ab99f
projects can now be added and updated
Mike Becker <universe@uap-core.de>
parents:
45
diff
changeset
|
148 | |
167
3f30adba1c63
major refactoring of DAO architecture - also fixes #114
Mike Becker <universe@uap-core.de>
parents:
162
diff
changeset
|
149 | private void configureProjectEditor(ProjectEditView viewModel, Project project, DataAccessObject dao) { |
99 | 150 | viewModel.setProject(project); |
167
3f30adba1c63
major refactoring of DAO architecture - also fixes #114
Mike Becker <universe@uap-core.de>
parents:
162
diff
changeset
|
151 | viewModel.setUsers(dao.listUsers()); |
71 | 152 | } |
153 | ||
131
67df332e3146
changes request mapping to contain project and version ID as path parameters (this removes the session storage)
Mike Becker <universe@uap-core.de>
parents:
129
diff
changeset
|
154 | @RequestMapping(requestPath = "$project/edit", method = HttpMethod.GET) |
167
3f30adba1c63
major refactoring of DAO architecture - also fixes #114
Mike Becker <universe@uap-core.de>
parents:
162
diff
changeset
|
155 | public void edit(HttpServletRequest req, HttpServletResponse resp, PathParameters pathParams, DataAccessObject dao) throws IOException, SQLException, ServletException { |
99 | 156 | final var viewModel = new ProjectEditView(); |
131
67df332e3146
changes request mapping to contain project and version ID as path parameters (this removes the session storage)
Mike Becker <universe@uap-core.de>
parents:
129
diff
changeset
|
157 | populate(viewModel, pathParams, dao); |
67df332e3146
changes request mapping to contain project and version ID as path parameters (this removes the session storage)
Mike Becker <universe@uap-core.de>
parents:
129
diff
changeset
|
158 | |
134
f47e82cd6077
completes feature: project components
Mike Becker <universe@uap-core.de>
parents:
133
diff
changeset
|
159 | if (!viewModel.isProjectInfoPresent()) { |
131
67df332e3146
changes request mapping to contain project and version ID as path parameters (this removes the session storage)
Mike Becker <universe@uap-core.de>
parents:
129
diff
changeset
|
160 | resp.sendError(HttpServletResponse.SC_NOT_FOUND); |
157
1e6f16fad3a5
removes ResponseType enum
Mike Becker <universe@uap-core.de>
parents:
152
diff
changeset
|
161 | return; |
131
67df332e3146
changes request mapping to contain project and version ID as path parameters (this removes the session storage)
Mike Becker <universe@uap-core.de>
parents:
129
diff
changeset
|
162 | } |
47
57cfb94ab99f
projects can now be added and updated
Mike Becker <universe@uap-core.de>
parents:
45
diff
changeset
|
163 | |
131
67df332e3146
changes request mapping to contain project and version ID as path parameters (this removes the session storage)
Mike Becker <universe@uap-core.de>
parents:
129
diff
changeset
|
164 | configureProjectEditor(viewModel, viewModel.getProjectInfo().getProject(), dao); |
157
1e6f16fad3a5
removes ResponseType enum
Mike Becker <universe@uap-core.de>
parents:
152
diff
changeset
|
165 | forwardView(req, resp, viewModel, "project-form"); |
131
67df332e3146
changes request mapping to contain project and version ID as path parameters (this removes the session storage)
Mike Becker <universe@uap-core.de>
parents:
129
diff
changeset
|
166 | } |
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
|
167 | |
131
67df332e3146
changes request mapping to contain project and version ID as path parameters (this removes the session storage)
Mike Becker <universe@uap-core.de>
parents:
129
diff
changeset
|
168 | @RequestMapping(requestPath = "create", method = HttpMethod.GET) |
167
3f30adba1c63
major refactoring of DAO architecture - also fixes #114
Mike Becker <universe@uap-core.de>
parents:
162
diff
changeset
|
169 | public void create(HttpServletRequest req, HttpServletResponse resp, DataAccessObject dao) throws SQLException, ServletException, IOException { |
131
67df332e3146
changes request mapping to contain project and version ID as path parameters (this removes the session storage)
Mike Becker <universe@uap-core.de>
parents:
129
diff
changeset
|
170 | final var viewModel = new ProjectEditView(); |
67df332e3146
changes request mapping to contain project and version ID as path parameters (this removes the session storage)
Mike Becker <universe@uap-core.de>
parents:
129
diff
changeset
|
171 | populate(viewModel, null, dao); |
67df332e3146
changes request mapping to contain project and version ID as path parameters (this removes the session storage)
Mike Becker <universe@uap-core.de>
parents:
129
diff
changeset
|
172 | configureProjectEditor(viewModel, new Project(-1), dao); |
157
1e6f16fad3a5
removes ResponseType enum
Mike Becker <universe@uap-core.de>
parents:
152
diff
changeset
|
173 | forwardView(req, resp, 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
|
174 | } |
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
|
175 | |
47
57cfb94ab99f
projects can now be added and updated
Mike Becker <universe@uap-core.de>
parents:
45
diff
changeset
|
176 | @RequestMapping(requestPath = "commit", method = HttpMethod.POST) |
167
3f30adba1c63
major refactoring of DAO architecture - also fixes #114
Mike Becker <universe@uap-core.de>
parents:
162
diff
changeset
|
177 | public void commit(HttpServletRequest req, HttpServletResponse resp, DataAccessObject dao) throws IOException, ServletException { |
47
57cfb94ab99f
projects can now be added and updated
Mike Becker <universe@uap-core.de>
parents:
45
diff
changeset
|
178 | |
57cfb94ab99f
projects can now be added and updated
Mike Becker <universe@uap-core.de>
parents:
45
diff
changeset
|
179 | try { |
131
67df332e3146
changes request mapping to contain project and version ID as path parameters (this removes the session storage)
Mike Becker <universe@uap-core.de>
parents:
129
diff
changeset
|
180 | final var 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
|
181 | project.setName(getParameter(req, String.class, "name").orElseThrow()); |
138
e2aa673dd473
adds custom node names - fixes #27
Mike Becker <universe@uap-core.de>
parents:
137
diff
changeset
|
182 | |
e2aa673dd473
adds custom node names - fixes #27
Mike Becker <universe@uap-core.de>
parents:
137
diff
changeset
|
183 | final var node = getParameter(req, String.class, "node").orElse(null); |
e2aa673dd473
adds custom node names - fixes #27
Mike Becker <universe@uap-core.de>
parents:
137
diff
changeset
|
184 | project.setNode(sanitizeNode(node, project.getName())); |
175
1e6f2aace666
adds project ordering - fixes #34
Mike Becker <universe@uap-core.de>
parents:
168
diff
changeset
|
185 | getParameter(req, Integer.class, "ordinal").ifPresent(project::setOrdinal); |
138
e2aa673dd473
adds custom node names - fixes #27
Mike Becker <universe@uap-core.de>
parents:
137
diff
changeset
|
186 | |
47
57cfb94ab99f
projects can now be added and updated
Mike Becker <universe@uap-core.de>
parents:
45
diff
changeset
|
187 | 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
|
188 | 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
|
189 | getParameter(req, Integer.class, "owner").map( |
57cfb94ab99f
projects can now be added and updated
Mike Becker <universe@uap-core.de>
parents:
45
diff
changeset
|
190 | 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
|
191 | ).ifPresent(project::setOwner); |
57cfb94ab99f
projects can now be added and updated
Mike Becker <universe@uap-core.de>
parents:
45
diff
changeset
|
192 | |
159 | 193 | if (project.getId() > 0) { |
167
3f30adba1c63
major refactoring of DAO architecture - also fixes #114
Mike Becker <universe@uap-core.de>
parents:
162
diff
changeset
|
194 | dao.updateProject(project); |
159 | 195 | } else { |
167
3f30adba1c63
major refactoring of DAO architecture - also fixes #114
Mike Becker <universe@uap-core.de>
parents:
162
diff
changeset
|
196 | dao.insertProject(project); |
159 | 197 | } |
47
57cfb94ab99f
projects can now be added and updated
Mike Becker <universe@uap-core.de>
parents:
45
diff
changeset
|
198 | |
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
|
199 | setRedirectLocation(req, "./projects/"); |
74
91d1fc2a3a14
removes that dynamic_fragment bullshit
Mike Becker <universe@uap-core.de>
parents:
71
diff
changeset
|
200 | setContentPage(req, Constants.JSP_COMMIT_SUCCESSFUL); |
59 | 201 | LOG.debug("Successfully updated project {}", project.getName()); |
99 | 202 | |
157
1e6f16fad3a5
removes ResponseType enum
Mike Becker <universe@uap-core.de>
parents:
152
diff
changeset
|
203 | renderSite(req, resp); |
159 | 204 | } catch (NoSuchElementException | IllegalArgumentException ex) { |
131
67df332e3146
changes request mapping to contain project and version ID as path parameters (this removes the session storage)
Mike Becker <universe@uap-core.de>
parents:
129
diff
changeset
|
205 | resp.sendError(HttpServletResponse.SC_NOT_IMPLEMENTED); |
67df332e3146
changes request mapping to contain project and version ID as path parameters (this removes the session storage)
Mike Becker <universe@uap-core.de>
parents:
129
diff
changeset
|
206 | // TODO: implement - fix issue #21 |
47
57cfb94ab99f
projects can now be added and updated
Mike Becker <universe@uap-core.de>
parents:
45
diff
changeset
|
207 | } |
57cfb94ab99f
projects can now be added and updated
Mike Becker <universe@uap-core.de>
parents:
45
diff
changeset
|
208 | } |
57cfb94ab99f
projects can now be added and updated
Mike Becker <universe@uap-core.de>
parents:
45
diff
changeset
|
209 | |
134
f47e82cd6077
completes feature: project components
Mike Becker <universe@uap-core.de>
parents:
133
diff
changeset
|
210 | @RequestMapping(requestPath = "$project/$component/$version/issues/", method = HttpMethod.GET) |
167
3f30adba1c63
major refactoring of DAO architecture - also fixes #114
Mike Becker <universe@uap-core.de>
parents:
162
diff
changeset
|
211 | public void issues(HttpServletRequest req, HttpServletResponse resp, PathParameters pathParams, DataAccessObject dao) throws SQLException, IOException, ServletException { |
99 | 212 | final var viewModel = new ProjectDetailsView(); |
131
67df332e3146
changes request mapping to contain project and version ID as path parameters (this removes the session storage)
Mike Becker <universe@uap-core.de>
parents:
129
diff
changeset
|
213 | populate(viewModel, pathParams, dao); |
86
0a658e53177c
improves issue overview and adds progress information
Mike Becker <universe@uap-core.de>
parents:
83
diff
changeset
|
214 | |
134
f47e82cd6077
completes feature: project components
Mike Becker <universe@uap-core.de>
parents:
133
diff
changeset
|
215 | if (!viewModel.isEveryFilterValid()) { |
131
67df332e3146
changes request mapping to contain project and version ID as path parameters (this removes the session storage)
Mike Becker <universe@uap-core.de>
parents:
129
diff
changeset
|
216 | resp.sendError(HttpServletResponse.SC_NOT_FOUND); |
157
1e6f16fad3a5
removes ResponseType enum
Mike Becker <universe@uap-core.de>
parents:
152
diff
changeset
|
217 | return; |
80
27a25f32048e
adds project overview page
Mike Becker <universe@uap-core.de>
parents:
79
diff
changeset
|
218 | } |
47
57cfb94ab99f
projects can now be added and updated
Mike Becker <universe@uap-core.de>
parents:
45
diff
changeset
|
219 | |
134
f47e82cd6077
completes feature: project components
Mike Becker <universe@uap-core.de>
parents:
133
diff
changeset
|
220 | final var project = viewModel.getProjectInfo().getProject(); |
f47e82cd6077
completes feature: project components
Mike Becker <universe@uap-core.de>
parents:
133
diff
changeset
|
221 | final var version = viewModel.getVersionFilter(); |
f47e82cd6077
completes feature: project components
Mike Becker <universe@uap-core.de>
parents:
133
diff
changeset
|
222 | final var component = viewModel.getComponentFilter(); |
f47e82cd6077
completes feature: project components
Mike Becker <universe@uap-core.de>
parents:
133
diff
changeset
|
223 | |
167
3f30adba1c63
major refactoring of DAO architecture - also fixes #114
Mike Becker <universe@uap-core.de>
parents:
162
diff
changeset
|
224 | // TODO: use new IssueFilter class for the ViewModel |
70
821c4950b619
removes the sub menu and removes the home module
Mike Becker <universe@uap-core.de>
parents:
68
diff
changeset
|
225 | |
167
3f30adba1c63
major refactoring of DAO architecture - also fixes #114
Mike Becker <universe@uap-core.de>
parents:
162
diff
changeset
|
226 | final var projectFilter = new SpecificFilter<>(project); |
3f30adba1c63
major refactoring of DAO architecture - also fixes #114
Mike Becker <universe@uap-core.de>
parents:
162
diff
changeset
|
227 | final IssueFilter filter; |
134
f47e82cd6077
completes feature: project components
Mike Becker <universe@uap-core.de>
parents:
133
diff
changeset
|
228 | if (version.equals(ProjectView.NO_VERSION)) { |
f47e82cd6077
completes feature: project components
Mike Becker <universe@uap-core.de>
parents:
133
diff
changeset
|
229 | if (component.equals(ProjectView.ALL_COMPONENTS)) { |
167
3f30adba1c63
major refactoring of DAO architecture - also fixes #114
Mike Becker <universe@uap-core.de>
parents:
162
diff
changeset
|
230 | filter = new IssueFilter(projectFilter, |
3f30adba1c63
major refactoring of DAO architecture - also fixes #114
Mike Becker <universe@uap-core.de>
parents:
162
diff
changeset
|
231 | new NoneFilter<>(), |
3f30adba1c63
major refactoring of DAO architecture - also fixes #114
Mike Becker <universe@uap-core.de>
parents:
162
diff
changeset
|
232 | new AllFilter<>() |
3f30adba1c63
major refactoring of DAO architecture - also fixes #114
Mike Becker <universe@uap-core.de>
parents:
162
diff
changeset
|
233 | ); |
134
f47e82cd6077
completes feature: project components
Mike Becker <universe@uap-core.de>
parents:
133
diff
changeset
|
234 | } else if (component.equals(ProjectView.NO_COMPONENT)) { |
167
3f30adba1c63
major refactoring of DAO architecture - also fixes #114
Mike Becker <universe@uap-core.de>
parents:
162
diff
changeset
|
235 | filter = new IssueFilter(projectFilter, |
3f30adba1c63
major refactoring of DAO architecture - also fixes #114
Mike Becker <universe@uap-core.de>
parents:
162
diff
changeset
|
236 | new NoneFilter<>(), |
3f30adba1c63
major refactoring of DAO architecture - also fixes #114
Mike Becker <universe@uap-core.de>
parents:
162
diff
changeset
|
237 | new NoneFilter<>() |
3f30adba1c63
major refactoring of DAO architecture - also fixes #114
Mike Becker <universe@uap-core.de>
parents:
162
diff
changeset
|
238 | ); |
134
f47e82cd6077
completes feature: project components
Mike Becker <universe@uap-core.de>
parents:
133
diff
changeset
|
239 | } else { |
167
3f30adba1c63
major refactoring of DAO architecture - also fixes #114
Mike Becker <universe@uap-core.de>
parents:
162
diff
changeset
|
240 | filter = new IssueFilter(projectFilter, |
3f30adba1c63
major refactoring of DAO architecture - also fixes #114
Mike Becker <universe@uap-core.de>
parents:
162
diff
changeset
|
241 | new NoneFilter<>(), |
3f30adba1c63
major refactoring of DAO architecture - also fixes #114
Mike Becker <universe@uap-core.de>
parents:
162
diff
changeset
|
242 | new SpecificFilter<>(component) |
3f30adba1c63
major refactoring of DAO architecture - also fixes #114
Mike Becker <universe@uap-core.de>
parents:
162
diff
changeset
|
243 | ); |
134
f47e82cd6077
completes feature: project components
Mike Becker <universe@uap-core.de>
parents:
133
diff
changeset
|
244 | } |
f47e82cd6077
completes feature: project components
Mike Becker <universe@uap-core.de>
parents:
133
diff
changeset
|
245 | } else if (version.equals(ProjectView.ALL_VERSIONS)) { |
f47e82cd6077
completes feature: project components
Mike Becker <universe@uap-core.de>
parents:
133
diff
changeset
|
246 | if (component.equals(ProjectView.ALL_COMPONENTS)) { |
167
3f30adba1c63
major refactoring of DAO architecture - also fixes #114
Mike Becker <universe@uap-core.de>
parents:
162
diff
changeset
|
247 | filter = new IssueFilter(projectFilter, |
3f30adba1c63
major refactoring of DAO architecture - also fixes #114
Mike Becker <universe@uap-core.de>
parents:
162
diff
changeset
|
248 | new AllFilter<>(), |
3f30adba1c63
major refactoring of DAO architecture - also fixes #114
Mike Becker <universe@uap-core.de>
parents:
162
diff
changeset
|
249 | new AllFilter<>() |
3f30adba1c63
major refactoring of DAO architecture - also fixes #114
Mike Becker <universe@uap-core.de>
parents:
162
diff
changeset
|
250 | ); |
134
f47e82cd6077
completes feature: project components
Mike Becker <universe@uap-core.de>
parents:
133
diff
changeset
|
251 | } else if (component.equals(ProjectView.NO_COMPONENT)) { |
167
3f30adba1c63
major refactoring of DAO architecture - also fixes #114
Mike Becker <universe@uap-core.de>
parents:
162
diff
changeset
|
252 | filter = new IssueFilter(projectFilter, |
3f30adba1c63
major refactoring of DAO architecture - also fixes #114
Mike Becker <universe@uap-core.de>
parents:
162
diff
changeset
|
253 | new AllFilter<>(), |
3f30adba1c63
major refactoring of DAO architecture - also fixes #114
Mike Becker <universe@uap-core.de>
parents:
162
diff
changeset
|
254 | new NoneFilter<>() |
3f30adba1c63
major refactoring of DAO architecture - also fixes #114
Mike Becker <universe@uap-core.de>
parents:
162
diff
changeset
|
255 | ); |
134
f47e82cd6077
completes feature: project components
Mike Becker <universe@uap-core.de>
parents:
133
diff
changeset
|
256 | } else { |
167
3f30adba1c63
major refactoring of DAO architecture - also fixes #114
Mike Becker <universe@uap-core.de>
parents:
162
diff
changeset
|
257 | filter = new IssueFilter(projectFilter, |
3f30adba1c63
major refactoring of DAO architecture - also fixes #114
Mike Becker <universe@uap-core.de>
parents:
162
diff
changeset
|
258 | new AllFilter<>(), |
3f30adba1c63
major refactoring of DAO architecture - also fixes #114
Mike Becker <universe@uap-core.de>
parents:
162
diff
changeset
|
259 | new SpecificFilter<>(component) |
3f30adba1c63
major refactoring of DAO architecture - also fixes #114
Mike Becker <universe@uap-core.de>
parents:
162
diff
changeset
|
260 | ); |
134
f47e82cd6077
completes feature: project components
Mike Becker <universe@uap-core.de>
parents:
133
diff
changeset
|
261 | } |
f47e82cd6077
completes feature: project components
Mike Becker <universe@uap-core.de>
parents:
133
diff
changeset
|
262 | } else { |
f47e82cd6077
completes feature: project components
Mike Becker <universe@uap-core.de>
parents:
133
diff
changeset
|
263 | if (component.equals(ProjectView.ALL_COMPONENTS)) { |
167
3f30adba1c63
major refactoring of DAO architecture - also fixes #114
Mike Becker <universe@uap-core.de>
parents:
162
diff
changeset
|
264 | filter = new IssueFilter(projectFilter, |
3f30adba1c63
major refactoring of DAO architecture - also fixes #114
Mike Becker <universe@uap-core.de>
parents:
162
diff
changeset
|
265 | new SpecificFilter<>(version), |
3f30adba1c63
major refactoring of DAO architecture - also fixes #114
Mike Becker <universe@uap-core.de>
parents:
162
diff
changeset
|
266 | new AllFilter<>() |
3f30adba1c63
major refactoring of DAO architecture - also fixes #114
Mike Becker <universe@uap-core.de>
parents:
162
diff
changeset
|
267 | ); |
134
f47e82cd6077
completes feature: project components
Mike Becker <universe@uap-core.de>
parents:
133
diff
changeset
|
268 | } else if (component.equals(ProjectView.NO_COMPONENT)) { |
167
3f30adba1c63
major refactoring of DAO architecture - also fixes #114
Mike Becker <universe@uap-core.de>
parents:
162
diff
changeset
|
269 | filter = new IssueFilter(projectFilter, |
3f30adba1c63
major refactoring of DAO architecture - also fixes #114
Mike Becker <universe@uap-core.de>
parents:
162
diff
changeset
|
270 | new SpecificFilter<>(version), |
3f30adba1c63
major refactoring of DAO architecture - also fixes #114
Mike Becker <universe@uap-core.de>
parents:
162
diff
changeset
|
271 | new NoneFilter<>() |
3f30adba1c63
major refactoring of DAO architecture - also fixes #114
Mike Becker <universe@uap-core.de>
parents:
162
diff
changeset
|
272 | ); |
134
f47e82cd6077
completes feature: project components
Mike Becker <universe@uap-core.de>
parents:
133
diff
changeset
|
273 | } else { |
167
3f30adba1c63
major refactoring of DAO architecture - also fixes #114
Mike Becker <universe@uap-core.de>
parents:
162
diff
changeset
|
274 | filter = new IssueFilter(projectFilter, |
3f30adba1c63
major refactoring of DAO architecture - also fixes #114
Mike Becker <universe@uap-core.de>
parents:
162
diff
changeset
|
275 | new SpecificFilter<>(version), |
3f30adba1c63
major refactoring of DAO architecture - also fixes #114
Mike Becker <universe@uap-core.de>
parents:
162
diff
changeset
|
276 | new SpecificFilter<>(component) |
3f30adba1c63
major refactoring of DAO architecture - also fixes #114
Mike Becker <universe@uap-core.de>
parents:
162
diff
changeset
|
277 | ); |
134
f47e82cd6077
completes feature: project components
Mike Becker <universe@uap-core.de>
parents:
133
diff
changeset
|
278 | } |
f47e82cd6077
completes feature: project components
Mike Becker <universe@uap-core.de>
parents:
133
diff
changeset
|
279 | } |
f47e82cd6077
completes feature: project components
Mike Becker <universe@uap-core.de>
parents:
133
diff
changeset
|
280 | |
167
3f30adba1c63
major refactoring of DAO architecture - also fixes #114
Mike Becker <universe@uap-core.de>
parents:
162
diff
changeset
|
281 | final var issues = dao.listIssues(filter); |
121
428dca747d6b
adds application level issue sorting (fixes #19)
Mike Becker <universe@uap-core.de>
parents:
118
diff
changeset
|
282 | issues.sort(new IssueSorter( |
141
8160dfc4dbc3
renames sort criteria PHASE to DONE, because phase 0 and 1 are combined
Mike Becker <universe@uap-core.de>
parents:
138
diff
changeset
|
283 | new IssueSorter.Criteria(IssueSorter.Field.DONE, true), |
121
428dca747d6b
adds application level issue sorting (fixes #19)
Mike Becker <universe@uap-core.de>
parents:
118
diff
changeset
|
284 | 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
|
285 | 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
|
286 | )); |
134
f47e82cd6077
completes feature: project components
Mike Becker <universe@uap-core.de>
parents:
133
diff
changeset
|
287 | |
f47e82cd6077
completes feature: project components
Mike Becker <universe@uap-core.de>
parents:
133
diff
changeset
|
288 | |
f47e82cd6077
completes feature: project components
Mike Becker <universe@uap-core.de>
parents:
133
diff
changeset
|
289 | viewModel.getProjectDetails().updateDetails(issues); |
f47e82cd6077
completes feature: project components
Mike Becker <universe@uap-core.de>
parents:
133
diff
changeset
|
290 | if (version.getId() > 0) |
f47e82cd6077
completes feature: project components
Mike Becker <universe@uap-core.de>
parents:
133
diff
changeset
|
291 | viewModel.getProjectDetails().updateVersionInfo(version); |
86
0a658e53177c
improves issue overview and adds progress information
Mike Becker <universe@uap-core.de>
parents:
83
diff
changeset
|
292 | |
157
1e6f16fad3a5
removes ResponseType enum
Mike Becker <universe@uap-core.de>
parents:
152
diff
changeset
|
293 | forwardView(req, resp, viewModel, "project-details"); |
71 | 294 | } |
295 | ||
131
67df332e3146
changes request mapping to contain project and version ID as path parameters (this removes the session storage)
Mike Becker <universe@uap-core.de>
parents:
129
diff
changeset
|
296 | @RequestMapping(requestPath = "$project/versions/", method = HttpMethod.GET) |
167
3f30adba1c63
major refactoring of DAO architecture - also fixes #114
Mike Becker <universe@uap-core.de>
parents:
162
diff
changeset
|
297 | public void versions(HttpServletRequest req, HttpServletResponse resp, PathParameters pathParameters, DataAccessObject dao) throws IOException, SQLException, ServletException { |
109 | 298 | final var viewModel = new VersionsView(); |
131
67df332e3146
changes request mapping to contain project and version ID as path parameters (this removes the session storage)
Mike Becker <universe@uap-core.de>
parents:
129
diff
changeset
|
299 | populate(viewModel, pathParameters, dao); |
109 | 300 | |
301 | final var projectInfo = viewModel.getProjectInfo(); | |
302 | if (projectInfo == null) { | |
131
67df332e3146
changes request mapping to contain project and version ID as path parameters (this removes the session storage)
Mike Becker <universe@uap-core.de>
parents:
129
diff
changeset
|
303 | resp.sendError(HttpServletResponse.SC_NOT_FOUND); |
157
1e6f16fad3a5
removes ResponseType enum
Mike Becker <universe@uap-core.de>
parents:
152
diff
changeset
|
304 | return; |
109 | 305 | } |
306 | ||
167
3f30adba1c63
major refactoring of DAO architecture - also fixes #114
Mike Becker <universe@uap-core.de>
parents:
162
diff
changeset
|
307 | final var issues = dao.listIssues( |
3f30adba1c63
major refactoring of DAO architecture - also fixes #114
Mike Becker <universe@uap-core.de>
parents:
162
diff
changeset
|
308 | new IssueFilter( |
3f30adba1c63
major refactoring of DAO architecture - also fixes #114
Mike Becker <universe@uap-core.de>
parents:
162
diff
changeset
|
309 | new SpecificFilter<>(projectInfo.getProject()), |
3f30adba1c63
major refactoring of DAO architecture - also fixes #114
Mike Becker <universe@uap-core.de>
parents:
162
diff
changeset
|
310 | new AllFilter<>(), |
3f30adba1c63
major refactoring of DAO architecture - also fixes #114
Mike Becker <universe@uap-core.de>
parents:
162
diff
changeset
|
311 | new AllFilter<>() |
3f30adba1c63
major refactoring of DAO architecture - also fixes #114
Mike Becker <universe@uap-core.de>
parents:
162
diff
changeset
|
312 | ) |
3f30adba1c63
major refactoring of DAO architecture - also fixes #114
Mike Becker <universe@uap-core.de>
parents:
162
diff
changeset
|
313 | ); |
109 | 314 | viewModel.update(projectInfo.getVersions(), issues); |
315 | ||
157
1e6f16fad3a5
removes ResponseType enum
Mike Becker <universe@uap-core.de>
parents:
152
diff
changeset
|
316 | forwardView(req, resp, viewModel, "versions"); |
109 | 317 | } |
318 | ||
131
67df332e3146
changes request mapping to contain project and version ID as path parameters (this removes the session storage)
Mike Becker <universe@uap-core.de>
parents:
129
diff
changeset
|
319 | @RequestMapping(requestPath = "$project/versions/$version/edit", method = HttpMethod.GET) |
167
3f30adba1c63
major refactoring of DAO architecture - also fixes #114
Mike Becker <universe@uap-core.de>
parents:
162
diff
changeset
|
320 | public void editVersion(HttpServletRequest req, HttpServletResponse resp, PathParameters pathParameters, DataAccessObject dao) throws IOException, ServletException { |
99 | 321 | final var viewModel = new VersionEditView(); |
131
67df332e3146
changes request mapping to contain project and version ID as path parameters (this removes the session storage)
Mike Becker <universe@uap-core.de>
parents:
129
diff
changeset
|
322 | populate(viewModel, pathParameters, dao); |
99 | 323 | |
131
67df332e3146
changes request mapping to contain project and version ID as path parameters (this removes the session storage)
Mike Becker <universe@uap-core.de>
parents:
129
diff
changeset
|
324 | if (viewModel.getProjectInfo() == null || viewModel.getVersionFilter() == null) { |
67df332e3146
changes request mapping to contain project and version ID as path parameters (this removes the session storage)
Mike Becker <universe@uap-core.de>
parents:
129
diff
changeset
|
325 | resp.sendError(HttpServletResponse.SC_NOT_FOUND); |
157
1e6f16fad3a5
removes ResponseType enum
Mike Becker <universe@uap-core.de>
parents:
152
diff
changeset
|
326 | return; |
110
9d0be0b1580f
adds indicators for version status
Mike Becker <universe@uap-core.de>
parents:
109
diff
changeset
|
327 | } |
9d0be0b1580f
adds indicators for version status
Mike Becker <universe@uap-core.de>
parents:
109
diff
changeset
|
328 | |
131
67df332e3146
changes request mapping to contain project and version ID as path parameters (this removes the session storage)
Mike Becker <universe@uap-core.de>
parents:
129
diff
changeset
|
329 | viewModel.setVersion(viewModel.getVersionFilter()); |
59 | 330 | |
157
1e6f16fad3a5
removes ResponseType enum
Mike Becker <universe@uap-core.de>
parents:
152
diff
changeset
|
331 | forwardView(req, resp, viewModel, "version-form"); |
59 | 332 | } |
333 | ||
131
67df332e3146
changes request mapping to contain project and version ID as path parameters (this removes the session storage)
Mike Becker <universe@uap-core.de>
parents:
129
diff
changeset
|
334 | @RequestMapping(requestPath = "$project/create-version", method = HttpMethod.GET) |
167
3f30adba1c63
major refactoring of DAO architecture - also fixes #114
Mike Becker <universe@uap-core.de>
parents:
162
diff
changeset
|
335 | public void createVersion(HttpServletRequest req, HttpServletResponse resp, PathParameters pathParameters, DataAccessObject dao) throws IOException, ServletException { |
131
67df332e3146
changes request mapping to contain project and version ID as path parameters (this removes the session storage)
Mike Becker <universe@uap-core.de>
parents:
129
diff
changeset
|
336 | final var viewModel = new VersionEditView(); |
67df332e3146
changes request mapping to contain project and version ID as path parameters (this removes the session storage)
Mike Becker <universe@uap-core.de>
parents:
129
diff
changeset
|
337 | populate(viewModel, pathParameters, dao); |
59 | 338 | |
131
67df332e3146
changes request mapping to contain project and version ID as path parameters (this removes the session storage)
Mike Becker <universe@uap-core.de>
parents:
129
diff
changeset
|
339 | if (viewModel.getProjectInfo() == null) { |
67df332e3146
changes request mapping to contain project and version ID as path parameters (this removes the session storage)
Mike Becker <universe@uap-core.de>
parents:
129
diff
changeset
|
340 | resp.sendError(HttpServletResponse.SC_NOT_FOUND); |
157
1e6f16fad3a5
removes ResponseType enum
Mike Becker <universe@uap-core.de>
parents:
152
diff
changeset
|
341 | return; |
131
67df332e3146
changes request mapping to contain project and version ID as path parameters (this removes the session storage)
Mike Becker <universe@uap-core.de>
parents:
129
diff
changeset
|
342 | } |
67df332e3146
changes request mapping to contain project and version ID as path parameters (this removes the session storage)
Mike Becker <universe@uap-core.de>
parents:
129
diff
changeset
|
343 | |
167
3f30adba1c63
major refactoring of DAO architecture - also fixes #114
Mike Becker <universe@uap-core.de>
parents:
162
diff
changeset
|
344 | viewModel.setVersion(new Version(-1, viewModel.getProjectInfo().getProject().getId())); |
131
67df332e3146
changes request mapping to contain project and version ID as path parameters (this removes the session storage)
Mike Becker <universe@uap-core.de>
parents:
129
diff
changeset
|
345 | |
157
1e6f16fad3a5
removes ResponseType enum
Mike Becker <universe@uap-core.de>
parents:
152
diff
changeset
|
346 | forwardView(req, resp, viewModel, "version-form"); |
131
67df332e3146
changes request mapping to contain project and version ID as path parameters (this removes the session storage)
Mike Becker <universe@uap-core.de>
parents:
129
diff
changeset
|
347 | } |
67df332e3146
changes request mapping to contain project and version ID as path parameters (this removes the session storage)
Mike Becker <universe@uap-core.de>
parents:
129
diff
changeset
|
348 | |
67df332e3146
changes request mapping to contain project and version ID as path parameters (this removes the session storage)
Mike Becker <universe@uap-core.de>
parents:
129
diff
changeset
|
349 | @RequestMapping(requestPath = "commit-version", method = HttpMethod.POST) |
167
3f30adba1c63
major refactoring of DAO architecture - also fixes #114
Mike Becker <universe@uap-core.de>
parents:
162
diff
changeset
|
350 | public void commitVersion(HttpServletRequest req, HttpServletResponse resp, DataAccessObject dao) throws IOException, ServletException { |
131
67df332e3146
changes request mapping to contain project and version ID as path parameters (this removes the session storage)
Mike Becker <universe@uap-core.de>
parents:
129
diff
changeset
|
351 | |
59 | 352 | try { |
167
3f30adba1c63
major refactoring of DAO architecture - also fixes #114
Mike Becker <universe@uap-core.de>
parents:
162
diff
changeset
|
353 | final var project = dao.findProject(getParameter(req, Integer.class, "pid").orElseThrow()); |
138
e2aa673dd473
adds custom node names - fixes #27
Mike Becker <universe@uap-core.de>
parents:
137
diff
changeset
|
354 | if (project == null) { |
e2aa673dd473
adds custom node names - fixes #27
Mike Becker <universe@uap-core.de>
parents:
137
diff
changeset
|
355 | // TODO: improve error handling, because not found is not correct for this POST request |
e2aa673dd473
adds custom node names - fixes #27
Mike Becker <universe@uap-core.de>
parents:
137
diff
changeset
|
356 | resp.sendError(HttpServletResponse.SC_NOT_FOUND); |
157
1e6f16fad3a5
removes ResponseType enum
Mike Becker <universe@uap-core.de>
parents:
152
diff
changeset
|
357 | return; |
138
e2aa673dd473
adds custom node names - fixes #27
Mike Becker <universe@uap-core.de>
parents:
137
diff
changeset
|
358 | } |
167
3f30adba1c63
major refactoring of DAO architecture - also fixes #114
Mike Becker <universe@uap-core.de>
parents:
162
diff
changeset
|
359 | final var version = new Version(getParameter(req, Integer.class, "id").orElseThrow(), project.getId()); |
59 | 360 | version.setName(getParameter(req, String.class, "name").orElseThrow()); |
138
e2aa673dd473
adds custom node names - fixes #27
Mike Becker <universe@uap-core.de>
parents:
137
diff
changeset
|
361 | |
e2aa673dd473
adds custom node names - fixes #27
Mike Becker <universe@uap-core.de>
parents:
137
diff
changeset
|
362 | final var node = getParameter(req, String.class, "node").orElse(null); |
e2aa673dd473
adds custom node names - fixes #27
Mike Becker <universe@uap-core.de>
parents:
137
diff
changeset
|
363 | version.setNode(sanitizeNode(node, version.getName())); |
e2aa673dd473
adds custom node names - fixes #27
Mike Becker <universe@uap-core.de>
parents:
137
diff
changeset
|
364 | |
59 | 365 | getParameter(req, Integer.class, "ordinal").ifPresent(version::setOrdinal); |
366 | version.setStatus(VersionStatus.valueOf(getParameter(req, String.class, "status").orElseThrow())); | |
159 | 367 | |
368 | if (version.getId() > 0) { | |
167
3f30adba1c63
major refactoring of DAO architecture - also fixes #114
Mike Becker <universe@uap-core.de>
parents:
162
diff
changeset
|
369 | dao.updateVersion(version); |
159 | 370 | } else { |
167
3f30adba1c63
major refactoring of DAO architecture - also fixes #114
Mike Becker <universe@uap-core.de>
parents:
162
diff
changeset
|
371 | dao.insertVersion(version); |
159 | 372 | } |
59 | 373 | |
138
e2aa673dd473
adds custom node names - fixes #27
Mike Becker <universe@uap-core.de>
parents:
137
diff
changeset
|
374 | setRedirectLocation(req, "./projects/" + project.getNode() + "/versions/"); |
74
91d1fc2a3a14
removes that dynamic_fragment bullshit
Mike Becker <universe@uap-core.de>
parents:
71
diff
changeset
|
375 | setContentPage(req, Constants.JSP_COMMIT_SUCCESSFUL); |
157
1e6f16fad3a5
removes ResponseType enum
Mike Becker <universe@uap-core.de>
parents:
152
diff
changeset
|
376 | |
1e6f16fad3a5
removes ResponseType enum
Mike Becker <universe@uap-core.de>
parents:
152
diff
changeset
|
377 | renderSite(req, resp); |
159 | 378 | } catch (NoSuchElementException | IllegalArgumentException ex) { |
131
67df332e3146
changes request mapping to contain project and version ID as path parameters (this removes the session storage)
Mike Becker <universe@uap-core.de>
parents:
129
diff
changeset
|
379 | resp.sendError(HttpServletResponse.SC_NOT_IMPLEMENTED); |
67df332e3146
changes request mapping to contain project and version ID as path parameters (this removes the session storage)
Mike Becker <universe@uap-core.de>
parents:
129
diff
changeset
|
380 | // TODO: implement - fix issue #21 |
59 | 381 | } |
41
4f1c026a8aab
adds files for ProjectsModule
Mike Becker <universe@uap-core.de>
parents:
diff
changeset
|
382 | } |
64
0f1746c6abfb
adds backend methods for issues (TODO: implement commitIssue())
Mike Becker <universe@uap-core.de>
parents:
61
diff
changeset
|
383 | |
134
f47e82cd6077
completes feature: project components
Mike Becker <universe@uap-core.de>
parents:
133
diff
changeset
|
384 | @RequestMapping(requestPath = "$project/components/", method = HttpMethod.GET) |
167
3f30adba1c63
major refactoring of DAO architecture - also fixes #114
Mike Becker <universe@uap-core.de>
parents:
162
diff
changeset
|
385 | public void components(HttpServletRequest req, HttpServletResponse resp, PathParameters pathParameters, DataAccessObject dao) throws IOException, SQLException, ServletException { |
134
f47e82cd6077
completes feature: project components
Mike Becker <universe@uap-core.de>
parents:
133
diff
changeset
|
386 | final var viewModel = new ComponentsView(); |
f47e82cd6077
completes feature: project components
Mike Becker <universe@uap-core.de>
parents:
133
diff
changeset
|
387 | populate(viewModel, pathParameters, dao); |
f47e82cd6077
completes feature: project components
Mike Becker <universe@uap-core.de>
parents:
133
diff
changeset
|
388 | |
f47e82cd6077
completes feature: project components
Mike Becker <universe@uap-core.de>
parents:
133
diff
changeset
|
389 | final var projectInfo = viewModel.getProjectInfo(); |
f47e82cd6077
completes feature: project components
Mike Becker <universe@uap-core.de>
parents:
133
diff
changeset
|
390 | if (projectInfo == null) { |
f47e82cd6077
completes feature: project components
Mike Becker <universe@uap-core.de>
parents:
133
diff
changeset
|
391 | resp.sendError(HttpServletResponse.SC_NOT_FOUND); |
157
1e6f16fad3a5
removes ResponseType enum
Mike Becker <universe@uap-core.de>
parents:
152
diff
changeset
|
392 | return; |
134
f47e82cd6077
completes feature: project components
Mike Becker <universe@uap-core.de>
parents:
133
diff
changeset
|
393 | } |
f47e82cd6077
completes feature: project components
Mike Becker <universe@uap-core.de>
parents:
133
diff
changeset
|
394 | |
167
3f30adba1c63
major refactoring of DAO architecture - also fixes #114
Mike Becker <universe@uap-core.de>
parents:
162
diff
changeset
|
395 | final var issues = dao.listIssues( |
3f30adba1c63
major refactoring of DAO architecture - also fixes #114
Mike Becker <universe@uap-core.de>
parents:
162
diff
changeset
|
396 | new IssueFilter( |
3f30adba1c63
major refactoring of DAO architecture - also fixes #114
Mike Becker <universe@uap-core.de>
parents:
162
diff
changeset
|
397 | new SpecificFilter<>(projectInfo.getProject()), |
3f30adba1c63
major refactoring of DAO architecture - also fixes #114
Mike Becker <universe@uap-core.de>
parents:
162
diff
changeset
|
398 | new AllFilter<>(), |
3f30adba1c63
major refactoring of DAO architecture - also fixes #114
Mike Becker <universe@uap-core.de>
parents:
162
diff
changeset
|
399 | new AllFilter<>() |
3f30adba1c63
major refactoring of DAO architecture - also fixes #114
Mike Becker <universe@uap-core.de>
parents:
162
diff
changeset
|
400 | ) |
3f30adba1c63
major refactoring of DAO architecture - also fixes #114
Mike Becker <universe@uap-core.de>
parents:
162
diff
changeset
|
401 | ); |
134
f47e82cd6077
completes feature: project components
Mike Becker <universe@uap-core.de>
parents:
133
diff
changeset
|
402 | viewModel.update(projectInfo.getComponents(), issues); |
f47e82cd6077
completes feature: project components
Mike Becker <universe@uap-core.de>
parents:
133
diff
changeset
|
403 | |
157
1e6f16fad3a5
removes ResponseType enum
Mike Becker <universe@uap-core.de>
parents:
152
diff
changeset
|
404 | forwardView(req, resp, viewModel, "components"); |
134
f47e82cd6077
completes feature: project components
Mike Becker <universe@uap-core.de>
parents:
133
diff
changeset
|
405 | } |
f47e82cd6077
completes feature: project components
Mike Becker <universe@uap-core.de>
parents:
133
diff
changeset
|
406 | |
f47e82cd6077
completes feature: project components
Mike Becker <universe@uap-core.de>
parents:
133
diff
changeset
|
407 | @RequestMapping(requestPath = "$project/components/$component/edit", method = HttpMethod.GET) |
167
3f30adba1c63
major refactoring of DAO architecture - also fixes #114
Mike Becker <universe@uap-core.de>
parents:
162
diff
changeset
|
408 | public void editComponent(HttpServletRequest req, HttpServletResponse resp, PathParameters pathParameters, DataAccessObject dao) throws IOException, ServletException { |
134
f47e82cd6077
completes feature: project components
Mike Becker <universe@uap-core.de>
parents:
133
diff
changeset
|
409 | final var viewModel = new ComponentEditView(); |
f47e82cd6077
completes feature: project components
Mike Becker <universe@uap-core.de>
parents:
133
diff
changeset
|
410 | populate(viewModel, pathParameters, dao); |
f47e82cd6077
completes feature: project components
Mike Becker <universe@uap-core.de>
parents:
133
diff
changeset
|
411 | |
f47e82cd6077
completes feature: project components
Mike Becker <universe@uap-core.de>
parents:
133
diff
changeset
|
412 | if (viewModel.getProjectInfo() == null || viewModel.getComponentFilter() == null) { |
f47e82cd6077
completes feature: project components
Mike Becker <universe@uap-core.de>
parents:
133
diff
changeset
|
413 | resp.sendError(HttpServletResponse.SC_NOT_FOUND); |
157
1e6f16fad3a5
removes ResponseType enum
Mike Becker <universe@uap-core.de>
parents:
152
diff
changeset
|
414 | return; |
134
f47e82cd6077
completes feature: project components
Mike Becker <universe@uap-core.de>
parents:
133
diff
changeset
|
415 | } |
f47e82cd6077
completes feature: project components
Mike Becker <universe@uap-core.de>
parents:
133
diff
changeset
|
416 | |
f47e82cd6077
completes feature: project components
Mike Becker <universe@uap-core.de>
parents:
133
diff
changeset
|
417 | viewModel.setComponent(viewModel.getComponentFilter()); |
167
3f30adba1c63
major refactoring of DAO architecture - also fixes #114
Mike Becker <universe@uap-core.de>
parents:
162
diff
changeset
|
418 | viewModel.setUsers(dao.listUsers()); |
134
f47e82cd6077
completes feature: project components
Mike Becker <universe@uap-core.de>
parents:
133
diff
changeset
|
419 | |
157
1e6f16fad3a5
removes ResponseType enum
Mike Becker <universe@uap-core.de>
parents:
152
diff
changeset
|
420 | forwardView(req, resp, viewModel, "component-form"); |
134
f47e82cd6077
completes feature: project components
Mike Becker <universe@uap-core.de>
parents:
133
diff
changeset
|
421 | } |
f47e82cd6077
completes feature: project components
Mike Becker <universe@uap-core.de>
parents:
133
diff
changeset
|
422 | |
f47e82cd6077
completes feature: project components
Mike Becker <universe@uap-core.de>
parents:
133
diff
changeset
|
423 | @RequestMapping(requestPath = "$project/create-component", method = HttpMethod.GET) |
167
3f30adba1c63
major refactoring of DAO architecture - also fixes #114
Mike Becker <universe@uap-core.de>
parents:
162
diff
changeset
|
424 | public void createComponent(HttpServletRequest req, HttpServletResponse resp, PathParameters pathParameters, DataAccessObject dao) throws IOException, ServletException { |
134
f47e82cd6077
completes feature: project components
Mike Becker <universe@uap-core.de>
parents:
133
diff
changeset
|
425 | final var viewModel = new ComponentEditView(); |
f47e82cd6077
completes feature: project components
Mike Becker <universe@uap-core.de>
parents:
133
diff
changeset
|
426 | populate(viewModel, pathParameters, dao); |
f47e82cd6077
completes feature: project components
Mike Becker <universe@uap-core.de>
parents:
133
diff
changeset
|
427 | |
f47e82cd6077
completes feature: project components
Mike Becker <universe@uap-core.de>
parents:
133
diff
changeset
|
428 | if (viewModel.getProjectInfo() == null) { |
f47e82cd6077
completes feature: project components
Mike Becker <universe@uap-core.de>
parents:
133
diff
changeset
|
429 | resp.sendError(HttpServletResponse.SC_NOT_FOUND); |
157
1e6f16fad3a5
removes ResponseType enum
Mike Becker <universe@uap-core.de>
parents:
152
diff
changeset
|
430 | return; |
134
f47e82cd6077
completes feature: project components
Mike Becker <universe@uap-core.de>
parents:
133
diff
changeset
|
431 | } |
f47e82cd6077
completes feature: project components
Mike Becker <universe@uap-core.de>
parents:
133
diff
changeset
|
432 | |
167
3f30adba1c63
major refactoring of DAO architecture - also fixes #114
Mike Becker <universe@uap-core.de>
parents:
162
diff
changeset
|
433 | viewModel.setComponent(new Component(-1, viewModel.getProjectInfo().getProject().getId())); |
3f30adba1c63
major refactoring of DAO architecture - also fixes #114
Mike Becker <universe@uap-core.de>
parents:
162
diff
changeset
|
434 | viewModel.setUsers(dao.listUsers()); |
134
f47e82cd6077
completes feature: project components
Mike Becker <universe@uap-core.de>
parents:
133
diff
changeset
|
435 | |
157
1e6f16fad3a5
removes ResponseType enum
Mike Becker <universe@uap-core.de>
parents:
152
diff
changeset
|
436 | forwardView(req, resp, viewModel, "component-form"); |
134
f47e82cd6077
completes feature: project components
Mike Becker <universe@uap-core.de>
parents:
133
diff
changeset
|
437 | } |
f47e82cd6077
completes feature: project components
Mike Becker <universe@uap-core.de>
parents:
133
diff
changeset
|
438 | |
f47e82cd6077
completes feature: project components
Mike Becker <universe@uap-core.de>
parents:
133
diff
changeset
|
439 | @RequestMapping(requestPath = "commit-component", method = HttpMethod.POST) |
167
3f30adba1c63
major refactoring of DAO architecture - also fixes #114
Mike Becker <universe@uap-core.de>
parents:
162
diff
changeset
|
440 | public void commitComponent(HttpServletRequest req, HttpServletResponse resp, DataAccessObject dao) throws IOException, ServletException { |
134
f47e82cd6077
completes feature: project components
Mike Becker <universe@uap-core.de>
parents:
133
diff
changeset
|
441 | |
f47e82cd6077
completes feature: project components
Mike Becker <universe@uap-core.de>
parents:
133
diff
changeset
|
442 | try { |
167
3f30adba1c63
major refactoring of DAO architecture - also fixes #114
Mike Becker <universe@uap-core.de>
parents:
162
diff
changeset
|
443 | final var project = dao.findProject(getParameter(req, Integer.class, "pid").orElseThrow()); |
138
e2aa673dd473
adds custom node names - fixes #27
Mike Becker <universe@uap-core.de>
parents:
137
diff
changeset
|
444 | if (project == null) { |
e2aa673dd473
adds custom node names - fixes #27
Mike Becker <universe@uap-core.de>
parents:
137
diff
changeset
|
445 | // TODO: improve error handling, because not found is not correct for this POST request |
e2aa673dd473
adds custom node names - fixes #27
Mike Becker <universe@uap-core.de>
parents:
137
diff
changeset
|
446 | resp.sendError(HttpServletResponse.SC_NOT_FOUND); |
157
1e6f16fad3a5
removes ResponseType enum
Mike Becker <universe@uap-core.de>
parents:
152
diff
changeset
|
447 | return; |
138
e2aa673dd473
adds custom node names - fixes #27
Mike Becker <universe@uap-core.de>
parents:
137
diff
changeset
|
448 | } |
167
3f30adba1c63
major refactoring of DAO architecture - also fixes #114
Mike Becker <universe@uap-core.de>
parents:
162
diff
changeset
|
449 | final var component = new Component(getParameter(req, Integer.class, "id").orElseThrow(), project.getId()); |
134
f47e82cd6077
completes feature: project components
Mike Becker <universe@uap-core.de>
parents:
133
diff
changeset
|
450 | component.setName(getParameter(req, String.class, "name").orElseThrow()); |
138
e2aa673dd473
adds custom node names - fixes #27
Mike Becker <universe@uap-core.de>
parents:
137
diff
changeset
|
451 | |
e2aa673dd473
adds custom node names - fixes #27
Mike Becker <universe@uap-core.de>
parents:
137
diff
changeset
|
452 | final var node = getParameter(req, String.class, "node").orElse(null); |
e2aa673dd473
adds custom node names - fixes #27
Mike Becker <universe@uap-core.de>
parents:
137
diff
changeset
|
453 | component.setNode(sanitizeNode(node, component.getName())); |
e2aa673dd473
adds custom node names - fixes #27
Mike Becker <universe@uap-core.de>
parents:
137
diff
changeset
|
454 | |
134
f47e82cd6077
completes feature: project components
Mike Becker <universe@uap-core.de>
parents:
133
diff
changeset
|
455 | component.setColor(getParameter(req, WebColor.class, "color").orElseThrow()); |
f47e82cd6077
completes feature: project components
Mike Becker <universe@uap-core.de>
parents:
133
diff
changeset
|
456 | getParameter(req, Integer.class, "ordinal").ifPresent(component::setOrdinal); |
f47e82cd6077
completes feature: project components
Mike Becker <universe@uap-core.de>
parents:
133
diff
changeset
|
457 | getParameter(req, Integer.class, "lead").map( |
f47e82cd6077
completes feature: project components
Mike Becker <universe@uap-core.de>
parents:
133
diff
changeset
|
458 | userid -> userid >= 0 ? new User(userid) : null |
f47e82cd6077
completes feature: project components
Mike Becker <universe@uap-core.de>
parents:
133
diff
changeset
|
459 | ).ifPresent(component::setLead); |
f47e82cd6077
completes feature: project components
Mike Becker <universe@uap-core.de>
parents:
133
diff
changeset
|
460 | getParameter(req, String.class, "description").ifPresent(component::setDescription); |
f47e82cd6077
completes feature: project components
Mike Becker <universe@uap-core.de>
parents:
133
diff
changeset
|
461 | |
159 | 462 | if (component.getId() > 0) { |
167
3f30adba1c63
major refactoring of DAO architecture - also fixes #114
Mike Becker <universe@uap-core.de>
parents:
162
diff
changeset
|
463 | dao.updateComponent(component); |
159 | 464 | } else { |
167
3f30adba1c63
major refactoring of DAO architecture - also fixes #114
Mike Becker <universe@uap-core.de>
parents:
162
diff
changeset
|
465 | dao.insertComponent(component); |
159 | 466 | } |
134
f47e82cd6077
completes feature: project components
Mike Becker <universe@uap-core.de>
parents:
133
diff
changeset
|
467 | |
138
e2aa673dd473
adds custom node names - fixes #27
Mike Becker <universe@uap-core.de>
parents:
137
diff
changeset
|
468 | setRedirectLocation(req, "./projects/" + project.getNode() + "/components/"); |
134
f47e82cd6077
completes feature: project components
Mike Becker <universe@uap-core.de>
parents:
133
diff
changeset
|
469 | setContentPage(req, Constants.JSP_COMMIT_SUCCESSFUL); |
157
1e6f16fad3a5
removes ResponseType enum
Mike Becker <universe@uap-core.de>
parents:
152
diff
changeset
|
470 | |
1e6f16fad3a5
removes ResponseType enum
Mike Becker <universe@uap-core.de>
parents:
152
diff
changeset
|
471 | renderSite(req, resp); |
159 | 472 | } catch (NoSuchElementException | IllegalArgumentException ex) { |
134
f47e82cd6077
completes feature: project components
Mike Becker <universe@uap-core.de>
parents:
133
diff
changeset
|
473 | resp.sendError(HttpServletResponse.SC_NOT_IMPLEMENTED); |
f47e82cd6077
completes feature: project components
Mike Becker <universe@uap-core.de>
parents:
133
diff
changeset
|
474 | // TODO: implement - fix issue #21 |
f47e82cd6077
completes feature: project components
Mike Becker <universe@uap-core.de>
parents:
133
diff
changeset
|
475 | } |
f47e82cd6077
completes feature: project components
Mike Becker <universe@uap-core.de>
parents:
133
diff
changeset
|
476 | } |
f47e82cd6077
completes feature: project components
Mike Becker <universe@uap-core.de>
parents:
133
diff
changeset
|
477 | |
167
3f30adba1c63
major refactoring of DAO architecture - also fixes #114
Mike Becker <universe@uap-core.de>
parents:
162
diff
changeset
|
478 | private void configureIssueEditor(IssueEditView viewModel, Issue issue, DataAccessObject dao) { |
134
f47e82cd6077
completes feature: project components
Mike Becker <universe@uap-core.de>
parents:
133
diff
changeset
|
479 | final var project = viewModel.getProjectInfo().getProject(); |
146
b0e83cab0bde
adds issue detail view - fixes #24
Mike Becker <universe@uap-core.de>
parents:
141
diff
changeset
|
480 | issue.setProject(project); // automatically set current project for new issues |
99 | 481 | viewModel.setIssue(issue); |
482 | viewModel.configureVersionSelectors(viewModel.getProjectInfo().getVersions()); | |
167
3f30adba1c63
major refactoring of DAO architecture - also fixes #114
Mike Becker <universe@uap-core.de>
parents:
162
diff
changeset
|
483 | viewModel.setUsers(dao.listUsers()); |
3f30adba1c63
major refactoring of DAO architecture - also fixes #114
Mike Becker <universe@uap-core.de>
parents:
162
diff
changeset
|
484 | viewModel.setComponents(dao.listComponents(project)); |
71 | 485 | } |
486 | ||
146
b0e83cab0bde
adds issue detail view - fixes #24
Mike Becker <universe@uap-core.de>
parents:
141
diff
changeset
|
487 | @RequestMapping(requestPath = "$project/issues/$issue/view", method = HttpMethod.GET) |
167
3f30adba1c63
major refactoring of DAO architecture - also fixes #114
Mike Becker <universe@uap-core.de>
parents:
162
diff
changeset
|
488 | public void viewIssue(HttpServletRequest req, HttpServletResponse resp, PathParameters pathParameters, DataAccessObject dao) throws IOException, ServletException { |
146
b0e83cab0bde
adds issue detail view - fixes #24
Mike Becker <universe@uap-core.de>
parents:
141
diff
changeset
|
489 | final var viewModel = new IssueDetailView(); |
b0e83cab0bde
adds issue detail view - fixes #24
Mike Becker <universe@uap-core.de>
parents:
141
diff
changeset
|
490 | populate(viewModel, pathParameters, dao); |
b0e83cab0bde
adds issue detail view - fixes #24
Mike Becker <universe@uap-core.de>
parents:
141
diff
changeset
|
491 | |
b0e83cab0bde
adds issue detail view - fixes #24
Mike Becker <universe@uap-core.de>
parents:
141
diff
changeset
|
492 | final var projectInfo = viewModel.getProjectInfo(); |
b0e83cab0bde
adds issue detail view - fixes #24
Mike Becker <universe@uap-core.de>
parents:
141
diff
changeset
|
493 | if (projectInfo == null) { |
b0e83cab0bde
adds issue detail view - fixes #24
Mike Becker <universe@uap-core.de>
parents:
141
diff
changeset
|
494 | resp.sendError(HttpServletResponse.SC_NOT_FOUND); |
157
1e6f16fad3a5
removes ResponseType enum
Mike Becker <universe@uap-core.de>
parents:
152
diff
changeset
|
495 | return; |
146
b0e83cab0bde
adds issue detail view - fixes #24
Mike Becker <universe@uap-core.de>
parents:
141
diff
changeset
|
496 | } |
b0e83cab0bde
adds issue detail view - fixes #24
Mike Becker <universe@uap-core.de>
parents:
141
diff
changeset
|
497 | |
167
3f30adba1c63
major refactoring of DAO architecture - also fixes #114
Mike Becker <universe@uap-core.de>
parents:
162
diff
changeset
|
498 | final var issue = dao.findIssue(parseIntOrZero(pathParameters.get("issue"))); |
146
b0e83cab0bde
adds issue detail view - fixes #24
Mike Becker <universe@uap-core.de>
parents:
141
diff
changeset
|
499 | if (issue == null) { |
b0e83cab0bde
adds issue detail view - fixes #24
Mike Becker <universe@uap-core.de>
parents:
141
diff
changeset
|
500 | resp.sendError(HttpServletResponse.SC_NOT_FOUND); |
157
1e6f16fad3a5
removes ResponseType enum
Mike Becker <universe@uap-core.de>
parents:
152
diff
changeset
|
501 | return; |
146
b0e83cab0bde
adds issue detail view - fixes #24
Mike Becker <universe@uap-core.de>
parents:
141
diff
changeset
|
502 | } |
b0e83cab0bde
adds issue detail view - fixes #24
Mike Becker <universe@uap-core.de>
parents:
141
diff
changeset
|
503 | |
b0e83cab0bde
adds issue detail view - fixes #24
Mike Becker <universe@uap-core.de>
parents:
141
diff
changeset
|
504 | viewModel.setIssue(issue); |
167
3f30adba1c63
major refactoring of DAO architecture - also fixes #114
Mike Becker <universe@uap-core.de>
parents:
162
diff
changeset
|
505 | viewModel.setComments(dao.listComments(issue)); |
146
b0e83cab0bde
adds issue detail view - fixes #24
Mike Becker <universe@uap-core.de>
parents:
141
diff
changeset
|
506 | |
162
2adc8623dd89
enables markdown support in issue descriptions and comments - fixes #10
Mike Becker <universe@uap-core.de>
parents:
161
diff
changeset
|
507 | viewModel.processMarkdown(); |
2adc8623dd89
enables markdown support in issue descriptions and comments - fixes #10
Mike Becker <universe@uap-core.de>
parents:
161
diff
changeset
|
508 | |
157
1e6f16fad3a5
removes ResponseType enum
Mike Becker <universe@uap-core.de>
parents:
152
diff
changeset
|
509 | forwardView(req, resp, viewModel, "issue-view"); |
146
b0e83cab0bde
adds issue detail view - fixes #24
Mike Becker <universe@uap-core.de>
parents:
141
diff
changeset
|
510 | } |
b0e83cab0bde
adds issue detail view - fixes #24
Mike Becker <universe@uap-core.de>
parents:
141
diff
changeset
|
511 | |
b0e83cab0bde
adds issue detail view - fixes #24
Mike Becker <universe@uap-core.de>
parents:
141
diff
changeset
|
512 | // TODO: why should the issue editor be child of $project? |
131
67df332e3146
changes request mapping to contain project and version ID as path parameters (this removes the session storage)
Mike Becker <universe@uap-core.de>
parents:
129
diff
changeset
|
513 | @RequestMapping(requestPath = "$project/issues/$issue/edit", method = HttpMethod.GET) |
167
3f30adba1c63
major refactoring of DAO architecture - also fixes #114
Mike Becker <universe@uap-core.de>
parents:
162
diff
changeset
|
514 | public void editIssue(HttpServletRequest req, HttpServletResponse resp, PathParameters pathParameters, DataAccessObject dao) throws IOException, SQLException, ServletException { |
99 | 515 | final var viewModel = new IssueEditView(); |
131
67df332e3146
changes request mapping to contain project and version ID as path parameters (this removes the session storage)
Mike Becker <universe@uap-core.de>
parents:
129
diff
changeset
|
516 | populate(viewModel, pathParameters, dao); |
99 | 517 | |
131
67df332e3146
changes request mapping to contain project and version ID as path parameters (this removes the session storage)
Mike Becker <universe@uap-core.de>
parents:
129
diff
changeset
|
518 | final var projectInfo = viewModel.getProjectInfo(); |
67df332e3146
changes request mapping to contain project and version ID as path parameters (this removes the session storage)
Mike Becker <universe@uap-core.de>
parents:
129
diff
changeset
|
519 | if (projectInfo == null) { |
67df332e3146
changes request mapping to contain project and version ID as path parameters (this removes the session storage)
Mike Becker <universe@uap-core.de>
parents:
129
diff
changeset
|
520 | resp.sendError(HttpServletResponse.SC_NOT_FOUND); |
157
1e6f16fad3a5
removes ResponseType enum
Mike Becker <universe@uap-core.de>
parents:
152
diff
changeset
|
521 | return; |
86
0a658e53177c
improves issue overview and adds progress information
Mike Becker <universe@uap-core.de>
parents:
83
diff
changeset
|
522 | } |
64
0f1746c6abfb
adds backend methods for issues (TODO: implement commitIssue())
Mike Becker <universe@uap-core.de>
parents:
61
diff
changeset
|
523 | |
167
3f30adba1c63
major refactoring of DAO architecture - also fixes #114
Mike Becker <universe@uap-core.de>
parents:
162
diff
changeset
|
524 | final var issue = dao.findIssue(parseIntOrZero(pathParameters.get("issue"))); |
131
67df332e3146
changes request mapping to contain project and version ID as path parameters (this removes the session storage)
Mike Becker <universe@uap-core.de>
parents:
129
diff
changeset
|
525 | if (issue == null) { |
67df332e3146
changes request mapping to contain project and version ID as path parameters (this removes the session storage)
Mike Becker <universe@uap-core.de>
parents:
129
diff
changeset
|
526 | resp.sendError(HttpServletResponse.SC_NOT_FOUND); |
157
1e6f16fad3a5
removes ResponseType enum
Mike Becker <universe@uap-core.de>
parents:
152
diff
changeset
|
527 | return; |
131
67df332e3146
changes request mapping to contain project and version ID as path parameters (this removes the session storage)
Mike Becker <universe@uap-core.de>
parents:
129
diff
changeset
|
528 | } |
67df332e3146
changes request mapping to contain project and version ID as path parameters (this removes the session storage)
Mike Becker <universe@uap-core.de>
parents:
129
diff
changeset
|
529 | |
133
ef075cd7ce55
fixes wrong method name for configureIssueEditor()
Mike Becker <universe@uap-core.de>
parents:
131
diff
changeset
|
530 | configureIssueEditor(viewModel, issue, dao); |
131
67df332e3146
changes request mapping to contain project and version ID as path parameters (this removes the session storage)
Mike Becker <universe@uap-core.de>
parents:
129
diff
changeset
|
531 | |
157
1e6f16fad3a5
removes ResponseType enum
Mike Becker <universe@uap-core.de>
parents:
152
diff
changeset
|
532 | forwardView(req, resp, viewModel, "issue-form"); |
64
0f1746c6abfb
adds backend methods for issues (TODO: implement commitIssue())
Mike Becker <universe@uap-core.de>
parents:
61
diff
changeset
|
533 | } |
0f1746c6abfb
adds backend methods for issues (TODO: implement commitIssue())
Mike Becker <universe@uap-core.de>
parents:
61
diff
changeset
|
534 | |
131
67df332e3146
changes request mapping to contain project and version ID as path parameters (this removes the session storage)
Mike Becker <universe@uap-core.de>
parents:
129
diff
changeset
|
535 | @RequestMapping(requestPath = "$project/create-issue", method = HttpMethod.GET) |
168
1c3694ae224c
adds "Create another" checkbox to issue form - fixes #110
Mike Becker <universe@uap-core.de>
parents:
167
diff
changeset
|
536 | public void createIssue(HttpServletRequest req, HttpServletResponse resp, PathParameters pathParameters, DataAccessObject dao) throws IOException, ServletException { |
131
67df332e3146
changes request mapping to contain project and version ID as path parameters (this removes the session storage)
Mike Becker <universe@uap-core.de>
parents:
129
diff
changeset
|
537 | final var viewModel = new IssueEditView(); |
67df332e3146
changes request mapping to contain project and version ID as path parameters (this removes the session storage)
Mike Becker <universe@uap-core.de>
parents:
129
diff
changeset
|
538 | populate(viewModel, pathParameters, dao); |
67df332e3146
changes request mapping to contain project and version ID as path parameters (this removes the session storage)
Mike Becker <universe@uap-core.de>
parents:
129
diff
changeset
|
539 | |
67df332e3146
changes request mapping to contain project and version ID as path parameters (this removes the session storage)
Mike Becker <universe@uap-core.de>
parents:
129
diff
changeset
|
540 | final var projectInfo = viewModel.getProjectInfo(); |
67df332e3146
changes request mapping to contain project and version ID as path parameters (this removes the session storage)
Mike Becker <universe@uap-core.de>
parents:
129
diff
changeset
|
541 | if (projectInfo == null) { |
67df332e3146
changes request mapping to contain project and version ID as path parameters (this removes the session storage)
Mike Becker <universe@uap-core.de>
parents:
129
diff
changeset
|
542 | resp.sendError(HttpServletResponse.SC_NOT_FOUND); |
157
1e6f16fad3a5
removes ResponseType enum
Mike Becker <universe@uap-core.de>
parents:
152
diff
changeset
|
543 | return; |
131
67df332e3146
changes request mapping to contain project and version ID as path parameters (this removes the session storage)
Mike Becker <universe@uap-core.de>
parents:
129
diff
changeset
|
544 | } |
67df332e3146
changes request mapping to contain project and version ID as path parameters (this removes the session storage)
Mike Becker <universe@uap-core.de>
parents:
129
diff
changeset
|
545 | |
168
1c3694ae224c
adds "Create another" checkbox to issue form - fixes #110
Mike Becker <universe@uap-core.de>
parents:
167
diff
changeset
|
546 | setAttributeFromParameter(req, "more"); |
178
88207b860cba
automatically select version/component when creating new issues under active filters
Mike Becker <universe@uap-core.de>
parents:
175
diff
changeset
|
547 | setAttributeFromParameter(req, "cid"); |
88207b860cba
automatically select version/component when creating new issues under active filters
Mike Becker <universe@uap-core.de>
parents:
175
diff
changeset
|
548 | setAttributeFromParameter(req, "vid"); |
168
1c3694ae224c
adds "Create another" checkbox to issue form - fixes #110
Mike Becker <universe@uap-core.de>
parents:
167
diff
changeset
|
549 | |
167
3f30adba1c63
major refactoring of DAO architecture - also fixes #114
Mike Becker <universe@uap-core.de>
parents:
162
diff
changeset
|
550 | final var issue = new Issue(-1, projectInfo.getProject(), null); |
131
67df332e3146
changes request mapping to contain project and version ID as path parameters (this removes the session storage)
Mike Becker <universe@uap-core.de>
parents:
129
diff
changeset
|
551 | issue.setProject(projectInfo.getProject()); |
133
ef075cd7ce55
fixes wrong method name for configureIssueEditor()
Mike Becker <universe@uap-core.de>
parents:
131
diff
changeset
|
552 | configureIssueEditor(viewModel, issue, dao); |
131
67df332e3146
changes request mapping to contain project and version ID as path parameters (this removes the session storage)
Mike Becker <universe@uap-core.de>
parents:
129
diff
changeset
|
553 | |
157
1e6f16fad3a5
removes ResponseType enum
Mike Becker <universe@uap-core.de>
parents:
152
diff
changeset
|
554 | forwardView(req, resp, viewModel, "issue-form"); |
131
67df332e3146
changes request mapping to contain project and version ID as path parameters (this removes the session storage)
Mike Becker <universe@uap-core.de>
parents:
129
diff
changeset
|
555 | } |
67df332e3146
changes request mapping to contain project and version ID as path parameters (this removes the session storage)
Mike Becker <universe@uap-core.de>
parents:
129
diff
changeset
|
556 | |
67df332e3146
changes request mapping to contain project and version ID as path parameters (this removes the session storage)
Mike Becker <universe@uap-core.de>
parents:
129
diff
changeset
|
557 | @RequestMapping(requestPath = "commit-issue", method = HttpMethod.POST) |
167
3f30adba1c63
major refactoring of DAO architecture - also fixes #114
Mike Becker <universe@uap-core.de>
parents:
162
diff
changeset
|
558 | public void commitIssue(HttpServletRequest req, HttpServletResponse resp, DataAccessObject dao) throws IOException, ServletException { |
64
0f1746c6abfb
adds backend methods for issues (TODO: implement commitIssue())
Mike Becker <universe@uap-core.de>
parents:
61
diff
changeset
|
559 | try { |
167
3f30adba1c63
major refactoring of DAO architecture - also fixes #114
Mike Becker <universe@uap-core.de>
parents:
162
diff
changeset
|
560 | final var project = dao.findProject(getParameter(req, Integer.class, "pid").orElseThrow()); |
138
e2aa673dd473
adds custom node names - fixes #27
Mike Becker <universe@uap-core.de>
parents:
137
diff
changeset
|
561 | if (project == null) { |
e2aa673dd473
adds custom node names - fixes #27
Mike Becker <universe@uap-core.de>
parents:
137
diff
changeset
|
562 | // TODO: improve error handling, because not found is not correct for this POST request |
e2aa673dd473
adds custom node names - fixes #27
Mike Becker <universe@uap-core.de>
parents:
137
diff
changeset
|
563 | resp.sendError(HttpServletResponse.SC_NOT_FOUND); |
157
1e6f16fad3a5
removes ResponseType enum
Mike Becker <universe@uap-core.de>
parents:
152
diff
changeset
|
564 | return; |
138
e2aa673dd473
adds custom node names - fixes #27
Mike Becker <universe@uap-core.de>
parents:
137
diff
changeset
|
565 | } |
167
3f30adba1c63
major refactoring of DAO architecture - also fixes #114
Mike Becker <universe@uap-core.de>
parents:
162
diff
changeset
|
566 | final var componentId = getParameter(req, Integer.class, "component"); |
3f30adba1c63
major refactoring of DAO architecture - also fixes #114
Mike Becker <universe@uap-core.de>
parents:
162
diff
changeset
|
567 | final Component component; |
3f30adba1c63
major refactoring of DAO architecture - also fixes #114
Mike Becker <universe@uap-core.de>
parents:
162
diff
changeset
|
568 | if (componentId.isPresent()) { |
3f30adba1c63
major refactoring of DAO architecture - also fixes #114
Mike Becker <universe@uap-core.de>
parents:
162
diff
changeset
|
569 | component = dao.findComponent(componentId.get()); |
3f30adba1c63
major refactoring of DAO architecture - also fixes #114
Mike Becker <universe@uap-core.de>
parents:
162
diff
changeset
|
570 | } else { |
3f30adba1c63
major refactoring of DAO architecture - also fixes #114
Mike Becker <universe@uap-core.de>
parents:
162
diff
changeset
|
571 | component = null; |
3f30adba1c63
major refactoring of DAO architecture - also fixes #114
Mike Becker <universe@uap-core.de>
parents:
162
diff
changeset
|
572 | } |
3f30adba1c63
major refactoring of DAO architecture - also fixes #114
Mike Becker <universe@uap-core.de>
parents:
162
diff
changeset
|
573 | final var issue = new Issue(getParameter(req, Integer.class, "id").orElseThrow(), project, component); |
75
33b6843fdf8a
adds the ability to create and edit issues
Mike Becker <universe@uap-core.de>
parents:
74
diff
changeset
|
574 | 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
|
575 | 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
|
576 | issue.setSubject(getParameter(req, String.class, "subject").orElseThrow()); |
136
7281bdf43c60
automatic assignment of component lead (if available) - fixes #28
Mike Becker <universe@uap-core.de>
parents:
134
diff
changeset
|
577 | getParameter(req, Integer.class, "assignee").map(userid -> { |
7281bdf43c60
automatic assignment of component lead (if available) - fixes #28
Mike Becker <universe@uap-core.de>
parents:
134
diff
changeset
|
578 | if (userid >= 0) { |
7281bdf43c60
automatic assignment of component lead (if available) - fixes #28
Mike Becker <universe@uap-core.de>
parents:
134
diff
changeset
|
579 | return new User(userid); |
7281bdf43c60
automatic assignment of component lead (if available) - fixes #28
Mike Becker <universe@uap-core.de>
parents:
134
diff
changeset
|
580 | } else if (userid == -2) { |
7281bdf43c60
automatic assignment of component lead (if available) - fixes #28
Mike Becker <universe@uap-core.de>
parents:
134
diff
changeset
|
581 | return Optional.ofNullable(component).map(Component::getLead).orElse(null); |
7281bdf43c60
automatic assignment of component lead (if available) - fixes #28
Mike Becker <universe@uap-core.de>
parents:
134
diff
changeset
|
582 | } else { |
7281bdf43c60
automatic assignment of component lead (if available) - fixes #28
Mike Becker <universe@uap-core.de>
parents:
134
diff
changeset
|
583 | return null; |
7281bdf43c60
automatic assignment of component lead (if available) - fixes #28
Mike Becker <universe@uap-core.de>
parents:
134
diff
changeset
|
584 | } |
7281bdf43c60
automatic assignment of component lead (if available) - fixes #28
Mike Becker <universe@uap-core.de>
parents:
134
diff
changeset
|
585 | } |
75
33b6843fdf8a
adds the ability to create and edit issues
Mike Becker <universe@uap-core.de>
parents:
74
diff
changeset
|
586 | ).ifPresent(issue::setAssignee); |
33b6843fdf8a
adds the ability to create and edit issues
Mike Becker <universe@uap-core.de>
parents:
74
diff
changeset
|
587 | 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
|
588 | 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
|
589 | |
24a3596b8f98
adds version selection in issue editor
Mike Becker <universe@uap-core.de>
parents:
81
diff
changeset
|
590 | getParameter(req, Integer[].class, "affected") |
24a3596b8f98
adds version selection in issue editor
Mike Becker <universe@uap-core.de>
parents:
81
diff
changeset
|
591 | .map(Stream::of) |
24a3596b8f98
adds version selection in issue editor
Mike Becker <universe@uap-core.de>
parents:
81
diff
changeset
|
592 | .map(stream -> |
167
3f30adba1c63
major refactoring of DAO architecture - also fixes #114
Mike Becker <universe@uap-core.de>
parents:
162
diff
changeset
|
593 | stream.map(id -> new Version(id, project.getId())) |
3f30adba1c63
major refactoring of DAO architecture - also fixes #114
Mike Becker <universe@uap-core.de>
parents:
162
diff
changeset
|
594 | .collect(Collectors.toList()) |
83
24a3596b8f98
adds version selection in issue editor
Mike Becker <universe@uap-core.de>
parents:
81
diff
changeset
|
595 | ).ifPresent(issue::setAffectedVersions); |
24a3596b8f98
adds version selection in issue editor
Mike Becker <universe@uap-core.de>
parents:
81
diff
changeset
|
596 | getParameter(req, Integer[].class, "resolved") |
24a3596b8f98
adds version selection in issue editor
Mike Becker <universe@uap-core.de>
parents:
81
diff
changeset
|
597 | .map(Stream::of) |
24a3596b8f98
adds version selection in issue editor
Mike Becker <universe@uap-core.de>
parents:
81
diff
changeset
|
598 | .map(stream -> |
167
3f30adba1c63
major refactoring of DAO architecture - also fixes #114
Mike Becker <universe@uap-core.de>
parents:
162
diff
changeset
|
599 | stream.map(id -> new Version(id, project.getId())) |
3f30adba1c63
major refactoring of DAO architecture - also fixes #114
Mike Becker <universe@uap-core.de>
parents:
162
diff
changeset
|
600 | .collect(Collectors.toList()) |
83
24a3596b8f98
adds version selection in issue editor
Mike Becker <universe@uap-core.de>
parents:
81
diff
changeset
|
601 | ).ifPresent(issue::setResolvedVersions); |
24a3596b8f98
adds version selection in issue editor
Mike Becker <universe@uap-core.de>
parents:
81
diff
changeset
|
602 | |
159 | 603 | if (issue.getId() > 0) { |
167
3f30adba1c63
major refactoring of DAO architecture - also fixes #114
Mike Becker <universe@uap-core.de>
parents:
162
diff
changeset
|
604 | dao.updateIssue(issue); |
159 | 605 | } else { |
167
3f30adba1c63
major refactoring of DAO architecture - also fixes #114
Mike Becker <universe@uap-core.de>
parents:
162
diff
changeset
|
606 | dao.insertIssue(issue); |
159 | 607 | } |
64
0f1746c6abfb
adds backend methods for issues (TODO: implement commitIssue())
Mike Becker <universe@uap-core.de>
parents:
61
diff
changeset
|
608 | |
168
1c3694ae224c
adds "Create another" checkbox to issue form - fixes #110
Mike Becker <universe@uap-core.de>
parents:
167
diff
changeset
|
609 | if (getParameter(req, Boolean.class, "create-another").orElse(false)) { |
1c3694ae224c
adds "Create another" checkbox to issue form - fixes #110
Mike Becker <universe@uap-core.de>
parents:
167
diff
changeset
|
610 | // TODO: fix #38 - automatically select component (and version) |
1c3694ae224c
adds "Create another" checkbox to issue form - fixes #110
Mike Becker <universe@uap-core.de>
parents:
167
diff
changeset
|
611 | setRedirectLocation(req, "./projects/" + issue.getProject().getNode() + "/create-issue?more=true"); |
1c3694ae224c
adds "Create another" checkbox to issue form - fixes #110
Mike Becker <universe@uap-core.de>
parents:
167
diff
changeset
|
612 | } else{ |
1c3694ae224c
adds "Create another" checkbox to issue form - fixes #110
Mike Becker <universe@uap-core.de>
parents:
167
diff
changeset
|
613 | setRedirectLocation(req, "./projects/" + issue.getProject().getNode() + "/issues/" + issue.getId() + "/view"); |
1c3694ae224c
adds "Create another" checkbox to issue form - fixes #110
Mike Becker <universe@uap-core.de>
parents:
167
diff
changeset
|
614 | } |
74
91d1fc2a3a14
removes that dynamic_fragment bullshit
Mike Becker <universe@uap-core.de>
parents:
71
diff
changeset
|
615 | setContentPage(req, Constants.JSP_COMMIT_SUCCESSFUL); |
124 | 616 | |
157
1e6f16fad3a5
removes ResponseType enum
Mike Becker <universe@uap-core.de>
parents:
152
diff
changeset
|
617 | renderSite(req, resp); |
159 | 618 | } catch (NoSuchElementException | IllegalArgumentException ex) { |
131
67df332e3146
changes request mapping to contain project and version ID as path parameters (this removes the session storage)
Mike Becker <universe@uap-core.de>
parents:
129
diff
changeset
|
619 | resp.sendError(HttpServletResponse.SC_NOT_IMPLEMENTED); |
67df332e3146
changes request mapping to contain project and version ID as path parameters (this removes the session storage)
Mike Becker <universe@uap-core.de>
parents:
129
diff
changeset
|
620 | // TODO: implement - fix issue #21 |
64
0f1746c6abfb
adds backend methods for issues (TODO: implement commitIssue())
Mike Becker <universe@uap-core.de>
parents:
61
diff
changeset
|
621 | } |
124 | 622 | } |
64
0f1746c6abfb
adds backend methods for issues (TODO: implement commitIssue())
Mike Becker <universe@uap-core.de>
parents:
61
diff
changeset
|
623 | |
131
67df332e3146
changes request mapping to contain project and version ID as path parameters (this removes the session storage)
Mike Becker <universe@uap-core.de>
parents:
129
diff
changeset
|
624 | @RequestMapping(requestPath = "commit-issue-comment", method = HttpMethod.POST) |
167
3f30adba1c63
major refactoring of DAO architecture - also fixes #114
Mike Becker <universe@uap-core.de>
parents:
162
diff
changeset
|
625 | public void commentIssue(HttpServletRequest req, HttpServletResponse resp, DataAccessObject dao) throws IOException, ServletException { |
124 | 626 | final var issueIdParam = getParameter(req, Integer.class, "issueid"); |
627 | if (issueIdParam.isEmpty()) { | |
628 | resp.sendError(HttpServletResponse.SC_FORBIDDEN, "Detected manipulated form."); | |
157
1e6f16fad3a5
removes ResponseType enum
Mike Becker <universe@uap-core.de>
parents:
152
diff
changeset
|
629 | return; |
124 | 630 | } |
167
3f30adba1c63
major refactoring of DAO architecture - also fixes #114
Mike Becker <universe@uap-core.de>
parents:
162
diff
changeset
|
631 | final var issue = dao.findIssue(issueIdParam.get()); |
137
a7e543ab0c5f
fixes creation of redirect link when commenting an issue
Mike Becker <universe@uap-core.de>
parents:
136
diff
changeset
|
632 | if (issue == null) { |
a7e543ab0c5f
fixes creation of redirect link when commenting an issue
Mike Becker <universe@uap-core.de>
parents:
136
diff
changeset
|
633 | resp.sendError(HttpServletResponse.SC_NOT_FOUND); |
157
1e6f16fad3a5
removes ResponseType enum
Mike Becker <universe@uap-core.de>
parents:
152
diff
changeset
|
634 | return; |
137
a7e543ab0c5f
fixes creation of redirect link when commenting an issue
Mike Becker <universe@uap-core.de>
parents:
136
diff
changeset
|
635 | } |
124 | 636 | try { |
167
3f30adba1c63
major refactoring of DAO architecture - also fixes #114
Mike Becker <universe@uap-core.de>
parents:
162
diff
changeset
|
637 | final var issueComment = new IssueComment(getParameter(req, Integer.class, "commentid").orElse(-1), issue.getId()); |
124 | 638 | issueComment.setComment(getParameter(req, String.class, "comment").orElse("")); |
639 | ||
640 | if (issueComment.getComment().isBlank()) { | |
641 | throw new IllegalArgumentException("comment.null"); | |
642 | } | |
643 | ||
644 | LOG.debug("User {} is commenting on issue #{}", req.getRemoteUser(), issue.getId()); | |
645 | if (req.getRemoteUser() != null) { | |
167
3f30adba1c63
major refactoring of DAO architecture - also fixes #114
Mike Becker <universe@uap-core.de>
parents:
162
diff
changeset
|
646 | Optional.ofNullable(dao.findUserByName(req.getRemoteUser())).ifPresent(issueComment::setAuthor); |
124 | 647 | } |
648 | ||
167
3f30adba1c63
major refactoring of DAO architecture - also fixes #114
Mike Becker <universe@uap-core.de>
parents:
162
diff
changeset
|
649 | dao.insertComment(issueComment); |
124 | 650 | |
146
b0e83cab0bde
adds issue detail view - fixes #24
Mike Becker <universe@uap-core.de>
parents:
141
diff
changeset
|
651 | setRedirectLocation(req, "./projects/" + issue.getProject().getNode()+"/issues/"+issue.getId()+"/view"); |
124 | 652 | setContentPage(req, Constants.JSP_COMMIT_SUCCESSFUL); |
653 | ||
157
1e6f16fad3a5
removes ResponseType enum
Mike Becker <universe@uap-core.de>
parents:
152
diff
changeset
|
654 | renderSite(req, resp); |
159 | 655 | } catch (NoSuchElementException | IllegalArgumentException ex) { |
131
67df332e3146
changes request mapping to contain project and version ID as path parameters (this removes the session storage)
Mike Becker <universe@uap-core.de>
parents:
129
diff
changeset
|
656 | resp.sendError(HttpServletResponse.SC_NOT_IMPLEMENTED); |
67df332e3146
changes request mapping to contain project and version ID as path parameters (this removes the session storage)
Mike Becker <universe@uap-core.de>
parents:
129
diff
changeset
|
657 | // TODO: implement - fix issue #21 |
124 | 658 | } |
64
0f1746c6abfb
adds backend methods for issues (TODO: implement commitIssue())
Mike Becker <universe@uap-core.de>
parents:
61
diff
changeset
|
659 | } |
41
4f1c026a8aab
adds files for ProjectsModule
Mike Becker <universe@uap-core.de>
parents:
diff
changeset
|
660 | } |