src/main/java/de/uapcore/lightpit/modules/ProjectsModule.java

Thu, 08 Oct 2020 20:38:43 +0200

author
Mike Becker <universe@uap-core.de>
date
Thu, 08 Oct 2020 20:38:43 +0200
changeset 110
9d0be0b1580f
parent 109
2e0669e814ff
child 118
d3583959c875
permissions
-rw-r--r--

adds indicators for version status

replaces table column "Status" with version tag
fixes New Version form button not overriding the session version ID

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
c759c60507a2 adds version management
Mike Becker <universe@uap-core.de>
parents: 52
diff changeset
36 import org.slf4j.Logger;
c759c60507a2 adds version management
Mike Becker <universe@uap-core.de>
parents: 52
diff changeset
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
c759c60507a2 adds version management
Mike Becker <universe@uap-core.de>
parents: 52
diff changeset
41 import javax.servlet.http.HttpServletResponse;
c759c60507a2 adds version management
Mike Becker <universe@uap-core.de>
parents: 52
diff changeset
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.NoSuchElementException;
99
a369fb1b3aa2 cleanup ProjectsModule
Mike Becker <universe@uap-core.de>
parents: 97
diff changeset
46 import java.util.Optional;
83
24a3596b8f98 adds version selection in issue editor
Mike Becker <universe@uap-core.de>
parents: 81
diff changeset
47 import java.util.stream.Collectors;
24a3596b8f98 adds version selection in issue editor
Mike Becker <universe@uap-core.de>
parents: 81
diff changeset
48 import java.util.stream.Stream;
41
4f1c026a8aab adds files for ProjectsModule
Mike Becker <universe@uap-core.de>
parents:
diff changeset
49
52
67a02e79b7a1 adds project selection
Mike Becker <universe@uap-core.de>
parents: 51
diff changeset
50 import static de.uapcore.lightpit.Functions.fqn;
67a02e79b7a1 adds project selection
Mike Becker <universe@uap-core.de>
parents: 51
diff changeset
51
41
4f1c026a8aab adds files for ProjectsModule
Mike Becker <universe@uap-core.de>
parents:
diff changeset
52 @WebServlet(
4f1c026a8aab adds files for ProjectsModule
Mike Becker <universe@uap-core.de>
parents:
diff changeset
53 name = "ProjectsModule",
4f1c026a8aab adds files for ProjectsModule
Mike Becker <universe@uap-core.de>
parents:
diff changeset
54 urlPatterns = "/projects/*"
4f1c026a8aab adds files for ProjectsModule
Mike Becker <universe@uap-core.de>
parents:
diff changeset
55 )
4f1c026a8aab adds files for ProjectsModule
Mike Becker <universe@uap-core.de>
parents:
diff changeset
56 public final class ProjectsModule extends AbstractLightPITServlet {
4f1c026a8aab adds files for ProjectsModule
Mike Becker <universe@uap-core.de>
parents:
diff changeset
57
59
c759c60507a2 adds version management
Mike Becker <universe@uap-core.de>
parents: 52
diff changeset
58 private static final Logger LOG = LoggerFactory.getLogger(ProjectsModule.class);
c759c60507a2 adds version management
Mike Becker <universe@uap-core.de>
parents: 52
diff changeset
59
99
a369fb1b3aa2 cleanup ProjectsModule
Mike Becker <universe@uap-core.de>
parents: 97
diff changeset
60 private static final String SESSION_ATTR_SELECTED_PROJECT = fqn(ProjectsModule.class, "selected_project");
a369fb1b3aa2 cleanup ProjectsModule
Mike Becker <universe@uap-core.de>
parents: 97
diff changeset
61 private static final String SESSION_ATTR_SELECTED_VERSION = fqn(ProjectsModule.class, "selected_version");
a369fb1b3aa2 cleanup ProjectsModule
Mike Becker <universe@uap-core.de>
parents: 97
diff changeset
62 private static final String PARAMETER_SELECTED_PROJECT = "pid";
a369fb1b3aa2 cleanup ProjectsModule
Mike Becker <universe@uap-core.de>
parents: 97
diff changeset
63 private static final String PARAMETER_SELECTED_VERSION = "vid";
71
dca186d3911f adds breadcrumb menu
Mike Becker <universe@uap-core.de>
parents: 70
diff changeset
64
78
bb4c52bf3439 bloat removal 2/3 - moduleInfo
Mike Becker <universe@uap-core.de>
parents: 76
diff changeset
65 @Override
bb4c52bf3439 bloat removal 2/3 - moduleInfo
Mike Becker <universe@uap-core.de>
parents: 76
diff changeset
66 protected String getResourceBundleName() {
bb4c52bf3439 bloat removal 2/3 - moduleInfo
Mike Becker <universe@uap-core.de>
parents: 76
diff changeset
67 return "localization.projects";
bb4c52bf3439 bloat removal 2/3 - moduleInfo
Mike Becker <universe@uap-core.de>
parents: 76
diff changeset
68 }
71
dca186d3911f adds breadcrumb menu
Mike Becker <universe@uap-core.de>
parents: 70
diff changeset
69
99
a369fb1b3aa2 cleanup ProjectsModule
Mike Becker <universe@uap-core.de>
parents: 97
diff changeset
70 private int syncParamWithSession(HttpServletRequest req, String param, String attr) {
a369fb1b3aa2 cleanup ProjectsModule
Mike Becker <universe@uap-core.de>
parents: 97
diff changeset
71 final var session = req.getSession();
a369fb1b3aa2 cleanup ProjectsModule
Mike Becker <universe@uap-core.de>
parents: 97
diff changeset
72 final var idParam = getParameter(req, Integer.class, param);
a369fb1b3aa2 cleanup ProjectsModule
Mike Becker <universe@uap-core.de>
parents: 97
diff changeset
73 final int id;
a369fb1b3aa2 cleanup ProjectsModule
Mike Becker <universe@uap-core.de>
parents: 97
diff changeset
74 if (idParam.isPresent()) {
a369fb1b3aa2 cleanup ProjectsModule
Mike Becker <universe@uap-core.de>
parents: 97
diff changeset
75 id = idParam.get();
a369fb1b3aa2 cleanup ProjectsModule
Mike Becker <universe@uap-core.de>
parents: 97
diff changeset
76 session.setAttribute(attr, id);
a369fb1b3aa2 cleanup ProjectsModule
Mike Becker <universe@uap-core.de>
parents: 97
diff changeset
77 } else {
a369fb1b3aa2 cleanup ProjectsModule
Mike Becker <universe@uap-core.de>
parents: 97
diff changeset
78 id = Optional.ofNullable(session.getAttribute(attr)).map(x->(Integer)x).orElse(-1);
a369fb1b3aa2 cleanup ProjectsModule
Mike Becker <universe@uap-core.de>
parents: 97
diff changeset
79 }
a369fb1b3aa2 cleanup ProjectsModule
Mike Becker <universe@uap-core.de>
parents: 97
diff changeset
80 return id;
a369fb1b3aa2 cleanup ProjectsModule
Mike Becker <universe@uap-core.de>
parents: 97
diff changeset
81 }
a369fb1b3aa2 cleanup ProjectsModule
Mike Becker <universe@uap-core.de>
parents: 97
diff changeset
82
a369fb1b3aa2 cleanup ProjectsModule
Mike Becker <universe@uap-core.de>
parents: 97
diff changeset
83 private void populate(ProjectView viewModel, HttpServletRequest req, DataAccessObjects dao) throws SQLException {
a369fb1b3aa2 cleanup ProjectsModule
Mike Becker <universe@uap-core.de>
parents: 97
diff changeset
84 final var projectDao = dao.getProjectDao();
a369fb1b3aa2 cleanup ProjectsModule
Mike Becker <universe@uap-core.de>
parents: 97
diff changeset
85 final var versionDao = dao.getVersionDao();
a369fb1b3aa2 cleanup ProjectsModule
Mike Becker <universe@uap-core.de>
parents: 97
diff changeset
86
a369fb1b3aa2 cleanup ProjectsModule
Mike Becker <universe@uap-core.de>
parents: 97
diff changeset
87 projectDao.list().stream().map(ProjectInfo::new).forEach(viewModel.getProjectList()::add);
a369fb1b3aa2 cleanup ProjectsModule
Mike Becker <universe@uap-core.de>
parents: 97
diff changeset
88
a369fb1b3aa2 cleanup ProjectsModule
Mike Becker <universe@uap-core.de>
parents: 97
diff changeset
89 // Select Project
a369fb1b3aa2 cleanup ProjectsModule
Mike Becker <universe@uap-core.de>
parents: 97
diff changeset
90 final int pid = syncParamWithSession(req, PARAMETER_SELECTED_PROJECT, SESSION_ATTR_SELECTED_PROJECT);
a369fb1b3aa2 cleanup ProjectsModule
Mike Becker <universe@uap-core.de>
parents: 97
diff changeset
91 if (pid >= 0) {
a369fb1b3aa2 cleanup ProjectsModule
Mike Becker <universe@uap-core.de>
parents: 97
diff changeset
92 final var project = projectDao.find(pid);
107
b5f740a87af4 fixes misbehavior when a non-existing project ID is selected
Mike Becker <universe@uap-core.de>
parents: 105
diff changeset
93 if (project == null) {
b5f740a87af4 fixes misbehavior when a non-existing project ID is selected
Mike Becker <universe@uap-core.de>
parents: 105
diff changeset
94 req.setAttribute(SESSION_ATTR_SELECTED_PROJECT, -1);
b5f740a87af4 fixes misbehavior when a non-existing project ID is selected
Mike Becker <universe@uap-core.de>
parents: 105
diff changeset
95 } else {
b5f740a87af4 fixes misbehavior when a non-existing project ID is selected
Mike Becker <universe@uap-core.de>
parents: 105
diff changeset
96 final var info = new ProjectInfo(project);
b5f740a87af4 fixes misbehavior when a non-existing project ID is selected
Mike Becker <universe@uap-core.de>
parents: 105
diff changeset
97 info.setVersions(versionDao.list(project));
b5f740a87af4 fixes misbehavior when a non-existing project ID is selected
Mike Becker <universe@uap-core.de>
parents: 105
diff changeset
98 info.setIssueSummary(projectDao.getIssueSummary(project));
b5f740a87af4 fixes misbehavior when a non-existing project ID is selected
Mike Becker <universe@uap-core.de>
parents: 105
diff changeset
99 viewModel.setProjectInfo(info);
b5f740a87af4 fixes misbehavior when a non-existing project ID is selected
Mike Becker <universe@uap-core.de>
parents: 105
diff changeset
100 }
99
a369fb1b3aa2 cleanup ProjectsModule
Mike Becker <universe@uap-core.de>
parents: 97
diff changeset
101 }
a369fb1b3aa2 cleanup ProjectsModule
Mike Becker <universe@uap-core.de>
parents: 97
diff changeset
102
a369fb1b3aa2 cleanup ProjectsModule
Mike Becker <universe@uap-core.de>
parents: 97
diff changeset
103 // Select Version
a369fb1b3aa2 cleanup ProjectsModule
Mike Becker <universe@uap-core.de>
parents: 97
diff changeset
104 final int vid = syncParamWithSession(req, PARAMETER_SELECTED_VERSION, SESSION_ATTR_SELECTED_VERSION);
a369fb1b3aa2 cleanup ProjectsModule
Mike Becker <universe@uap-core.de>
parents: 97
diff changeset
105 if (vid >= 0) {
a369fb1b3aa2 cleanup ProjectsModule
Mike Becker <universe@uap-core.de>
parents: 97
diff changeset
106 viewModel.setVersionFilter(versionDao.find(vid));
a369fb1b3aa2 cleanup ProjectsModule
Mike Becker <universe@uap-core.de>
parents: 97
diff changeset
107 }
a369fb1b3aa2 cleanup ProjectsModule
Mike Becker <universe@uap-core.de>
parents: 97
diff changeset
108 }
a369fb1b3aa2 cleanup ProjectsModule
Mike Becker <universe@uap-core.de>
parents: 97
diff changeset
109
a369fb1b3aa2 cleanup ProjectsModule
Mike Becker <universe@uap-core.de>
parents: 97
diff changeset
110 private ResponseType forwardView(HttpServletRequest req, ProjectView viewModel, String name) {
a369fb1b3aa2 cleanup ProjectsModule
Mike Becker <universe@uap-core.de>
parents: 97
diff changeset
111 setViewModel(req, viewModel);
a369fb1b3aa2 cleanup ProjectsModule
Mike Becker <universe@uap-core.de>
parents: 97
diff changeset
112 setContentPage(req, name);
a369fb1b3aa2 cleanup ProjectsModule
Mike Becker <universe@uap-core.de>
parents: 97
diff changeset
113 setStylesheet(req, "projects");
109
2e0669e814ff adds versions overview
Mike Becker <universe@uap-core.de>
parents: 107
diff changeset
114 setNavigationMenu(req, "project-navmenu");
99
a369fb1b3aa2 cleanup ProjectsModule
Mike Becker <universe@uap-core.de>
parents: 97
diff changeset
115 return ResponseType.HTML;
64
0f1746c6abfb adds backend methods for issues (TODO: implement commitIssue())
Mike Becker <universe@uap-core.de>
parents: 61
diff changeset
116 }
0f1746c6abfb adds backend methods for issues (TODO: implement commitIssue())
Mike Becker <universe@uap-core.de>
parents: 61
diff changeset
117
61
3e287f361c7a moves project index to separate sub path
Mike Becker <universe@uap-core.de>
parents: 59
diff changeset
118 @RequestMapping(method = HttpMethod.GET)
47
57cfb94ab99f projects can now be added and updated
Mike Becker <universe@uap-core.de>
parents: 45
diff changeset
119 public ResponseType index(HttpServletRequest req, DataAccessObjects dao) throws SQLException {
99
a369fb1b3aa2 cleanup ProjectsModule
Mike Becker <universe@uap-core.de>
parents: 97
diff changeset
120 final var viewModel = new ProjectView();
a369fb1b3aa2 cleanup ProjectsModule
Mike Becker <universe@uap-core.de>
parents: 97
diff changeset
121 populate(viewModel, req, dao);
86
0a658e53177c improves issue overview and adds progress information
Mike Becker <universe@uap-core.de>
parents: 83
diff changeset
122
0a658e53177c improves issue overview and adds progress information
Mike Becker <universe@uap-core.de>
parents: 83
diff changeset
123 final var projectDao = dao.getProjectDao();
0a658e53177c improves issue overview and adds progress information
Mike Becker <universe@uap-core.de>
parents: 83
diff changeset
124 final var versionDao = dao.getVersionDao();
0a658e53177c improves issue overview and adds progress information
Mike Becker <universe@uap-core.de>
parents: 83
diff changeset
125
99
a369fb1b3aa2 cleanup ProjectsModule
Mike Becker <universe@uap-core.de>
parents: 97
diff changeset
126 for (var info : viewModel.getProjectList()) {
a369fb1b3aa2 cleanup ProjectsModule
Mike Becker <universe@uap-core.de>
parents: 97
diff changeset
127 info.setVersions(versionDao.list(info.getProject()));
a369fb1b3aa2 cleanup ProjectsModule
Mike Becker <universe@uap-core.de>
parents: 97
diff changeset
128 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
129 }
0a658e53177c improves issue overview and adds progress information
Mike Becker <universe@uap-core.de>
parents: 83
diff changeset
130
99
a369fb1b3aa2 cleanup ProjectsModule
Mike Becker <universe@uap-core.de>
parents: 97
diff changeset
131 return forwardView(req, viewModel, "projects");
47
57cfb94ab99f projects can now be added and updated
Mike Becker <universe@uap-core.de>
parents: 45
diff changeset
132 }
57cfb94ab99f projects can now be added and updated
Mike Becker <universe@uap-core.de>
parents: 45
diff changeset
133
99
a369fb1b3aa2 cleanup ProjectsModule
Mike Becker <universe@uap-core.de>
parents: 97
diff changeset
134 private void configure(ProjectEditView viewModel, Project project, DataAccessObjects dao) throws SQLException {
a369fb1b3aa2 cleanup ProjectsModule
Mike Becker <universe@uap-core.de>
parents: 97
diff changeset
135 viewModel.setProject(project);
86
0a658e53177c improves issue overview and adds progress information
Mike Becker <universe@uap-core.de>
parents: 83
diff changeset
136 viewModel.setUsers(dao.getUserDao().list());
71
dca186d3911f adds breadcrumb menu
Mike Becker <universe@uap-core.de>
parents: 70
diff changeset
137 }
dca186d3911f adds breadcrumb menu
Mike Becker <universe@uap-core.de>
parents: 70
diff changeset
138
47
57cfb94ab99f projects can now be added and updated
Mike Becker <universe@uap-core.de>
parents: 45
diff changeset
139 @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
140 public ResponseType edit(HttpServletRequest req, DataAccessObjects dao) throws SQLException {
99
a369fb1b3aa2 cleanup ProjectsModule
Mike Becker <universe@uap-core.de>
parents: 97
diff changeset
141 final var viewModel = new ProjectEditView();
a369fb1b3aa2 cleanup ProjectsModule
Mike Becker <universe@uap-core.de>
parents: 97
diff changeset
142 populate(viewModel, req, dao);
47
57cfb94ab99f projects can now be added and updated
Mike Becker <universe@uap-core.de>
parents: 45
diff changeset
143
99
a369fb1b3aa2 cleanup ProjectsModule
Mike Becker <universe@uap-core.de>
parents: 97
diff changeset
144 final var project = Optional.ofNullable(viewModel.getProjectInfo())
a369fb1b3aa2 cleanup ProjectsModule
Mike Becker <universe@uap-core.de>
parents: 97
diff changeset
145 .map(ProjectInfo::getProject)
a369fb1b3aa2 cleanup ProjectsModule
Mike Becker <universe@uap-core.de>
parents: 97
diff changeset
146 .orElse(new Project(-1));
a369fb1b3aa2 cleanup ProjectsModule
Mike Becker <universe@uap-core.de>
parents: 97
diff changeset
147 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
148
99
a369fb1b3aa2 cleanup ProjectsModule
Mike Becker <universe@uap-core.de>
parents: 97
diff changeset
149 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
150 }
cc7f082c5ef3 simplifies menu generation, adds submenus and removes VersionsModule (versions will be part of the ProjectsModule)
Mike Becker <universe@uap-core.de>
parents: 43
diff changeset
151
47
57cfb94ab99f projects can now be added and updated
Mike Becker <universe@uap-core.de>
parents: 45
diff changeset
152 @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
153 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
154
75
33b6843fdf8a adds the ability to create and edit issues
Mike Becker <universe@uap-core.de>
parents: 74
diff changeset
155 Project project = new Project(-1);
47
57cfb94ab99f projects can now be added and updated
Mike Becker <universe@uap-core.de>
parents: 45
diff changeset
156 try {
99
a369fb1b3aa2 cleanup ProjectsModule
Mike Becker <universe@uap-core.de>
parents: 97
diff changeset
157 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
158 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
159 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
160 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
161 getParameter(req, Integer.class, "owner").map(
57cfb94ab99f projects can now be added and updated
Mike Becker <universe@uap-core.de>
parents: 45
diff changeset
162 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
163 ).ifPresent(project::setOwner);
57cfb94ab99f projects can now be added and updated
Mike Becker <universe@uap-core.de>
parents: 45
diff changeset
164
57cfb94ab99f projects can now be added and updated
Mike Becker <universe@uap-core.de>
parents: 45
diff changeset
165 dao.getProjectDao().saveOrUpdate(project);
57cfb94ab99f projects can now be added and updated
Mike Becker <universe@uap-core.de>
parents: 45
diff changeset
166
109
2e0669e814ff adds versions overview
Mike Becker <universe@uap-core.de>
parents: 107
diff changeset
167 setRedirectLocation(req, "./projects/versions?pid="+project.getId());
74
91d1fc2a3a14 removes that dynamic_fragment bullshit
Mike Becker <universe@uap-core.de>
parents: 71
diff changeset
168 setContentPage(req, Constants.JSP_COMMIT_SUCCESSFUL);
59
c759c60507a2 adds version management
Mike Becker <universe@uap-core.de>
parents: 52
diff changeset
169 LOG.debug("Successfully updated project {}", project.getName());
99
a369fb1b3aa2 cleanup ProjectsModule
Mike Becker <universe@uap-core.de>
parents: 97
diff changeset
170
a369fb1b3aa2 cleanup ProjectsModule
Mike Becker <universe@uap-core.de>
parents: 97
diff changeset
171 return ResponseType.HTML;
75
33b6843fdf8a adds the ability to create and edit issues
Mike Becker <universe@uap-core.de>
parents: 74
diff changeset
172 } catch (NoSuchElementException | IllegalArgumentException | SQLException ex) {
59
c759c60507a2 adds version management
Mike Becker <universe@uap-core.de>
parents: 52
diff changeset
173 LOG.warn("Form validation failure: {}", ex.getMessage());
c759c60507a2 adds version management
Mike Becker <universe@uap-core.de>
parents: 52
diff changeset
174 LOG.debug("Details:", ex);
99
a369fb1b3aa2 cleanup ProjectsModule
Mike Becker <universe@uap-core.de>
parents: 97
diff changeset
175 final var viewModel = new ProjectEditView();
a369fb1b3aa2 cleanup ProjectsModule
Mike Becker <universe@uap-core.de>
parents: 97
diff changeset
176 populate(viewModel, req, dao);
a369fb1b3aa2 cleanup ProjectsModule
Mike Becker <universe@uap-core.de>
parents: 97
diff changeset
177 configure(viewModel, project, dao);
a369fb1b3aa2 cleanup ProjectsModule
Mike Becker <universe@uap-core.de>
parents: 97
diff changeset
178 // TODO: error text
a369fb1b3aa2 cleanup ProjectsModule
Mike Becker <universe@uap-core.de>
parents: 97
diff changeset
179 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
180 }
57cfb94ab99f projects can now be added and updated
Mike Becker <universe@uap-core.de>
parents: 45
diff changeset
181 }
57cfb94ab99f projects can now be added and updated
Mike Becker <universe@uap-core.de>
parents: 45
diff changeset
182
70
821c4950b619 removes the sub menu and removes the home module
Mike Becker <universe@uap-core.de>
parents: 68
diff changeset
183 @RequestMapping(requestPath = "view", method = HttpMethod.GET)
80
27a25f32048e adds project overview page
Mike Becker <universe@uap-core.de>
parents: 79
diff changeset
184 public ResponseType view(HttpServletRequest req, HttpServletResponse resp, DataAccessObjects dao) throws SQLException, IOException {
99
a369fb1b3aa2 cleanup ProjectsModule
Mike Becker <universe@uap-core.de>
parents: 97
diff changeset
185 final var viewModel = new ProjectDetailsView();
a369fb1b3aa2 cleanup ProjectsModule
Mike Becker <universe@uap-core.de>
parents: 97
diff changeset
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
99
a369fb1b3aa2 cleanup ProjectsModule
Mike Becker <universe@uap-core.de>
parents: 97
diff changeset
188 if (viewModel.getProjectInfo() == null) {
80
27a25f32048e adds project overview page
Mike Becker <universe@uap-core.de>
parents: 79
diff changeset
189 resp.sendError(HttpServletResponse.SC_NOT_FOUND, "No project selected.");
27a25f32048e adds project overview page
Mike Becker <universe@uap-core.de>
parents: 79
diff changeset
190 return ResponseType.NONE;
27a25f32048e adds project overview page
Mike Becker <universe@uap-core.de>
parents: 79
diff changeset
191 }
47
57cfb94ab99f projects can now be added and updated
Mike Becker <universe@uap-core.de>
parents: 45
diff changeset
192
86
0a658e53177c improves issue overview and adds progress information
Mike Becker <universe@uap-core.de>
parents: 83
diff changeset
193 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
194
105
250c5cbb8276 simplifies issues per version view and re-adds edit version button
Mike Becker <universe@uap-core.de>
parents: 104
diff changeset
195 final var version = viewModel.getVersionFilter();
71
dca186d3911f adds breadcrumb menu
Mike Becker <universe@uap-core.de>
parents: 70
diff changeset
196
99
a369fb1b3aa2 cleanup ProjectsModule
Mike Becker <universe@uap-core.de>
parents: 97
diff changeset
197 final var detailView = viewModel.getProjectDetails();
105
250c5cbb8276 simplifies issues per version view and re-adds edit version button
Mike Becker <universe@uap-core.de>
parents: 104
diff changeset
198 final var issues = issueDao.list(version);
100
7e3c61c340d3 fixes issues and version information not set in correct order
Mike Becker <universe@uap-core.de>
parents: 99
diff changeset
199 for (var issue : issues) issueDao.joinVersionInformation(issue);
105
250c5cbb8276 simplifies issues per version view and re-adds edit version button
Mike Becker <universe@uap-core.de>
parents: 104
diff changeset
200 detailView.updateDetails(issues, version);
86
0a658e53177c improves issue overview and adds progress information
Mike Becker <universe@uap-core.de>
parents: 83
diff changeset
201
99
a369fb1b3aa2 cleanup ProjectsModule
Mike Becker <universe@uap-core.de>
parents: 97
diff changeset
202 return forwardView(req, viewModel, "project-details");
71
dca186d3911f adds breadcrumb menu
Mike Becker <universe@uap-core.de>
parents: 70
diff changeset
203 }
dca186d3911f adds breadcrumb menu
Mike Becker <universe@uap-core.de>
parents: 70
diff changeset
204
109
2e0669e814ff adds versions overview
Mike Becker <universe@uap-core.de>
parents: 107
diff changeset
205 @RequestMapping(requestPath = "versions", method = HttpMethod.GET)
2e0669e814ff adds versions overview
Mike Becker <universe@uap-core.de>
parents: 107
diff changeset
206 public ResponseType versions(HttpServletRequest req, HttpServletResponse resp, DataAccessObjects dao) throws IOException, SQLException {
2e0669e814ff adds versions overview
Mike Becker <universe@uap-core.de>
parents: 107
diff changeset
207 final var viewModel = new VersionsView();
2e0669e814ff adds versions overview
Mike Becker <universe@uap-core.de>
parents: 107
diff changeset
208 populate(viewModel, req, dao);
2e0669e814ff adds versions overview
Mike Becker <universe@uap-core.de>
parents: 107
diff changeset
209 viewModel.setVersionFilter(null);
2e0669e814ff adds versions overview
Mike Becker <universe@uap-core.de>
parents: 107
diff changeset
210
2e0669e814ff adds versions overview
Mike Becker <universe@uap-core.de>
parents: 107
diff changeset
211 final var projectInfo = viewModel.getProjectInfo();
2e0669e814ff adds versions overview
Mike Becker <universe@uap-core.de>
parents: 107
diff changeset
212 if (projectInfo == null) {
2e0669e814ff adds versions overview
Mike Becker <universe@uap-core.de>
parents: 107
diff changeset
213 resp.sendError(HttpServletResponse.SC_NOT_FOUND, "No project selected.");
2e0669e814ff adds versions overview
Mike Becker <universe@uap-core.de>
parents: 107
diff changeset
214 return ResponseType.NONE;
2e0669e814ff adds versions overview
Mike Becker <universe@uap-core.de>
parents: 107
diff changeset
215 }
2e0669e814ff adds versions overview
Mike Becker <universe@uap-core.de>
parents: 107
diff changeset
216
2e0669e814ff adds versions overview
Mike Becker <universe@uap-core.de>
parents: 107
diff changeset
217 final var issueDao = dao.getIssueDao();
2e0669e814ff adds versions overview
Mike Becker <universe@uap-core.de>
parents: 107
diff changeset
218 final var issues = issueDao.list(projectInfo.getProject());
2e0669e814ff adds versions overview
Mike Becker <universe@uap-core.de>
parents: 107
diff changeset
219 for (var issue : issues) issueDao.joinVersionInformation(issue);
2e0669e814ff adds versions overview
Mike Becker <universe@uap-core.de>
parents: 107
diff changeset
220 viewModel.update(projectInfo.getVersions(), issues);
2e0669e814ff adds versions overview
Mike Becker <universe@uap-core.de>
parents: 107
diff changeset
221
2e0669e814ff adds versions overview
Mike Becker <universe@uap-core.de>
parents: 107
diff changeset
222 return forwardView(req, viewModel, "versions");
2e0669e814ff adds versions overview
Mike Becker <universe@uap-core.de>
parents: 107
diff changeset
223 }
2e0669e814ff adds versions overview
Mike Becker <universe@uap-core.de>
parents: 107
diff changeset
224
59
c759c60507a2 adds version management
Mike Becker <universe@uap-core.de>
parents: 52
diff changeset
225 @RequestMapping(requestPath = "versions/edit", method = HttpMethod.GET)
110
9d0be0b1580f adds indicators for version status
Mike Becker <universe@uap-core.de>
parents: 109
diff changeset
226 public ResponseType editVersion(HttpServletRequest req, HttpServletResponse resp, DataAccessObjects dao) throws IOException, SQLException {
99
a369fb1b3aa2 cleanup ProjectsModule
Mike Becker <universe@uap-core.de>
parents: 97
diff changeset
227 final var viewModel = new VersionEditView();
a369fb1b3aa2 cleanup ProjectsModule
Mike Becker <universe@uap-core.de>
parents: 97
diff changeset
228 populate(viewModel, req, dao);
a369fb1b3aa2 cleanup ProjectsModule
Mike Becker <universe@uap-core.de>
parents: 97
diff changeset
229
110
9d0be0b1580f adds indicators for version status
Mike Becker <universe@uap-core.de>
parents: 109
diff changeset
230 if (viewModel.getProjectInfo() == null) {
9d0be0b1580f adds indicators for version status
Mike Becker <universe@uap-core.de>
parents: 109
diff changeset
231 resp.sendError(HttpServletResponse.SC_NOT_FOUND, "No project selected.");
9d0be0b1580f adds indicators for version status
Mike Becker <universe@uap-core.de>
parents: 109
diff changeset
232 return ResponseType.NONE;
9d0be0b1580f adds indicators for version status
Mike Becker <universe@uap-core.de>
parents: 109
diff changeset
233 }
9d0be0b1580f adds indicators for version status
Mike Becker <universe@uap-core.de>
parents: 109
diff changeset
234
99
a369fb1b3aa2 cleanup ProjectsModule
Mike Becker <universe@uap-core.de>
parents: 97
diff changeset
235 if (viewModel.getVersionFilter() == null) {
110
9d0be0b1580f adds indicators for version status
Mike Becker <universe@uap-core.de>
parents: 109
diff changeset
236 final var version = new Version(-1);
9d0be0b1580f adds indicators for version status
Mike Becker <universe@uap-core.de>
parents: 109
diff changeset
237 version.setProject(viewModel.getProjectInfo().getProject());
9d0be0b1580f adds indicators for version status
Mike Becker <universe@uap-core.de>
parents: 109
diff changeset
238 viewModel.setVersion(version);
86
0a658e53177c improves issue overview and adds progress information
Mike Becker <universe@uap-core.de>
parents: 83
diff changeset
239 } else {
99
a369fb1b3aa2 cleanup ProjectsModule
Mike Becker <universe@uap-core.de>
parents: 97
diff changeset
240 viewModel.setVersion(viewModel.getVersionFilter());
86
0a658e53177c improves issue overview and adds progress information
Mike Becker <universe@uap-core.de>
parents: 83
diff changeset
241 }
59
c759c60507a2 adds version management
Mike Becker <universe@uap-core.de>
parents: 52
diff changeset
242
99
a369fb1b3aa2 cleanup ProjectsModule
Mike Becker <universe@uap-core.de>
parents: 97
diff changeset
243 return forwardView(req, viewModel, "version-form");
59
c759c60507a2 adds version management
Mike Becker <universe@uap-core.de>
parents: 52
diff changeset
244 }
c759c60507a2 adds version management
Mike Becker <universe@uap-core.de>
parents: 52
diff changeset
245
c759c60507a2 adds version management
Mike Becker <universe@uap-core.de>
parents: 52
diff changeset
246 @RequestMapping(requestPath = "versions/commit", method = HttpMethod.POST)
80
27a25f32048e adds project overview page
Mike Becker <universe@uap-core.de>
parents: 79
diff changeset
247 public ResponseType commitVersion(HttpServletRequest req, HttpServletResponse resp, DataAccessObjects dao) throws SQLException {
59
c759c60507a2 adds version management
Mike Becker <universe@uap-core.de>
parents: 52
diff changeset
248
86
0a658e53177c improves issue overview and adds progress information
Mike Becker <universe@uap-core.de>
parents: 83
diff changeset
249 var version = new Version(-1);
59
c759c60507a2 adds version management
Mike Becker <universe@uap-core.de>
parents: 52
diff changeset
250 try {
86
0a658e53177c improves issue overview and adds progress information
Mike Becker <universe@uap-core.de>
parents: 83
diff changeset
251 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
252 version.setProject(new Project(getParameter(req, Integer.class, "pid").orElseThrow()));
59
c759c60507a2 adds version management
Mike Becker <universe@uap-core.de>
parents: 52
diff changeset
253 version.setName(getParameter(req, String.class, "name").orElseThrow());
c759c60507a2 adds version management
Mike Becker <universe@uap-core.de>
parents: 52
diff changeset
254 getParameter(req, Integer.class, "ordinal").ifPresent(version::setOrdinal);
c759c60507a2 adds version management
Mike Becker <universe@uap-core.de>
parents: 52
diff changeset
255 version.setStatus(VersionStatus.valueOf(getParameter(req, String.class, "status").orElseThrow()));
c759c60507a2 adds version management
Mike Becker <universe@uap-core.de>
parents: 52
diff changeset
256 dao.getVersionDao().saveOrUpdate(version);
c759c60507a2 adds version management
Mike Becker <universe@uap-core.de>
parents: 52
diff changeset
257
75
33b6843fdf8a adds the ability to create and edit issues
Mike Becker <universe@uap-core.de>
parents: 74
diff changeset
258 // specifying the pid parameter will purposely reset the session selected version!
109
2e0669e814ff adds versions overview
Mike Becker <universe@uap-core.de>
parents: 107
diff changeset
259 setRedirectLocation(req, "./projects/versions?pid=" + version.getProject().getId());
74
91d1fc2a3a14 removes that dynamic_fragment bullshit
Mike Becker <universe@uap-core.de>
parents: 71
diff changeset
260 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
261 } catch (NoSuchElementException | IllegalArgumentException | SQLException ex) {
59
c759c60507a2 adds version management
Mike Becker <universe@uap-core.de>
parents: 52
diff changeset
262 LOG.warn("Form validation failure: {}", ex.getMessage());
c759c60507a2 adds version management
Mike Becker <universe@uap-core.de>
parents: 52
diff changeset
263 LOG.debug("Details:", ex);
99
a369fb1b3aa2 cleanup ProjectsModule
Mike Becker <universe@uap-core.de>
parents: 97
diff changeset
264 final var viewModel = new VersionEditView();
a369fb1b3aa2 cleanup ProjectsModule
Mike Becker <universe@uap-core.de>
parents: 97
diff changeset
265 populate(viewModel, req, dao);
a369fb1b3aa2 cleanup ProjectsModule
Mike Becker <universe@uap-core.de>
parents: 97
diff changeset
266 viewModel.setVersion(version);
86
0a658e53177c improves issue overview and adds progress information
Mike Becker <universe@uap-core.de>
parents: 83
diff changeset
267 // TODO: set Error Text
99
a369fb1b3aa2 cleanup ProjectsModule
Mike Becker <universe@uap-core.de>
parents: 97
diff changeset
268 return forwardView(req, viewModel, "version-form");
59
c759c60507a2 adds version management
Mike Becker <universe@uap-core.de>
parents: 52
diff changeset
269 }
41
4f1c026a8aab adds files for ProjectsModule
Mike Becker <universe@uap-core.de>
parents:
diff changeset
270
43
9abf0bf44c7b renames some crappy constants
Mike Becker <universe@uap-core.de>
parents: 42
diff changeset
271 return ResponseType.HTML;
41
4f1c026a8aab adds files for ProjectsModule
Mike Becker <universe@uap-core.de>
parents:
diff changeset
272 }
64
0f1746c6abfb adds backend methods for issues (TODO: implement commitIssue())
Mike Becker <universe@uap-core.de>
parents: 61
diff changeset
273
99
a369fb1b3aa2 cleanup ProjectsModule
Mike Becker <universe@uap-core.de>
parents: 97
diff changeset
274 private void configure(IssueEditView viewModel, Issue issue, DataAccessObjects dao) throws SQLException {
a369fb1b3aa2 cleanup ProjectsModule
Mike Becker <universe@uap-core.de>
parents: 97
diff changeset
275 issue.setProject(viewModel.getProjectInfo().getProject());
a369fb1b3aa2 cleanup ProjectsModule
Mike Becker <universe@uap-core.de>
parents: 97
diff changeset
276 viewModel.setIssue(issue);
a369fb1b3aa2 cleanup ProjectsModule
Mike Becker <universe@uap-core.de>
parents: 97
diff changeset
277 viewModel.configureVersionSelectors(viewModel.getProjectInfo().getVersions());
86
0a658e53177c improves issue overview and adds progress information
Mike Becker <universe@uap-core.de>
parents: 83
diff changeset
278 viewModel.setUsers(dao.getUserDao().list());
71
dca186d3911f adds breadcrumb menu
Mike Becker <universe@uap-core.de>
parents: 70
diff changeset
279 }
dca186d3911f adds breadcrumb menu
Mike Becker <universe@uap-core.de>
parents: 70
diff changeset
280
64
0f1746c6abfb adds backend methods for issues (TODO: implement commitIssue())
Mike Becker <universe@uap-core.de>
parents: 61
diff changeset
281 @RequestMapping(requestPath = "issues/edit", method = HttpMethod.GET)
80
27a25f32048e adds project overview page
Mike Becker <universe@uap-core.de>
parents: 79
diff changeset
282 public ResponseType editIssue(HttpServletRequest req, HttpServletResponse resp, DataAccessObjects dao) throws SQLException {
99
a369fb1b3aa2 cleanup ProjectsModule
Mike Becker <universe@uap-core.de>
parents: 97
diff changeset
283 final var viewModel = new IssueEditView();
a369fb1b3aa2 cleanup ProjectsModule
Mike Becker <universe@uap-core.de>
parents: 97
diff changeset
284
a369fb1b3aa2 cleanup ProjectsModule
Mike Becker <universe@uap-core.de>
parents: 97
diff changeset
285 final var issueParam = getParameter(req, Integer.class, "issue");
a369fb1b3aa2 cleanup ProjectsModule
Mike Becker <universe@uap-core.de>
parents: 97
diff changeset
286 if (issueParam.isPresent()) {
104
8be80ea4f52b fixes issue not containing version information in issue form
Mike Becker <universe@uap-core.de>
parents: 102
diff changeset
287 final var issueDao = dao.getIssueDao();
8be80ea4f52b fixes issue not containing version information in issue form
Mike Becker <universe@uap-core.de>
parents: 102
diff changeset
288 final var issue = issueDao.find(issueParam.get());
8be80ea4f52b fixes issue not containing version information in issue form
Mike Becker <universe@uap-core.de>
parents: 102
diff changeset
289 issueDao.joinVersionInformation(issue);
99
a369fb1b3aa2 cleanup ProjectsModule
Mike Becker <universe@uap-core.de>
parents: 97
diff changeset
290 req.getSession().setAttribute(SESSION_ATTR_SELECTED_PROJECT, issue.getProject().getId());
a369fb1b3aa2 cleanup ProjectsModule
Mike Becker <universe@uap-core.de>
parents: 97
diff changeset
291 populate(viewModel, req, dao);
a369fb1b3aa2 cleanup ProjectsModule
Mike Becker <universe@uap-core.de>
parents: 97
diff changeset
292 configure(viewModel, issue, dao);
86
0a658e53177c improves issue overview and adds progress information
Mike Becker <universe@uap-core.de>
parents: 83
diff changeset
293 } else {
99
a369fb1b3aa2 cleanup ProjectsModule
Mike Becker <universe@uap-core.de>
parents: 97
diff changeset
294 populate(viewModel, req, dao);
a369fb1b3aa2 cleanup ProjectsModule
Mike Becker <universe@uap-core.de>
parents: 97
diff changeset
295 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
296 }
64
0f1746c6abfb adds backend methods for issues (TODO: implement commitIssue())
Mike Becker <universe@uap-core.de>
parents: 61
diff changeset
297
99
a369fb1b3aa2 cleanup ProjectsModule
Mike Becker <universe@uap-core.de>
parents: 97
diff changeset
298 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
299 }
0f1746c6abfb adds backend methods for issues (TODO: implement commitIssue())
Mike Becker <universe@uap-core.de>
parents: 61
diff changeset
300
0f1746c6abfb adds backend methods for issues (TODO: implement commitIssue())
Mike Becker <universe@uap-core.de>
parents: 61
diff changeset
301 @RequestMapping(requestPath = "issues/commit", method = HttpMethod.POST)
80
27a25f32048e adds project overview page
Mike Becker <universe@uap-core.de>
parents: 79
diff changeset
302 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
303 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
304 try {
86
0a658e53177c improves issue overview and adds progress information
Mike Becker <universe@uap-core.de>
parents: 83
diff changeset
305 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
306 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
307 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
308 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
309 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
310 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
311 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
312 ).ifPresent(issue::setAssignee);
33b6843fdf8a adds the ability to create and edit issues
Mike Becker <universe@uap-core.de>
parents: 74
diff changeset
313 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
314 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
315
24a3596b8f98 adds version selection in issue editor
Mike Becker <universe@uap-core.de>
parents: 81
diff changeset
316 getParameter(req, Integer[].class, "affected")
24a3596b8f98 adds version selection in issue editor
Mike Becker <universe@uap-core.de>
parents: 81
diff changeset
317 .map(Stream::of)
24a3596b8f98 adds version selection in issue editor
Mike Becker <universe@uap-core.de>
parents: 81
diff changeset
318 .map(stream ->
96
b7b685f31e39 breadcrumb menu is now a sidebar navigation menu
Mike Becker <universe@uap-core.de>
parents: 88
diff changeset
319 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
320 ).ifPresent(issue::setAffectedVersions);
24a3596b8f98 adds version selection in issue editor
Mike Becker <universe@uap-core.de>
parents: 81
diff changeset
321 getParameter(req, Integer[].class, "resolved")
24a3596b8f98 adds version selection in issue editor
Mike Becker <universe@uap-core.de>
parents: 81
diff changeset
322 .map(Stream::of)
24a3596b8f98 adds version selection in issue editor
Mike Becker <universe@uap-core.de>
parents: 81
diff changeset
323 .map(stream ->
86
0a658e53177c improves issue overview and adds progress information
Mike Becker <universe@uap-core.de>
parents: 83
diff changeset
324 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
325 ).ifPresent(issue::setResolvedVersions);
24a3596b8f98 adds version selection in issue editor
Mike Becker <universe@uap-core.de>
parents: 81
diff changeset
326
64
0f1746c6abfb adds backend methods for issues (TODO: implement commitIssue())
Mike Becker <universe@uap-core.de>
parents: 61
diff changeset
327 dao.getIssueDao().saveOrUpdate(issue);
0f1746c6abfb adds backend methods for issues (TODO: implement commitIssue())
Mike Becker <universe@uap-core.de>
parents: 61
diff changeset
328
96
b7b685f31e39 breadcrumb menu is now a sidebar navigation menu
Mike Becker <universe@uap-core.de>
parents: 88
diff changeset
329 // 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
330 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
331 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
332 } 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
333 // 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
334 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
335 LOG.debug("Details:", ex);
99
a369fb1b3aa2 cleanup ProjectsModule
Mike Becker <universe@uap-core.de>
parents: 97
diff changeset
336 final var viewModel = new IssueEditView();
a369fb1b3aa2 cleanup ProjectsModule
Mike Becker <universe@uap-core.de>
parents: 97
diff changeset
337 configure(viewModel, issue, dao);
86
0a658e53177c improves issue overview and adds progress information
Mike Becker <universe@uap-core.de>
parents: 83
diff changeset
338 // TODO: set Error Text
99
a369fb1b3aa2 cleanup ProjectsModule
Mike Becker <universe@uap-core.de>
parents: 97
diff changeset
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 return ResponseType.HTML;
0f1746c6abfb adds backend methods for issues (TODO: implement commitIssue())
Mike Becker <universe@uap-core.de>
parents: 61
diff changeset
343 }
41
4f1c026a8aab adds files for ProjectsModule
Mike Becker <universe@uap-core.de>
parents:
diff changeset
344 }

mercurial