SRSoftware/Umbrella
1
0
Fork 0
Code Issues Pull Requests Actions Projects Releases Wiki Activity

implemented project creation

Browse Source
This commit is contained in:
Stephan Richter
2025-07-18 22:10:47 +02:00
parent 9626d91ccb
commit 722f12912d
17 changed files with 157 additions and 78 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
project/src/main/java/de/srsoftware/umbrella/project/ProjectDb.java
View File

@@ -1,12 +1,13 @@
/* © SRSoftware 2025 */
package de.srsoftware.umbrella.project;
import de.srsoftware.umbrella.core.api.UserService;
import de.srsoftware.umbrella.core.exceptions.UmbrellaException;
import de.srsoftware.umbrella.core.model.Project;
import java.util.Collection;
import java.util.Map;
public interface ProjectDb {
Collection<Project> list(long companyId, boolean includeClosed) throws UmbrellaException;
Map<Long, Project> list(long companyId, boolean includeClosed, UserService userService) throws UmbrellaException;
Project save(Project prj);
Project save(Project prj) throws UmbrellaException;
}

31
project/src/main/java/de/srsoftware/umbrella/project/ProjectModule.java
View File

@@ -5,6 +5,7 @@ import static de.srsoftware.umbrella.core.ConnectionProvider.connect;
import static de.srsoftware.umbrella.core.Constants.*;
import static de.srsoftware.umbrella.core.Paths.LIST;
import static de.srsoftware.umbrella.core.exceptions.UmbrellaException.*;
import static de.srsoftware.umbrella.core.model.Permission.OWNER;
import static de.srsoftware.umbrella.project.Constants.CONFIG_DATABASE;
import static java.lang.Boolean.TRUE;
import static java.util.Comparator.comparing;
@@ -18,15 +19,10 @@ import de.srsoftware.umbrella.core.api.CompanyService;
import de.srsoftware.umbrella.core.api.ProjectService;
import de.srsoftware.umbrella.core.api.UserService;
import de.srsoftware.umbrella.core.exceptions.UmbrellaException;
import de.srsoftware.umbrella.core.model.Project;
import de.srsoftware.umbrella.core.model.Token;
import de.srsoftware.umbrella.core.model.UmbrellaUser;
import org.json.JSONObject;
import de.srsoftware.umbrella.core.model.*;
import java.io.IOException;
import java.util.Collection;
import java.util.HashMap;
import java.util.Optional;
import java.util.*;
import org.json.JSONObject;
public class ProjectModule extends BaseHandler implements ProjectService {
@@ -55,7 +51,7 @@ public class ProjectModule extends BaseHandler implements ProjectService {
if (user.isEmpty()) return unauthorized(ex);
var head = path.pop();
return switch (head) {
case LIST -> listItems(ex,user.get());
case LIST -> listProjects(ex,user.get());
case null -> postProject(ex,user.get());
default -> super.doGet(path,ex);
};
@@ -64,21 +60,22 @@ public class ProjectModule extends BaseHandler implements ProjectService {
}
}
private boolean listItems(HttpExchange ex, UmbrellaUser user) throws IOException, UmbrellaException {
private boolean listProjects(HttpExchange ex, UmbrellaUser user) throws IOException, UmbrellaException {
var json = json(ex);
if (!(json.has(COMPANY_ID) && json.get(COMPANY_ID) instanceof Number cid)) throw missingFieldException(COMPANY_ID);
var companyId = cid.longValue();
var company = companies.get(companyId);
if (!companies.membership(companyId,user.id())) throw forbidden("You are mot a member of company {0}",company.name());
var items = listProjects(companyId,false)
var projects = listProjectsOfCompany(companyId,false)
.stream()
.map(Project::toMap)
.map(HashMap::new);
return sendContent(ex,items);
return sendContent(ex,projects);
}
public Collection<Project> listProjects(long companyId, boolean includeClosed) throws UmbrellaException {
return projectDb.list(companyId, includeClosed).stream().sorted(comparing(Project::name)).toList();
public Collection<Project> listProjectsOfCompany(long companyId, boolean includeClosed) throws UmbrellaException {
return projectDb.list(companyId, includeClosed, users).values().stream().sorted(comparing(Project::name)).toList();
}
private boolean postProject(HttpExchange ex, UmbrellaUser user) throws IOException, UmbrellaException {
@@ -94,8 +91,8 @@ public class ProjectModule extends BaseHandler implements ProjectService {
if (json.has(SETTINGS) && json.get(SETTINGS) instanceof JSONObject settingsJson){
showClosed = settingsJson.has(SHOW_CLOSED) && settingsJson.get(SHOW_CLOSED) == TRUE;
}
var prj = new Project(0,name,description,Project.Status.Open,companyId,showClosed);
projectDb.save(prj);
return notFound(ex);
var prj = new Project(0,name,description,Project.Status.Open,companyId,showClosed, List.of(new Member(user, OWNER)));
prj = projectDb.save(prj);
return sendContent(ex,prj);
}
}

68
project/src/main/java/de/srsoftware/umbrella/project/SqliteDb.java
View File

@@ -1,8 +1,7 @@
/* © SRSoftware 2025 */
package de.srsoftware.umbrella.project;
import static de.srsoftware.tools.jdbc.Condition.equal;
import static de.srsoftware.tools.jdbc.Condition.lessThan;
import static de.srsoftware.tools.jdbc.Condition.*;
import static de.srsoftware.tools.jdbc.Query.insertInto;
import static de.srsoftware.tools.jdbc.Query.select;
import static de.srsoftware.umbrella.core.Constants.*;
@@ -15,17 +14,16 @@ import static java.lang.System.Logger.Level.ERROR;
import static java.lang.System.Logger.Level.INFO;
import static java.text.MessageFormat.format;
import de.srsoftware.tools.PasswordHasher;
import de.srsoftware.tools.jdbc.Query;
import de.srsoftware.umbrella.core.api.UserService;
import de.srsoftware.umbrella.core.exceptions.UmbrellaException;
import de.srsoftware.umbrella.core.model.Member;
import de.srsoftware.umbrella.core.model.Permission;
import de.srsoftware.umbrella.core.model.Project;
import java.security.NoSuchAlgorithmException;
import java.sql.Connection;
import java.sql.ResultSet;
import java.sql.SQLException;
import java.util.Collection;
import java.util.HashSet;
import java.util.HashMap;
public class SqliteDb implements ProjectDb {
private static final System.Logger LOG = System.getLogger("Sqlite4Project");
@@ -125,25 +123,67 @@ CREATE TABLE IF NOT EXISTS {0} ( {1} VARCHAR(255) PRIMARY KEY, {2} VARCHAR(255)
}
@Override
public Collection<Project> list(long companyId, boolean includeClosed) throws UmbrellaException {
public HashMap<Long, Project> list(long companyId, boolean includeClosed, UserService userService) throws UmbrellaException {
try {
var items = new HashSet<Project>();
var projects = new HashMap<Long,Project>();
var query = select("*").from(TABLE_PROJECTS).where(COMPANY_ID, equal(companyId));
if (!includeClosed) query = query.where(STATUS,lessThan(Project.Status.Complete.code()));
var rs = query.exec(db);
while (rs.next()) items.add(Project.of(rs));
while (rs.next()){
var project = Project.of(rs);
projects.put(project.id(),project);
}
rs.close();
return items;
rs = select("*").from(TABLE_PROJECT_USERS).where(PROJECT_ID,in(projects.keySet())).exec(db);
var userIdMap = new HashMap<Long,HashMap<Long, Permission>>();
while (rs.next()){
var userId = rs.getLong(USER_ID);
var projectId = rs.getLong(PROJECT_ID);
var permission = Permission.of(rs.getInt(PERMISSIONS));
HashMap<Long, Permission> userMap = userIdMap.computeIfAbsent(userId, k -> new HashMap<>());
userMap.put(projectId,permission);
}
rs.close();
var userMap = userService.list(userIdMap.keySet());
for (var entry : userIdMap.entrySet()){
var userId = entry.getKey();
var user = userMap.get(userId);
for (var inner : entry.getValue().entrySet()){
var projectId = inner.getKey();
var perm = inner.getValue();
var project = projects.get(projectId);
project.members().add(new Member(user,perm));
}
}
return projects;
} catch (SQLException e) {
throw new UmbrellaException(HTTP_SERVER_ERROR,"Failed to load items from database");
}
}
@Override
public Project save(Project prj) {
public Project save(Project prj) throws UmbrellaException {
try {
insertInto(TABLE_PROJECTS);
if (prj.id() == 0) {
var stmt = insertInto(TABLE_PROJECTS, NAME, DESCRIPTION, STATUS, COMPANY_ID, SHOW_CLOSED).values(prj.name(), prj.description(), prj.status().code(), prj.companyId(), prj.showClosed()).execute(db);
var rs = stmt.getGeneratedKeys();
var id = rs.next() ? rs.getLong(1) : null;
rs.close();
if (id != null){
if (!prj.members().isEmpty()) {
var query = insertInto(TABLE_PROJECT_USERS, PROJECT_ID, USER_ID, PERMISSIONS);
for (var member : prj.members())
query.values(id, member.user().id(), member.permission().code());
query.execute(db).close();
}
return new Project(id, prj.name(), prj.description(),prj.status(),prj.companyId(),prj.showClosed(),prj.members());
}
} else {
LOG.log(ERROR,"Updating project not implemented!");
}
return null;
} catch (SQLException e) {
throw new UmbrellaException(HTTP_SERVER_ERROR,"Failed to insert project into database");
}
return null;
}
}