Handle deleting single timesheet entries before submit. #35

badgateway · Oct 23, 2022 · 0e92e48 · 0e92e48
1 parent 5c7fd3c
commit 0e92e48
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 9 deletions.
diff --git a/src/entry/controller/item.ts b/src/entry/controller/item.ts
@@ -88,15 +88,14 @@ class Entry extends Controller {
       throw new BadRequest('The project link must be in the format /projects/123');
     }
 
-    const project = await projectService.findById(+projectId);
-
-    await entryService.deleteEntry(entry, project);
+    await entryService.deleteEntry(entry);
 
     ctx.response.status = 204;
-    // ctx.response.links.add({
-    //   rel: 'invalidates',
-    //   href: `/org/${org.id}/category`
-    // });
+    ctx.response.links.add({
+      rel: 'invalidates',
+      href: `/person/${entry.project.id}/entry`
+    });
+
 
   }
 

diff --git a/src/entry/service.ts b/src/entry/service.ts
@@ -161,9 +161,9 @@ export async function update(entry: Entry): Promise<void> {
 
 }
 
-export async function deleteEntry(entry: Entry, project: Project): Promise<void>{
+export async function deleteEntry(entry: Entry): Promise<void>{
   await knex('entries')
-    .where({project_id: project.id})
+    .where({project_id: entry.project.id})
     .where({id: entry.id})
     .del();
 }