chiko/77th_eventcalenderntfy
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Bugfix: Events marked as "removed" And deleteDate is set so the Notification does not get sent

Browse Source
This commit is contained in:
chiko
2025-11-06 17:36:54 +00:00
parent 5cdfd0f2e3
commit c703911f85
6 changed files with 23 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
src/app.ts
View File

@@ -19,10 +19,12 @@ async function events_update_db() {
console.log("events_fetched.length: " + events_fetched.length );
const events_fetched_list_of_uids = events_fetched.map( event => { return event.uid; });
console.dir({events_fetched_list_of_uids} );
console.dir( {events_fetched_list_of_uids} );
const events_db_currentMonth = Event.get_events({month: {year: TODAY.year, month: TODAY.month}}, db);
const events_removed: Event[] = events_db_currentMonth.filter( (ev) => {
const events_db_nextMonth = Event.get_events({month: {year: TODAY.year, month: (TODAY.month + 1)}}, db);
const events_db = [... events_db_currentMonth, ... events_db_nextMonth];
const events_removed: Event[] = events_db.filter( (ev) => {
return ! events_fetched_list_of_uids.includes(ev.uid);
});
@@ -43,7 +45,7 @@ async function events_update_db() {
console.log("loop ev " + ev.uid + " : " + [ ev.title, ev.date_at ].join( ", " ) );
const found = AllRelevantEvents.find(event => event.uid === ev.uid);
if ( found ) {
console.log("loop ev " + ev.uid + " found: " + [ found.title, found.date_at ].join( ", " ) );
console.log("loop ev " + ev.uid + " f: " + [ found.title, found.date_at ].join( ", " ) );
if (
found.title != ev.title ||
found.description != ev.description ||
@@ -56,12 +58,12 @@ async function events_update_db() {
found.timezone != ev.timezone ||
found.link != ev.link
) {
console.log("loop ev " + ev.uid + " different (changed): " + [ ev.title, ev.date_at ].join( ", " ) );
console.log("loop ev " + ev.uid + " c: " + [ ev.title, ev.date_at ].join( ", " ) );
const newEventToInsert: TEventEntityNew = {... ev, notification: "changed"};
eventsToInsert.push( newEventToInsert );
}
} else {
console.log("loop ev " + ev.uid + " added (new): " + [ ev.title, ev.date_at ].join( ", " ) );
console.log("loop ev " + ev.uid + " n: " + [ ev.title, ev.date_at ].join( ", " ) );
const newEventToInsert: TEventEntityNew = {... ev, notification: "new"};
eventsToInsert.push( newEventToInsert );
}

8
src/component/event/events.ts
View File

@@ -89,12 +89,12 @@ export class Event implements TEventEntity {
return events;
}
static get_events (options: TGetEventsOptions, db: Database ) {
static get_events ( options: TGetEventsOptions, db: Database ) {
const whereConditions: string[] = [];
if ( options.notification ) {
whereConditions.push( `notification IN ('${ options.notification.join("', '") }')` )
}
if (options.date) {
if ( options.date ) {
whereConditions.push(`date_at = "${options.date.year}-${options.date.month}-${options.date.day}"`);
}
if ( options.month ) {
@@ -114,6 +114,7 @@ export class Event implements TEventEntity {
return null;
})()
const query = db.query(`SELECT * FROM events${ where ? ( " " + where ) : ""};`).as(Event);
console.dir({ db: { action: {get_events: query} } })
return query.all();
}
@@ -175,7 +176,8 @@ export class Event implements TEventEntity {
set_notification ( newValue: TEventEntity["notification"], db: Database ) {
const query = db.prepare(
`UPDATE events
SET notification = $notification
SET notification = $notification,
deleteDate = NULL
WHERE event_uid = $event_uid;`
);
query.get({$notification: newValue, $event_uid: this.event_uid });