Bugfix: Events marked as "removed" And deleteDate is set so the Notification does not get sent
This commit is contained in:
12
src/app.ts
12
src/app.ts
@@ -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 );
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user