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