1 Commits

4 changed files with 8 additions and 7 deletions

View File

@@ -1,6 +1,6 @@
services: services:
app: app:
image: chiko/77th_eventcalendarntfy:v0.1.5 image: chiko/77th_eventcalendarntfy:v0.1.4
build: . build: .
volumes: volumes:
- ./data/db:/opt/app/data/db - ./data/db:/opt/app/data/db

View File

@@ -1,5 +1,5 @@
{ {
"version": "0.1.5", "version": "0.1.4",
"name": "77th_eventcalendarnotification", "name": "77th_eventcalendarnotification",
"module": "./src/app.ts", "module": "./src/app.ts",
"type": "module", "type": "module",

View File

@@ -102,9 +102,10 @@ async function events_check_for_notification() {
await sendNotification( ev.get_title(), ev.get_body(), notificationOptions ); await sendNotification( ev.get_title(), ev.get_body(), notificationOptions );
if ( ev.notification == "removed" ) { if ( ev.notification == "removed" ) {
ev.set_deleted( db ); ev.set_deleted( db );
} } else {
ev.set_notification("done", db); ev.set_notification("done", db);
} }
}
} }
async function main ( ) { async function main ( ) {

View File

@@ -19,7 +19,7 @@ export type TGetEventsOptions = {
} }
export type TEventEntity = TEvent & { export type TEventEntity = TEvent & {
event_uid: number event_uid: number
notification: "new" | "changed" | "removed" | "done" notification: "new" | "changed" | "removed" | "done" | "deleted"
} }
export type TEventEntityNew = Omit<TEventEntity, "event_uid"> export type TEventEntityNew = Omit<TEventEntity, "event_uid">
@@ -176,8 +176,7 @@ export class Event implements TEventEntity {
set_notification ( newValue: TEventEntity["notification"], db: Database ) { set_notification ( newValue: TEventEntity["notification"], db: Database ) {
const query = db.prepare( const query = db.prepare(
`UPDATE events `UPDATE events
SET notification = $notification, SET notification = $notification
deleteDate = NULL
WHERE event_uid = $event_uid;` WHERE event_uid = $event_uid;`
); );
query.get({$notification: newValue, $event_uid: this.event_uid }); query.get({$notification: newValue, $event_uid: this.event_uid });
@@ -186,7 +185,8 @@ export class Event implements TEventEntity {
set_deleted ( db: Database ) { set_deleted ( db: Database ) {
const query = db.prepare( const query = db.prepare(
`UPDATE events `UPDATE events
SET deleteDate = $deleteDate SET notification = 'deleted',
deleteDate = $deleteDate
WHERE event_uid = $event_uid;` WHERE event_uid = $event_uid;`
); );
query.get({ query.get({