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

freactoring to get company list work in efficient way

Browse Source
This commit is contained in:
Stephan Richter
2025-07-18 23:23:14 +02:00
parent 722f12912d
commit a06217517b
22 changed files with 203 additions and 76 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
project/src/main/java/de/srsoftware/umbrella/project/Constants.java
View File

@@ -7,7 +7,7 @@ public class Constants {
public static final String DB_VERSION = "project_db_version";
public static final String PERMISSIONS = "permissions";
public static final String TABLE_PROJECTS = "projects";
public static final String TABLE_PROJECT_USERS = "project_users";
public static final String TABLE_PROJECT_USERS = "projects_users";
}

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

@@ -7,7 +7,8 @@ import de.srsoftware.umbrella.core.model.Project;
import java.util.Map;
public interface ProjectDb {
Map<Long, Project> list(long companyId, boolean includeClosed, UserService userService) throws UmbrellaException;
Map<Long, Project> ofCompany(long companyId, boolean includeClosed, UserService userService) throws UmbrellaException;
Map<Long, Project> ofUser(long userId, boolean includeClosed, UserService userService) throws UmbrellaException;
Project save(Project prj) throws UmbrellaException;
}

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

@@ -26,13 +26,13 @@ import org.json.JSONObject;
public class ProjectModule extends BaseHandler implements ProjectService {
private final ProjectDb projectDb;
private final ProjectDb projects;
private final CompanyService companies;
private final UserService users;
public ProjectModule(Configuration config, CompanyService companyService) throws UmbrellaException {
var dbFile = config.get(CONFIG_DATABASE).orElseThrow(() -> missingFieldException(CONFIG_DATABASE));
projectDb = new SqliteDb(connect(dbFile));
projects = new SqliteDb(connect(dbFile));
companies = companyService;
users = companies.userService();
}
@@ -42,6 +42,24 @@ public class ProjectModule extends BaseHandler implements ProjectService {
return companies;
}
@Override
public boolean doGet(Path path, HttpExchange ex) throws IOException {
addCors(ex);
try {
Optional<Token> token = SessionToken.from(ex).map(Token::of);
var user = users.loadUser(token);
if (user.isEmpty()) return unauthorized(ex);
var head = path.pop();
return switch (head) {
case LIST -> listUserProjects(ex,user.get());
case null -> postProject(ex,user.get());
default -> super.doGet(path,ex);
};
} catch (UmbrellaException e){
return send(ex,e);
}
}
@Override
public boolean doPost(Path path, HttpExchange ex) throws IOException {
addCors(ex);
@@ -51,7 +69,7 @@ public class ProjectModule extends BaseHandler implements ProjectService {
if (user.isEmpty()) return unauthorized(ex);
var head = path.pop();
return switch (head) {
case LIST -> listProjects(ex,user.get());
case LIST -> listCompanyProjects(ex,user.get());
case null -> postProject(ex,user.get());
default -> super.doGet(path,ex);
};
@@ -60,24 +78,35 @@ public class ProjectModule extends BaseHandler implements ProjectService {
}
}
private boolean listProjects(HttpExchange ex, UmbrellaUser user) throws IOException, UmbrellaException {
public Collection<Project> listCompanyProjects(long companyId, boolean includeClosed) throws UmbrellaException {
return projects.ofCompany(companyId, includeClosed, users).values().stream().sorted(comparing(Project::name)).toList();
}
private boolean listCompanyProjects(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 projects = listProjectsOfCompany(companyId,false)
var projects = listCompanyProjects(companyId,false)
.stream()
.map(Project::toMap)
.map(HashMap::new);
return sendContent(ex,projects);
}
public Collection<Project> listProjectsOfCompany(long companyId, boolean includeClosed) throws UmbrellaException {
return projectDb.list(companyId, includeClosed, users).values().stream().sorted(comparing(Project::name)).toList();
@Override
public Map<Long, Project> listUserProjects(long userId, boolean includeClosed) throws UmbrellaException {
return projects.ofUser(userId, includeClosed, users);
}
private boolean listUserProjects(HttpExchange ex, UmbrellaUser user) throws IOException, UmbrellaException {
var projects = new HashMap<Long,Map<String,Object>>();
for (var entry : listUserProjects(user.id(),false).entrySet()) projects.put(entry.getKey(),entry.getValue().toMap());
return sendContent(ex,projects);
}
private boolean postProject(HttpExchange ex, UmbrellaUser user) throws IOException, UmbrellaException {
var json = json(ex);
if (!(json.has(NAME) && json.get(NAME) instanceof String name)) throw missingFieldException(NAME);
@@ -92,7 +121,7 @@ public class ProjectModule extends BaseHandler implements ProjectService {
showClosed = settingsJson.has(SHOW_CLOSED) && settingsJson.get(SHOW_CLOSED) == TRUE;
}
var prj = new Project(0,name,description,Project.Status.Open,companyId,showClosed, List.of(new Member(user, OWNER)));
prj = projectDb.save(prj);
prj = projects.save(prj);
return sendContent(ex,prj);
}
}

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

@@ -7,7 +7,6 @@ import static de.srsoftware.tools.jdbc.Query.select;
import static de.srsoftware.umbrella.core.Constants.*;
import static de.srsoftware.umbrella.core.Constants.TABLE_SETTINGS;
import static de.srsoftware.umbrella.core.ResponseCode.HTTP_SERVER_ERROR;
import static de.srsoftware.umbrella.core.Util.LOG;
import static de.srsoftware.umbrella.core.model.Project.Status.Open;
import static de.srsoftware.umbrella.project.Constants.*;
import static java.lang.System.Logger.Level.ERROR;
@@ -36,6 +35,31 @@ public class SqliteDb implements ProjectDb {
init();
}
private HashMap<Long, Project> addMembers(HashMap<Long, Project> projects, UserService userService) throws SQLException, UmbrellaException {
Object[] ids = projects.keySet().toArray();
var rs = select("*").from(TABLE_PROJECT_USERS).where(PROJECT_ID,in(ids)).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;
}
private int createTables() {
createProjectTables();
@@ -123,7 +147,7 @@ CREATE TABLE IF NOT EXISTS {0} ( {1} VARCHAR(255) PRIMARY KEY, {2} VARCHAR(255)
}
@Override
public HashMap<Long, Project> list(long companyId, boolean includeClosed, UserService userService) throws UmbrellaException {
public HashMap<Long, Project> ofCompany(long companyId, boolean includeClosed, UserService userService) throws UmbrellaException {
try {
var projects = new HashMap<Long,Project>();
var query = select("*").from(TABLE_PROJECTS).where(COMPANY_ID, equal(companyId));
@@ -134,28 +158,27 @@ CREATE TABLE IF NOT EXISTS {0} ( {1} VARCHAR(255) PRIMARY KEY, {2} VARCHAR(255)
projects.put(project.id(),project);
}
rs.close();
rs = select("*").from(TABLE_PROJECT_USERS).where(PROJECT_ID,in(projects.keySet())).exec(db);
var userIdMap = new HashMap<Long,HashMap<Long, Permission>>();
return addMembers(projects,userService);
} catch (SQLException e) {
throw new UmbrellaException(HTTP_SERVER_ERROR,"Failed to load items from database");
}
}
@Override
public HashMap<Long, Project> ofUser(long userId, boolean includeClosed, UserService userService) throws UmbrellaException {
try {
var projects = new HashMap<Long,Project>();
var query = select("*").from(TABLE_PROJECTS).leftJoin(ID,TABLE_PROJECT_USERS,PROJECT_ID).where(USER_ID, equal(userId));
if (!includeClosed) query = query.where(STATUS,lessThan(Project.Status.Complete.code()));
var rs = query.exec(db);
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);
var project = Project.of(rs);
projects.put(project.id(),project);
}
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;
return addMembers(projects,userService);
} catch (SQLException e) {
throw new UmbrellaException(HTTP_SERVER_ERROR,"Failed to load items from database");
}