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

preparing to load tags alongside with project tasks

Browse Source
This commit is contained in:
Stephan Richter
2025-09-24 08:50:58 +02:00
parent f155ad14fc
commit 404b8263a9
5 changed files with 65 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
core/src/main/java/de/srsoftware/umbrella/core/api/TagService.java
View File

@@ -4,12 +4,23 @@ package de.srsoftware.umbrella.core.api;
import de.srsoftware.umbrella.core.exceptions.UmbrellaException;
import de.srsoftware.umbrella.core.model.UmbrellaUser;
import java.util.Collection;
import java.util.Map;
public interface TagService {
void deleteEntity(String task, long taskId);
Collection<String> getTags(String module, long entityId, UmbrellaUser user) throws UmbrellaException;
/**
* Loads the tags for all the entities denominated by the collection <em>entityIds</em>.
* @param module the realm the entities belong to
* @param entityIds the set of entities of the respective realm
* @param user the user, for whom the tags shall be loaded
* @return a map from entity ids to assigned tags
* @throws UmbrellaException
*/
Map<Long, ? extends Collection<String>> getTags(String module, Collection<Long> entityIds, UmbrellaUser user) throws UmbrellaException;
void save(String module, long entityId, Collection<Long> userIds, Collection<String> tags);
String save(String module, long entityId, Collection<Long> userIds, String tag);

25
tags/src/main/java/de/srsoftware/umbrella/tags/SqliteDb.java
View File

@@ -253,8 +253,13 @@ CREATE TABLE IF NOT EXISTS {0} (
public Set<String> list(long userId, String module, long entityId) {
try {
var tags = new HashSet<String>();
// load tags assigned to user
var rs = select(TAG).from(TABLE_TAGS).where(MODULE,equal(module)).where(ENTITY_ID,equal(entityId)).where(USER_ID,equal(userId)).exec(db);
while (rs.next()) tags.add(rs.getString(1));
rs.close();
// load tags assigned to no user
rs = select(TAG).from(TABLE_TAGS).where(MODULE,equal(module)).where(ENTITY_ID,equal(entityId)).where(USER_ID,isNull()).exec(db);
while (rs.next()) tags.add(rs.getString(1));
rs.close();
@@ -264,6 +269,26 @@ CREATE TABLE IF NOT EXISTS {0} (
}
}
@Override
public Map<Long, ? extends Collection<String>> list(long userId, String module, Collection<Long> entityIds) {
try {
var tags = new HashMap<Long,HashSet<String>>();
// load tags assigned to user
var rs = select(ENTITY_ID,TAG).from(TABLE_TAGS).where(MODULE,equal(module)).where(ENTITY_ID,in(entityIds.toArray())).where(USER_ID,equal(userId)).exec(db);
while (rs.next()) tags.computeIfAbsent(rs.getLong(ENTITY_ID), k -> new HashSet<>()).add(rs.getString(TAG));
rs.close();
// load tags assigned to no user
rs = select(TAG).from(TABLE_TAGS).where(MODULE,equal(module)).where(ENTITY_ID,in(entityIds.toArray())).where(USER_ID,isNull()).exec(db);
while (rs.next()) tags.computeIfAbsent(rs.getLong(ENTITY_ID), k -> new HashSet<>()).add(rs.getString(TAG));
rs.close();
return tags;
} catch (SQLException e) {
throw new UmbrellaException("Failed to load tags");
}
}
@Override
public void save(Collection<Long> userIds, String module, long entityId, Collection<String> tags) {
try {

12
tags/src/main/java/de/srsoftware/umbrella/tags/TagDB.java
View File

@@ -1,6 +1,8 @@
/* © SRSoftware 2025 */
package de.srsoftware.umbrella.tags;
import de.srsoftware.umbrella.core.exceptions.UmbrellaException;
import java.util.Collection;
import java.util.List;
import java.util.Map;
@@ -15,8 +17,16 @@ public interface TagDB {
Set<String> list(long userId, String module, long entityId);
/**
* Loads the tags for all the entities denominated by the collection <em>entityIds</em>.
* @param module the realm the entities belong to
* @param entityIds the set of entities of the respective realm
* @param userId the id of the user, for whom the tags shall be loaded
* @return a map from entity ids to assigned tags
*/
Map<Long, ? extends Collection<String>> list(long userId, String module, Collection<Long> entityIds);
void save(Collection<Long> userIds, String module, long entityId, Collection<String> tags);
void updateId(String module, Object oldId, Object newId);
}

5
tags/src/main/java/de/srsoftware/umbrella/tags/TagModule.java
View File

@@ -121,6 +121,11 @@ public class TagModule extends BaseHandler implements TagService {
return tagDb.list(user.id(),module,entityId);
}
@Override
public Map<Long, ? extends Collection<String>> getTags(String module, Collection<Long> entityIds, UmbrellaUser user) throws UmbrellaException {
return tagDb.list(user.id(),module,entityIds);
}
@Override
public void save(String module, long entityId, Collection<Long> userIds, Collection<String> tags) {
tagDb.save(userIds,module,entityId,tags);

11
task/src/main/java/de/srsoftware/umbrella/task/TaskModule.java
View File

@@ -13,6 +13,7 @@ import static de.srsoftware.umbrella.core.exceptions.UmbrellaException.*;
import static de.srsoftware.umbrella.core.model.Permission.*;
import static de.srsoftware.umbrella.project.Constants.PERMISSIONS;
import static de.srsoftware.umbrella.task.Constants.*;
import static java.lang.System.Logger.Level.DEBUG;
import static java.lang.System.Logger.Level.WARNING;
import static java.net.HttpURLConnection.HTTP_BAD_REQUEST;
@@ -390,9 +391,17 @@ public class TaskModule extends BaseHandler implements TaskService {
var projectId = json.has(PROJECT_ID) && json.get(PROJECT_ID) instanceof Number number ? number.longValue() : null;
var parentTaskId = json.has(PARENT_TASK_ID) && json.get(PARENT_TASK_ID) instanceof Number number ? number.longValue() : null;
if (isSet(projectId)) {
if (parentTaskId == null) return sendContent(ex, mapValues(taskDb.listRootTasks(projectId, user, showClosed)));
if (parentTaskId == null) {
var list = taskDb.listRootTasks(projectId, user, showClosed);
return sendContent(ex, mapValues(list));
}
var projectTasks = taskDb.listProjectTasks(projectId, parentTaskId, noIndex);
loadMembers(projectTasks.values());
var tags = tagService().getTags(TASK,projectTasks.keySet(),user);
LOG.log(DEBUG,"tags: {0}",tags);
// TODO: add tags to result map
return sendContent(ex, mapValues(projectTasks));
}
if (isSet(parentTaskId)) return sendContent(ex, mapValues(taskDb.listChildrenOf(parentTaskId, user, showClosed)));