From e634c7cfda748d9e648614066dafe70f52a15193 Mon Sep 17 00:00:00 2001 From: Neeraj-gagat Date: Mon, 29 Dec 2025 00:27:25 +0530 Subject: [PATCH] fixes#317 --- backend/controllers/controllers_test.go | 2 +- backend/controllers/edit_task.go | 12 ++++---- backend/controllers/modify_task.go | 14 +++++----- backend/models/request_body.go | 4 +-- .../components/HomeComponents/Tasks/Tasks.tsx | 28 +++++++++---------- .../Tasks/__tests__/hooks.test.ts | 8 +++--- .../components/HomeComponents/Tasks/hooks.ts | 14 +++++----- 7 files changed, 41 insertions(+), 41 deletions(-) diff --git a/backend/controllers/controllers_test.go b/backend/controllers/controllers_test.go index cd289aa4..921d69c3 100644 --- a/backend/controllers/controllers_test.go +++ b/backend/controllers/controllers_test.go @@ -255,7 +255,7 @@ func Test_EditTaskHandler_WithDependencies(t *testing.T) { "email": "test@example.com", "encryptionSecret": "secret", "UUID": "test-uuid", - "taskID": "1", + "taskUUID": "task-uuid", "description": "Edited task with dependencies", "project": "EditedProject", "depends": []string{"task-uuid-3"}, diff --git a/backend/controllers/edit_task.go b/backend/controllers/edit_task.go index 40a6fa59..f22cff37 100644 --- a/backend/controllers/edit_task.go +++ b/backend/controllers/edit_task.go @@ -43,7 +43,7 @@ func EditTaskHandler(w http.ResponseWriter, r *http.Request) { email := requestBody.Email encryptionSecret := requestBody.EncryptionSecret uuid := requestBody.UUID - taskID := requestBody.TaskID + taskUUID := requestBody.TaskUUID description := requestBody.Description tags := requestBody.Tags project := requestBody.Project @@ -56,7 +56,7 @@ func EditTaskHandler(w http.ResponseWriter, r *http.Request) { recur := requestBody.Recur annotations := requestBody.Annotations - if taskID == "" { + if taskUUID == "" { http.Error(w, "taskID is required", http.StatusBadRequest) return } @@ -71,13 +71,13 @@ func EditTaskHandler(w http.ResponseWriter, r *http.Request) { job := Job{ 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, due, recur, annotations) + logStore.AddLog("INFO", fmt.Sprintf("Editing task ID: %s", taskUUID), uuid, "Edit Task") + err := tw.EditTaskInTaskwarrior(uuid, description, email, encryptionSecret, taskUUID, tags, project, start, entry, wait, end, depends, due, recur, annotations) if err != nil { - logStore.AddLog("ERROR", fmt.Sprintf("Failed to edit task ID %s: %v", taskID, err), uuid, "Edit Task") + logStore.AddLog("ERROR", fmt.Sprintf("Failed to edit task ID %s: %v", taskUUID, err), uuid, "Edit Task") return err } - logStore.AddLog("INFO", fmt.Sprintf("Successfully edited task ID: %s", taskID), uuid, "Edit Task") + logStore.AddLog("INFO", fmt.Sprintf("Successfully edited task ID: %s", taskUUID), uuid, "Edit Task") return nil }, } diff --git a/backend/controllers/modify_task.go b/backend/controllers/modify_task.go index e4eb2acd..e3f9645a 100644 --- a/backend/controllers/modify_task.go +++ b/backend/controllers/modify_task.go @@ -42,7 +42,7 @@ func ModifyTaskHandler(w http.ResponseWriter, r *http.Request) { email := requestBody.Email encryptionSecret := requestBody.EncryptionSecret uuid := requestBody.UUID - taskID := requestBody.TaskID + taskUUID := requestBody.TaskUUID description := requestBody.Description project := requestBody.Project priority := requestBody.Priority @@ -55,8 +55,8 @@ func ModifyTaskHandler(w http.ResponseWriter, r *http.Request) { http.Error(w, "Description is required, and cannot be empty!", http.StatusBadRequest) return } - if taskID == "" { - http.Error(w, "taskID is required", http.StatusBadRequest) + if taskUUID == "" { + http.Error(w, "taskUUID is required", http.StatusBadRequest) return } @@ -75,13 +75,13 @@ func ModifyTaskHandler(w http.ResponseWriter, r *http.Request) { job := Job{ Name: "Modify Task", Execute: func() error { - logStore.AddLog("INFO", fmt.Sprintf("Modifying task ID: %s", taskID), uuid, "Modify Task") - err := tw.ModifyTaskInTaskwarrior(uuid, description, project, priority, status, due, email, encryptionSecret, taskID, tags, depends) + logStore.AddLog("INFO", fmt.Sprintf("Modifying task UUID: %s", taskUUID), uuid, "Modify Task") + err := tw.ModifyTaskInTaskwarrior(uuid, description, project, priority, status, due, email, encryptionSecret, taskUUID, tags, depends) if err != nil { - logStore.AddLog("ERROR", fmt.Sprintf("Failed to modify task ID %s: %v", taskID, err), uuid, "Modify Task") + logStore.AddLog("ERROR", fmt.Sprintf("Failed to modify task UUID %s: %v", taskUUID, err), uuid, "Modify Task") return err } - logStore.AddLog("INFO", fmt.Sprintf("Successfully modified task ID: %s", taskID), uuid, "Modify Task") + logStore.AddLog("INFO", fmt.Sprintf("Successfully modified task UUID: %s", taskUUID), uuid, "Modify Task") return nil }, } diff --git a/backend/models/request_body.go b/backend/models/request_body.go index 6482533b..89126f5c 100644 --- a/backend/models/request_body.go +++ b/backend/models/request_body.go @@ -22,7 +22,7 @@ type ModifyTaskRequestBody struct { Email string `json:"email"` EncryptionSecret string `json:"encryptionSecret"` UUID string `json:"UUID"` - TaskID string `json:"taskid"` + TaskUUID string `json:"taskuuid"` Description string `json:"description"` Project string `json:"project"` Priority string `json:"priority"` @@ -35,7 +35,7 @@ type EditTaskRequestBody struct { Email string `json:"email"` EncryptionSecret string `json:"encryptionSecret"` UUID string `json:"UUID"` - TaskID string `json:"taskid"` + TaskUUID string `json:"taskuuid"` Description string `json:"description"` Tags []string `json:"tags"` Project string `json:"project"` diff --git a/frontend/src/components/HomeComponents/Tasks/Tasks.tsx b/frontend/src/components/HomeComponents/Tasks/Tasks.tsx index 834b114c..773061db 100644 --- a/frontend/src/components/HomeComponents/Tasks/Tasks.tsx +++ b/frontend/src/components/HomeComponents/Tasks/Tasks.tsx @@ -366,7 +366,7 @@ export const Tasks = ( UUID: string, description: string, tags: string[], - taskID: string, + taskUUID: string, project: string, start: string, entry: string, @@ -384,7 +384,7 @@ export const Tasks = ( UUID, description, tags, - taskID, + taskUUID, backendURL: url.backendURL, project, start, @@ -525,7 +525,7 @@ export const Tasks = ( props.UUID, task.description, task.tags, - task.id.toString(), + task.uuid.toString(), task.project, task.start, task.entry || '', @@ -549,7 +549,7 @@ export const Tasks = ( props.UUID, task.description, task.tags, - task.id.toString(), + task.uuid.toString(), task.project, task.start, task.entry || '', @@ -573,7 +573,7 @@ export const Tasks = ( props.UUID, task.description, task.tags, - task.id.toString(), + task.uuid.toString(), task.project, task.start, task.entry || '', @@ -597,7 +597,7 @@ export const Tasks = ( props.UUID, task.description, task.tags, - task.id.toString(), + task.uuid.toString(), task.project, task.start, task.entry || '', @@ -621,7 +621,7 @@ export const Tasks = ( props.UUID, task.description, task.tags, - task.id.toString(), + task.uuid.toString(), task.project, task.start, task.entry, @@ -645,7 +645,7 @@ export const Tasks = ( props.UUID, task.description, task.tags, - task.id.toString(), + task.uuid.toString(), task.project, task.start, task.entry, @@ -669,7 +669,7 @@ export const Tasks = ( props.UUID, task.description, task.tags, - task.id.toString(), + task.uuid.toString(), task.project, task.start, task.entry, @@ -693,7 +693,7 @@ export const Tasks = ( props.UUID, task.description, task.tags, - task.id.toString(), + task.uuid.toString(), task.project, task.start, task.entry || '', @@ -727,7 +727,7 @@ export const Tasks = ( props.UUID, task.description, task.tags, - task.id.toString(), + task.uuid.toString(), task.project, task.start, task.entry || '', @@ -830,7 +830,7 @@ export const Tasks = ( props.UUID, task.description, finalTags, - task.id.toString(), + task.uuid.toString(), task.project, task.start, task.entry || '', @@ -851,7 +851,7 @@ export const Tasks = ( props.UUID, task.description, task.tags, - task.id.toString(), + task.uuid.toString(), task.project, task.start, task.entry || '', @@ -874,7 +874,7 @@ export const Tasks = ( email: props.email, encryptionSecret: props.encryptionSecret, UUID: props.UUID, - taskID: task.id.toString(), + taskUUID: task.uuid.toString(), description: task.description, project: task.project || '', priority: priorityValue, diff --git a/frontend/src/components/HomeComponents/Tasks/__tests__/hooks.test.ts b/frontend/src/components/HomeComponents/Tasks/__tests__/hooks.test.ts index 8185482d..cac1948e 100644 --- a/frontend/src/components/HomeComponents/Tasks/__tests__/hooks.test.ts +++ b/frontend/src/components/HomeComponents/Tasks/__tests__/hooks.test.ts @@ -113,7 +113,7 @@ describe('editTaskOnBackend', () => { email: 'test@example.com', encryptionSecret: 'mockEncryptionSecret', UUID: 'mockUUID', - taskID: '1', + taskUUID: 'taskUUID', description: 'Updated', tags: [], project: '', @@ -142,7 +142,7 @@ describe('editTaskOnBackend', () => { email: 'test@example.com', encryptionSecret: 'mockEncryptionSecret', UUID: 'mockUUID', - taskID: '1', + taskUUID: 'taskUUID', description: 'Updated', tags: [], project: '', @@ -168,7 +168,7 @@ describe('modifyTaskOnBackend', () => { email: 'test@example.com', encryptionSecret: 'mockEncryptionSecret', UUID: 'mockUUID', - taskID: '1', + taskUUID: 'taskUUID', description: 'Updated', tags: [], project: '', @@ -192,7 +192,7 @@ describe('modifyTaskOnBackend', () => { email: 'test@example.com', encryptionSecret: 'mockEncryptionSecret', UUID: 'mockUUID', - taskID: '1', + taskUUID: 'taskUUID', description: 'Updated', tags: [], project: '', diff --git a/frontend/src/components/HomeComponents/Tasks/hooks.ts b/frontend/src/components/HomeComponents/Tasks/hooks.ts index 1f4160d6..5baeff9b 100644 --- a/frontend/src/components/HomeComponents/Tasks/hooks.ts +++ b/frontend/src/components/HomeComponents/Tasks/hooks.ts @@ -132,7 +132,7 @@ export const editTaskOnBackend = async ({ UUID, description, tags, - taskID, + taskUUID, backendURL, project, start, @@ -149,7 +149,7 @@ export const editTaskOnBackend = async ({ UUID: string; description: string; tags: string[]; - taskID: string; + taskUUID: string; backendURL: string; project: string; start: string; @@ -167,7 +167,7 @@ export const editTaskOnBackend = async ({ email, encryptionSecret, UUID, - taskID, + taskUUID, description, tags, project, @@ -187,7 +187,7 @@ export const editTaskOnBackend = async ({ if (!response.ok) { const errorText = await response.text(); - throw new Error(errorText || 'Failed to edit task'); + throw new Error('321' + errorText || 'Failed to edit task'); } return response; @@ -197,7 +197,7 @@ export const modifyTaskOnBackend = async ({ email, encryptionSecret, UUID, - taskID, + taskUUID, description, project, priority, @@ -209,7 +209,7 @@ export const modifyTaskOnBackend = async ({ email: string; encryptionSecret: string; UUID: string; - taskID: string; + taskUUID: string; description: string; project: string; priority: string; @@ -224,7 +224,7 @@ export const modifyTaskOnBackend = async ({ email, encryptionSecret, UUID, - taskid: taskID, + taskuuid: taskUUID, description, project, priority,