Skip to content

feat: add rtype field support to edit task API #226

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Closed
Hell1213 wants to merge 1 commit into from
Closed

feat: add rtype field support to edit task API #226

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 2 additions & 1 deletion backend/controllers/edit_task.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -51,6 +51,7 @@ func EditTaskHandler(w http.ResponseWriter, r *http.Request) {
wait := requestBody.Wait
end := requestBody.End
depends := requestBody.Depends
rtype := requestBody.RType

if taskID == "" {
http.Error(w, "taskID is required", http.StatusBadRequest)
Expand All @@ -62,7 +63,7 @@ func EditTaskHandler(w http.ResponseWriter, r *http.Request) {
Name: "Edit Task",
Execute: func() error {
logStore.AddLog("INFO", fmt.Sprintf("Editing task ID: %s", taskID), uuid, "Edit Task")
err := tw.EditTaskInTaskwarrior(uuid, description, email, encryptionSecret, taskID, tags, project, start, entry, wait, end, depends)
err := tw.EditTaskInTaskwarrior(uuid, description, email, encryptionSecret, taskID, tags, project, start, entry, wait, end, depends, rtype)
if err != nil {
logStore.AddLog("ERROR", fmt.Sprintf("Failed to edit task ID %s: %v", taskID, err), uuid, "Edit Task")
return err
Expand Down
1 change: 1 addition & 0 deletions backend/models/request_body.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -36,6 +36,7 @@ type EditTaskRequestBody struct {
Wait string `json:"wait"`
End string `json:"end"`
Depends []string `json:"depends"`
RType string `json:"rtype"`
}
type CompleteTaskRequestBody struct {
Email string `json:"email"`
Expand Down
6 changes: 5 additions & 1 deletion backend/utils/tw/edit_task.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ import (
"strings"
)

func EditTaskInTaskwarrior(uuid, description, email, encryptionSecret, taskID string, tags []string, project string, start string, entry string, wait string, end string, depends []string) error {
func EditTaskInTaskwarrior(uuid, description, email, encryptionSecret, taskID string, tags []string, project string, start string, entry string, wait string, end string, depends []string, rtype string) error {
if err := utils.ExecCommand("rm", "-rf", "/root/.task"); err != nil {
return fmt.Errorf("error deleting Taskwarrior data: %v", err)
}
Expand Down Expand Up @@ -102,6 +102,10 @@ func EditTaskInTaskwarrior(uuid, description, email, encryptionSecret, taskID st
}
}

// Note: rtype is read-only and automatically set by taskwarrior when recur field is set
// We accept it in the API for completeness but don't modify it directly
// If rtype needs to be changed, modify the recur field instead

// Sync Taskwarrior again
if err := SyncTaskwarrior(tempDir); err != nil {
return err
Expand Down
8 changes: 4 additions & 4 deletions backend/utils/tw/taskwarrior_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@ func TestSyncTaskwarrior(t *testing.T) {
}

func TestEditTaskInATaskwarrior(t *testing.T) {
err := EditTaskInTaskwarrior("uuid", "description", "email", "encryptionSecret", "taskuuid", nil, "project", "2025-11-29T18:30:00.000Z", "2025-11-29T18:30:00.000Z", "2025-11-29T18:30:00.000Z", "2025-11-30T18:30:00.000Z", nil)
err := EditTaskInTaskwarrior("uuid", "description", "email", "encryptionSecret", "taskuuid", nil, "project", "2025-11-29T18:30:00.000Z", "2025-11-29T18:30:00.000Z", "2025-11-29T18:30:00.000Z", "2025-11-30T18:30:00.000Z", nil, "")
if err != nil {
t.Errorf("EditTaskInTaskwarrior() failed: %v", err)
} else {
Expand Down Expand Up @@ -68,7 +68,7 @@ func TestAddTaskWithTags(t *testing.T) {
}

func TestEditTaskWithTagAddition(t *testing.T) {
err := EditTaskInTaskwarrior("uuid", "description", "email", "encryptionSecret", "taskuuid", []string{"+urgent", "+important"}, "project", "2025-11-29T18:30:00.000Z", "2025-11-29T18:30:00.000Z", "2025-11-29T18:30:00.000Z", "2025-11-30T18:30:00.000Z", nil)
err := EditTaskInTaskwarrior("uuid", "description", "email", "encryptionSecret", "taskuuid", []string{"+urgent", "+important"}, "project", "2025-11-29T18:30:00.000Z", "2025-11-29T18:30:00.000Z", "2025-11-29T18:30:00.000Z", "2025-11-30T18:30:00.000Z", nil, "")
if err != nil {
t.Errorf("EditTaskInTaskwarrior with tag addition failed: %v", err)
} else {
Expand All @@ -77,7 +77,7 @@ func TestEditTaskWithTagAddition(t *testing.T) {
}

func TestEditTaskWithTagRemoval(t *testing.T) {
err := EditTaskInTaskwarrior("uuid", "description", "email", "encryptionSecret", "taskuuid", []string{"-work", "-lowpriority"}, "project", "2025-11-29T18:30:00.000Z", "2025-11-29T18:30:00.000Z", "2025-11-29T18:30:00.000Z", "2025-11-30T18:30:00.000Z", nil)
err := EditTaskInTaskwarrior("uuid", "description", "email", "encryptionSecret", "taskuuid", []string{"-work", "-lowpriority"}, "project", "2025-11-29T18:30:00.000Z", "2025-11-29T18:30:00.000Z", "2025-11-29T18:30:00.000Z", "2025-11-30T18:30:00.000Z", nil, "")
if err != nil {
t.Errorf("EditTaskInTaskwarrior with tag removal failed: %v", err)
} else {
Expand All @@ -86,7 +86,7 @@ func TestEditTaskWithTagRemoval(t *testing.T) {
}

func TestEditTaskWithMixedTagOperations(t *testing.T) {
err := EditTaskInTaskwarrior("uuid", "description", "email", "encryptionSecret", "taskuuid", []string{"+urgent", "-work", "normal"}, "project", "2025-11-29T18:30:00.000Z", "2025-11-29T18:30:00.000Z", "2025-11-29T18:30:00.000Z", "2025-11-30T18:30:00.000Z", nil)
err := EditTaskInTaskwarrior("uuid", "description", "email", "encryptionSecret", "taskuuid", []string{"+urgent", "-work", "normal"}, "project", "2025-11-29T18:30:00.000Z", "2025-11-29T18:30:00.000Z", "2025-11-29T18:30:00.000Z", "2025-11-30T18:30:00.000Z", nil, "")
if err != nil {
t.Errorf("EditTaskInTaskwarrior with mixed tag operations failed: %v", err)
} else {
Expand Down
28 changes: 19 additions & 9 deletions frontend/src/components/HomeComponents/Tasks/Tasks.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -335,7 +335,8 @@ export const Tasks = (
entry: string,
wait: string,
end: string,
depends: string[]
depends: string[],
rtype: string
) {
try {
await editTaskOnBackend({
Expand All @@ -352,6 +353,7 @@ export const Tasks = (
wait,
end,
depends,
rtype,
});

console.log('Task edited successfully!');
Expand Down Expand Up @@ -398,7 +400,8 @@ export const Tasks = (
task.entry || '',
task.wait || '',
task.end || '',
task.depends || []
task.depends || [],
task.rtype || ''
);
setIsEditing(false);
};
Expand All @@ -417,7 +420,8 @@ export const Tasks = (
task.entry || '',
task.wait || '',
task.end || '',
task.depends || []
task.depends || [],
task.rtype || ''
);
setIsEditingProject(false);
};
Expand All @@ -437,7 +441,8 @@ export const Tasks = (
task.entry || '',
task.wait,
task.end || '',
task.depends || []
task.depends || [],
task.rtype || ''
);

setIsEditingWaitDate(false);
Expand All @@ -458,7 +463,8 @@ export const Tasks = (
task.entry || '',
task.wait || '',
task.end || '',
task.depends || []
task.depends || [],
task.rtype || ''
);

setIsEditingStartDate(false);
Expand All @@ -479,7 +485,8 @@ export const Tasks = (
task.entry,
task.wait,
task.end,
task.depends || []
task.depends || [],
task.rtype || ''
);

setIsEditingEntryDate(false);
Expand All @@ -500,7 +507,8 @@ export const Tasks = (
task.entry,
task.wait,
task.end,
task.depends || []
task.depends || [],
task.rtype || ''
);

setIsEditingEndDate(false);
Expand All @@ -521,7 +529,8 @@ export const Tasks = (
task.entry || '',
task.wait || '',
task.end || '',
task.depends
task.depends,
task.rtype || ''
);

setIsEditingDepends(false);
Expand Down Expand Up @@ -679,7 +688,8 @@ export const Tasks = (
task.entry || '',
task.wait || '',
task.end || '',
task.depends || []
task.depends || [],
task.rtype || ''
);

setIsEditingTags(false);
Expand Down
3 changes: 3 additions & 0 deletions frontend/src/components/HomeComponents/Tasks/hooks.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -94,6 +94,7 @@ export const editTaskOnBackend = async ({
wait,
end,
depends,
rtype,
}: {
email: string;
encryptionSecret: string;
Expand All @@ -108,6 +109,7 @@ export const editTaskOnBackend = async ({
wait: string;
end: string;
depends: string[];
rtype: string;
}) => {
const response = await fetch(`${backendURL}edit-task`, {
method: 'POST',
Expand All @@ -124,6 +126,7 @@ export const editTaskOnBackend = async ({
wait,
end,
depends,
rtype,
}),
headers: {
'Content-Type': 'application/json',
Expand Down
Loading