1 Commits

Author SHA1 Message Date
152c1bcba0 Version Bump 0.1.4 2025-11-03 00:35:40 +00:00
6 changed files with 12 additions and 23 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

@@ -1,7 +0,0 @@
import db from "../src/sql";
db.run(
`UPDATE events
SET notification = 'done'
WHERE deleteDate IS NOT NULL;`
);

View File

@@ -1,7 +1,7 @@
import db from "../src/sql"; import db from "../src/sql";
const run_migration = db.transaction(() => { const run_migration = db.transaction(() => {
// SQL 1: remove duplicates by uid // SQL 1: Insert a new user
db.run(`DELETE FROM events db.run(`DELETE FROM events
WHERE rowid NOT IN ( WHERE rowid NOT IN (
SELECT MIN(rowid) SELECT MIN(rowid)
@@ -9,7 +9,7 @@ const run_migration = db.transaction(() => {
GROUP BY uid GROUP BY uid
);`); );`);
// SQL 2: create new table with unique key // SQL 2: Update product stock
db.run(`CREATE TABLE events_new ( db.run(`CREATE TABLE events_new (
"event_uid" INTEGER PRIMARY KEY, "event_uid" INTEGER PRIMARY KEY,
"uid" TEXT NOT NULL UNIQUE, "uid" TEXT NOT NULL UNIQUE,

View File

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

View File

@@ -114,7 +114,6 @@ export class Event implements TEventEntity {
return null; return null;
})() })()
const query = db.query(`SELECT * FROM events${ where ? ( " " + where ) : ""};`).as(Event); const query = db.query(`SELECT * FROM events${ where ? ( " " + where ) : ""};`).as(Event);
console.dir({ db: { action: {get_events: query} } })
return query.all(); return query.all();
} }
@@ -176,8 +175,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 });