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

implemented various task features:

Browse Source 
- saving on CTRL+S
- editing of
    - start date
    - due date
    - members
This commit is contained in:
Stephan Richter
2025-07-26 21:23:58 +02:00
parent 58986a5c59
commit 91aa421ae9
11 changed files with 203 additions and 62 deletions
Download Patch File Download Diff File Expand all files Collapse all files

18
task/src/main/java/de/srsoftware/umbrella/task/SqliteDb.java
View File

@@ -112,6 +112,18 @@ CREATE TABLE IF NOT EXISTS {0} (
}
}
@Override
public void dropMember(long projectId, long userId) {
try {
delete().from(TABLE_TASKS_USERS)
.where(TASK_ID,equal(projectId))
.where(USER_ID,equal(userId))
.execute(db);
} catch (SQLException e) {
throw new UmbrellaException("Failed to delete member (userId = {0} from project {1}",userId,projectId);
}
}
@Override
public Map<Long, Permission> getMembers(Task task) {
try {
@@ -216,6 +228,12 @@ CREATE TABLE IF NOT EXISTS {0} (
if (taskId == null) throw new UmbrellaException("Failed to save task {0}",task.name());
return new Task(taskId,task.projectId(),task.parentTaskId(),task.name(),task.description(),task.status(),task.estimatedTime(),task.start(),task.dueDate(),task.showClosed(),task.noIndex(),task.members());
}
if (task.isDirty(MEMBERS)){
var query = replaceInto(TABLE_TASKS_USERS,TASK_ID,USER_ID,PERMISSIONS);
for (var member : task.members().entrySet()) query.values(task.id(),member.getKey(),member.getValue().permission().code());
query.execute(db).close();
task.clean(MEMBERS);
}
if (task.isDirty()) {
update(TABLE_TASKS).set(PROJECT_ID,PARENT_TASK_ID,NAME,DESCRIPTION,STATUS,EST_TIME,START_DATE,DUE_DATE,SHOW_CLOSED,NO_INDEX)
.where(ID,equal(task.id())).prepare(db)

2
task/src/main/java/de/srsoftware/umbrella/task/TaskDb.java
View File

@@ -9,6 +9,8 @@ import java.util.Map;
public interface TaskDb {
void dropMember(long projectId, long userId);
Task load(long taskId) throws UmbrellaException;
Map<Long, Permission> getMembers(Task task);

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

@@ -9,7 +9,7 @@ import static de.srsoftware.umbrella.core.Paths.*;
import static de.srsoftware.umbrella.core.ResponseCode.HTTP_NOT_IMPLEMENTED;
import static de.srsoftware.umbrella.core.Util.mapValues;
import static de.srsoftware.umbrella.core.exceptions.UmbrellaException.*;
import static de.srsoftware.umbrella.core.model.Permission.READ_ONLY;
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.net.HttpURLConnection.HTTP_BAD_REQUEST;
@@ -49,6 +49,13 @@ public class TaskModule extends BaseHandler implements TaskService {
users = companies.userService();
}
private void addMember(Task task, long userId) {
var user = users.loadUser(userId);
var member = new Member(user,READ_ONLY);
task.members().put(userId,member);
task.dirty(MEMBERS);
}
@Override
public CompanyService companyService() {
return companies;
@@ -123,6 +130,12 @@ public class TaskModule extends BaseHandler implements TaskService {
}
}
private void dropMember(Task task, long userId) {
if (task.members().get(userId).permission() == OWNER) throw forbidden("You may not remove the owner of the task");
taskDb.dropMember(task.id(),userId);
task.members().remove(userId);
}
private boolean estimatedTimes(UmbrellaUser user, HttpExchange ex) throws IOException, UmbrellaException {
var json = json(ex);
if (!(json.has(COMPANY_ID) && json.get(COMPANY_ID) instanceof Number cid)) throw missingFieldException(COMPANY_ID);
@@ -202,11 +215,37 @@ public class TaskModule extends BaseHandler implements TaskService {
return mappedTask;
}
private void patchMembers(Task task, JSONObject json) {
var members = task.members();
for (var key : json.keySet()){
long userId;
try {
userId = Long.parseLong(key);
} catch (NumberFormatException e) {
throw invalidFieldException(USER_ID,"long");
}
if (!(json.get(key) instanceof Number number)) throw invalidFieldException(PERMISSION,"int");
var permission = Permission.of(number.intValue());
if (permission == OWNER) { // if a new person is about to become the task owner
for (var member : members.values()){ // alter the previous owners to editors
if (member.permission() == OWNER) members.put(member.user().id(),new Member(member.user(),EDIT));
}
}
members.put(userId,new Member(users.loadUser(userId),permission));
task.dirty(MEMBERS);
}
}
private boolean patchTask(HttpExchange ex, long taskId, UmbrellaUser user) throws IOException {
var task = loadMembers(taskDb.load(taskId));
var member = task.members().get(user.id());
if (member == null || member.permission() == READ_ONLY ) throw forbidden("You are not a allowed to edit {0}!",task.name());
taskDb.save(task.patch(json(ex)));
var json = json(ex);
if (json.has(DROP_MEMBER) && json.get(DROP_MEMBER) instanceof Number id) dropMember(task,id.longValue());
if (json.has(MEMBERS) && json.get(MEMBERS) instanceof JSONObject memberJson) patchMembers(task,memberJson);
if (json.has(NEW_MEMBER) && json.get(NEW_MEMBER) instanceof Number num) addMember(task,num.longValue());
taskDb.save(task.patch(json));
return sendContent(ex,task);
}