Skip to content

Commit 6c2a106

Browse files
Neeraj-gagatNeeraj-gagat
authored
fix: unable to edit completed and deleted task (#343)
1 parent 96af3f0 commit 6c2a106

File tree

7 files changed

+41
-41
lines changed

7 files changed

+41
-41
lines changed

‎backend/controllers/controllers_test.go‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -255,7 +255,7 @@ func Test_EditTaskHandler_WithDependencies(t *testing.T) {
255255
"email": "test@example.com",
256256
"encryptionSecret": "secret",
257257
"UUID": "test-uuid",
258-
"taskID": "1",
258+
"taskUUID": "task-uuid",
259259
"description": "Edited task with dependencies",
260260
"project": "EditedProject",
261261
"depends": []string{"task-uuid-3"},

‎backend/controllers/edit_task.go‎

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -43,7 +43,7 @@ func EditTaskHandler(w http.ResponseWriter, r *http.Request) {
4343
email := requestBody.Email
4444
encryptionSecret := requestBody.EncryptionSecret
4545
uuid := requestBody.UUID
46-
taskID := requestBody.TaskID
46+
taskUUID := requestBody.TaskUUID
4747
description := requestBody.Description
4848
tags := requestBody.Tags
4949
project := requestBody.Project
@@ -56,7 +56,7 @@ func EditTaskHandler(w http.ResponseWriter, r *http.Request) {
5656
recur := requestBody.Recur
5757
annotations := requestBody.Annotations
5858

59-
if taskID == "" {
59+
if taskUUID == "" {
6060
http.Error(w, "taskID is required", http.StatusBadRequest)
6161
return
6262
}
@@ -71,13 +71,13 @@ func EditTaskHandler(w http.ResponseWriter, r *http.Request) {
7171
job := Job{
7272
Name: "Edit Task",
7373
Execute: func() error {
74-
logStore.AddLog("INFO", fmt.Sprintf("Editing task ID: %s", taskID), uuid, "Edit Task")
75-
err := tw.EditTaskInTaskwarrior(uuid, description, email, encryptionSecret, taskID, tags, project, start, entry, wait, end, depends, due, recur, annotations)
74+
logStore.AddLog("INFO", fmt.Sprintf("Editing task ID: %s", taskUUID), uuid, "Edit Task")
75+
err := tw.EditTaskInTaskwarrior(uuid, description, email, encryptionSecret, taskUUID, tags, project, start, entry, wait, end, depends, due, recur, annotations)
7676
if err != nil {
77-
logStore.AddLog("ERROR", fmt.Sprintf("Failed to edit task ID %s: %v", taskID, err), uuid, "Edit Task")
77+
logStore.AddLog("ERROR", fmt.Sprintf("Failed to edit task ID %s: %v", taskUUID, err), uuid, "Edit Task")
7878
return err
7979
}
80-
logStore.AddLog("INFO", fmt.Sprintf("Successfully edited task ID: %s", taskID), uuid, "Edit Task")
80+
logStore.AddLog("INFO", fmt.Sprintf("Successfully edited task ID: %s", taskUUID), uuid, "Edit Task")
8181
return nil
8282
},
8383
}

‎backend/controllers/modify_task.go‎

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -42,7 +42,7 @@ func ModifyTaskHandler(w http.ResponseWriter, r *http.Request) {
4242
email := requestBody.Email
4343
encryptionSecret := requestBody.EncryptionSecret
4444
uuid := requestBody.UUID
45-
taskID := requestBody.TaskID
45+
taskUUID := requestBody.TaskUUID
4646
description := requestBody.Description
4747
project := requestBody.Project
4848
priority := requestBody.Priority
@@ -55,8 +55,8 @@ func ModifyTaskHandler(w http.ResponseWriter, r *http.Request) {
5555
http.Error(w, "Description is required, and cannot be empty!", http.StatusBadRequest)
5656
return
5757
}
58-
if taskID == "" {
59-
http.Error(w, "taskID is required", http.StatusBadRequest)
58+
if taskUUID == "" {
59+
http.Error(w, "taskUUID is required", http.StatusBadRequest)
6060
return
6161
}
6262

@@ -75,13 +75,13 @@ func ModifyTaskHandler(w http.ResponseWriter, r *http.Request) {
7575
job := Job{
7676
Name: "Modify Task",
7777
Execute: func() error {
78-
logStore.AddLog("INFO", fmt.Sprintf("Modifying task ID: %s", taskID), uuid, "Modify Task")
79-
err := tw.ModifyTaskInTaskwarrior(uuid, description, project, priority, status, due, email, encryptionSecret, taskID, tags, depends)
78+
logStore.AddLog("INFO", fmt.Sprintf("Modifying task UUID: %s", taskUUID), uuid, "Modify Task")
79+
err := tw.ModifyTaskInTaskwarrior(uuid, description, project, priority, status, due, email, encryptionSecret, taskUUID, tags, depends)
8080
if err != nil {
81-
logStore.AddLog("ERROR", fmt.Sprintf("Failed to modify task ID %s: %v", taskID, err), uuid, "Modify Task")
81+
logStore.AddLog("ERROR", fmt.Sprintf("Failed to modify task UUID %s: %v", taskUUID, err), uuid, "Modify Task")
8282
return err
8383
}
84-
logStore.AddLog("INFO", fmt.Sprintf("Successfully modified task ID: %s", taskID), uuid, "Modify Task")
84+
logStore.AddLog("INFO", fmt.Sprintf("Successfully modified task UUID: %s", taskUUID), uuid, "Modify Task")
8585
return nil
8686
},
8787
}

‎backend/models/request_body.go‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,7 @@ type ModifyTaskRequestBody struct {
2222
Email string `json:"email"`
2323
EncryptionSecret string `json:"encryptionSecret"`
2424
UUID string `json:"UUID"`
25-
TaskID string `json:"taskid"`
25+
TaskUUID string `json:"taskuuid"`
2626
Description string `json:"description"`
2727
Project string `json:"project"`
2828
Priority string `json:"priority"`
@@ -35,7 +35,7 @@ type EditTaskRequestBody struct {
3535
Email string `json:"email"`
3636
EncryptionSecret string `json:"encryptionSecret"`
3737
UUID string `json:"UUID"`
38-
TaskID string `json:"taskid"`
38+
TaskUUID string `json:"taskuuid"`
3939
Description string `json:"description"`
4040
Tags []string `json:"tags"`
4141
Project string `json:"project"`

‎frontend/src/components/HomeComponents/Tasks/Tasks.tsx‎

Lines changed: 14 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -366,7 +366,7 @@ export const Tasks = (
366366
UUID: string,
367367
description: string,
368368
tags: string[],
369-
taskID: string,
369+
taskUUID: string,
370370
project: string,
371371
start: string,
372372
entry: string,
@@ -384,7 +384,7 @@ export const Tasks = (
384384
UUID,
385385
description,
386386
tags,
387-
taskID,
387+
taskUUID,
388388
backendURL: url.backendURL,
389389
project,
390390
start,
@@ -525,7 +525,7 @@ export const Tasks = (
525525
props.UUID,
526526
task.description,
527527
task.tags,
528-
task.id.toString(),
528+
task.uuid.toString(),
529529
task.project,
530530
task.start,
531531
task.entry || '',
@@ -549,7 +549,7 @@ export const Tasks = (
549549
props.UUID,
550550
task.description,
551551
task.tags,
552-
task.id.toString(),
552+
task.uuid.toString(),
553553
task.project,
554554
task.start,
555555
task.entry || '',
@@ -573,7 +573,7 @@ export const Tasks = (
573573
props.UUID,
574574
task.description,
575575
task.tags,
576-
task.id.toString(),
576+
task.uuid.toString(),
577577
task.project,
578578
task.start,
579579
task.entry || '',
@@ -597,7 +597,7 @@ export const Tasks = (
597597
props.UUID,
598598
task.description,
599599
task.tags,
600-
task.id.toString(),
600+
task.uuid.toString(),
601601
task.project,
602602
task.start,
603603
task.entry || '',
@@ -621,7 +621,7 @@ export const Tasks = (
621621
props.UUID,
622622
task.description,
623623
task.tags,
624-
task.id.toString(),
624+
task.uuid.toString(),
625625
task.project,
626626
task.start,
627627
task.entry,
@@ -645,7 +645,7 @@ export const Tasks = (
645645
props.UUID,
646646
task.description,
647647
task.tags,
648-
task.id.toString(),
648+
task.uuid.toString(),
649649
task.project,
650650
task.start,
651651
task.entry,
@@ -669,7 +669,7 @@ export const Tasks = (
669669
props.UUID,
670670
task.description,
671671
task.tags,
672-
task.id.toString(),
672+
task.uuid.toString(),
673673
task.project,
674674
task.start,
675675
task.entry,
@@ -693,7 +693,7 @@ export const Tasks = (
693693
props.UUID,
694694
task.description,
695695
task.tags,
696-
task.id.toString(),
696+
task.uuid.toString(),
697697
task.project,
698698
task.start,
699699
task.entry || '',
@@ -727,7 +727,7 @@ export const Tasks = (
727727
props.UUID,
728728
task.description,
729729
task.tags,
730-
task.id.toString(),
730+
task.uuid.toString(),
731731
task.project,
732732
task.start,
733733
task.entry || '',
@@ -830,7 +830,7 @@ export const Tasks = (
830830
props.UUID,
831831
task.description,
832832
finalTags,
833-
task.id.toString(),
833+
task.uuid.toString(),
834834
task.project,
835835
task.start,
836836
task.entry || '',
@@ -851,7 +851,7 @@ export const Tasks = (
851851
props.UUID,
852852
task.description,
853853
task.tags,
854-
task.id.toString(),
854+
task.uuid.toString(),
855855
task.project,
856856
task.start,
857857
task.entry || '',
@@ -874,7 +874,7 @@ export const Tasks = (
874874
email: props.email,
875875
encryptionSecret: props.encryptionSecret,
876876
UUID: props.UUID,
877-
taskID: task.id.toString(),
877+
taskUUID: task.uuid.toString(),
878878
description: task.description,
879879
project: task.project || '',
880880
priority: priorityValue,

‎frontend/src/components/HomeComponents/Tasks/__tests__/hooks.test.ts‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -113,7 +113,7 @@ describe('editTaskOnBackend', () => {
113113
email: 'test@example.com',
114114
encryptionSecret: 'mockEncryptionSecret',
115115
UUID: 'mockUUID',
116-
taskID: '1',
116+
taskUUID: 'taskUUID',
117117
description: 'Updated',
118118
tags: [],
119119
project: '',
@@ -142,7 +142,7 @@ describe('editTaskOnBackend', () => {
142142
email: 'test@example.com',
143143
encryptionSecret: 'mockEncryptionSecret',
144144
UUID: 'mockUUID',
145-
taskID: '1',
145+
taskUUID: 'taskUUID',
146146
description: 'Updated',
147147
tags: [],
148148
project: '',
@@ -168,7 +168,7 @@ describe('modifyTaskOnBackend', () => {
168168
email: 'test@example.com',
169169
encryptionSecret: 'mockEncryptionSecret',
170170
UUID: 'mockUUID',
171-
taskID: '1',
171+
taskUUID: 'taskUUID',
172172
description: 'Updated',
173173
tags: [],
174174
project: '',
@@ -192,7 +192,7 @@ describe('modifyTaskOnBackend', () => {
192192
email: 'test@example.com',
193193
encryptionSecret: 'mockEncryptionSecret',
194194
UUID: 'mockUUID',
195-
taskID: '1',
195+
taskUUID: 'taskUUID',
196196
description: 'Updated',
197197
tags: [],
198198
project: '',

‎frontend/src/components/HomeComponents/Tasks/hooks.ts‎

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -132,7 +132,7 @@ export const editTaskOnBackend = async ({
132132
UUID,
133133
description,
134134
tags,
135-
taskID,
135+
taskUUID,
136136
backendURL,
137137
project,
138138
start,
@@ -149,7 +149,7 @@ export const editTaskOnBackend = async ({
149149
UUID: string;
150150
description: string;
151151
tags: string[];
152-
taskID: string;
152+
taskUUID: string;
153153
backendURL: string;
154154
project: string;
155155
start: string;
@@ -167,7 +167,7 @@ export const editTaskOnBackend = async ({
167167
email,
168168
encryptionSecret,
169169
UUID,
170-
taskID,
170+
taskUUID,
171171
description,
172172
tags,
173173
project,
@@ -187,7 +187,7 @@ export const editTaskOnBackend = async ({
187187

188188
if (!response.ok) {
189189
const errorText = await response.text();
190-
throw new Error(errorText || 'Failed to edit task');
190+
throw new Error('321' + errorText || 'Failed to edit task');
191191
}
192192

193193
return response;
@@ -197,7 +197,7 @@ export const modifyTaskOnBackend = async ({
197197
email,
198198
encryptionSecret,
199199
UUID,
200-
taskID,
200+
taskUUID,
201201
description,
202202
project,
203203
priority,
@@ -209,7 +209,7 @@ export const modifyTaskOnBackend = async ({
209209
email: string;
210210
encryptionSecret: string;
211211
UUID: string;
212-
taskID: string;
212+
taskUUID: string;
213213
description: string;
214214
project: string;
215215
priority: string;
@@ -224,7 +224,7 @@ export const modifyTaskOnBackend = async ({
224224
email,
225225
encryptionSecret,
226226
UUID,
227-
taskid: taskID,
227+
taskuuid: taskUUID,
228228
description,
229229
project,
230230
priority,

0 commit comments

Comments
 (0)