diff --git a/src/app.ts b/src/app.ts index cf1af7c..ae784dd 100644 --- a/src/app.ts +++ b/src/app.ts @@ -102,8 +102,9 @@ async function events_check_for_notification() { await sendNotification( ev.get_title(), ev.get_body(), notificationOptions ); if ( ev.notification == "removed" ) { ev.set_deleted( db ); + } else { + ev.set_notification("done", db); } - ev.set_notification("done", db); } } diff --git a/src/component/event/events.ts b/src/component/event/events.ts index 8d5d65a..5641d99 100644 --- a/src/component/event/events.ts +++ b/src/component/event/events.ts @@ -19,7 +19,7 @@ export type TGetEventsOptions = { } export type TEventEntity = TEvent & { event_uid: number - notification: "new" | "changed" | "removed" | "done" + notification: "new" | "changed" | "removed" | "done" | "deleted" } export type TEventEntityNew = Omit @@ -176,8 +176,7 @@ export class Event implements TEventEntity { set_notification ( newValue: TEventEntity["notification"], db: Database ) { const query = db.prepare( `UPDATE events - SET notification = $notification, - deleteDate = NULL + SET notification = $notification WHERE event_uid = $event_uid;` ); query.get({$notification: newValue, $event_uid: this.event_uid }); @@ -186,7 +185,8 @@ export class Event implements TEventEntity { set_deleted ( db: Database ) { const query = db.prepare( `UPDATE events - SET deleteDate = $deleteDate + SET notification = 'deleted', + deleteDate = $deleteDate WHERE event_uid = $event_uid;` ); query.get({