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