Merge branch 'main' into dev

Reviewed-on: #9

docker-compose.yml

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

docker/Crontab

@@ -2,4 +2,3 @@ SHELL=/bin/bash
 MAILTO=""
 0 8 * * * root . /etc/cron-env.sh && /opt/app/run-task.sh --today >> /proc/1/fd/1 2>&1
 */15 * * * * root . /etc/cron-env.sh && /opt/app/run-task.sh >> /proc/1/fd/1 2>&1
-* * * * * root echo "cron test ran at $(date)" >> /proc/1/fd/1 2>&1

docker/docker-entrypoint.sh

@@ -7,6 +7,7 @@ chmod +x /etc/cron-env.sh
 # Write the Env Vars into a file for cron. happens during runtime of the container and not build.
 # List your environment variables here
 env_vars=(
+  NODE_ENV
   TZ
   DB_FILEPATH
   DB_FILENAME

package.json

@@ -1,5 +1,5 @@
 {
-  "version": "0.1.3",
+  "version": "0.1.5",
   "name": "77th_eventcalendarnotification",
   "module": "./src/app.ts",
   "type": "module",
@@ -16,7 +16,7 @@
     "typescript-eslint": "^8.46.2"
   },
   "scripts": {
-    "prod": "NODE_ENV=production bun run ./src/app.ts",
+    "start": "bun run ./src/app.ts",
     "dev": "NODE_ENV=development bun ./src/app.ts",
     "db:init": "bun run ./run/db_init.ts",
     "db:deleteall": "bun run ./run/db_event_deleteall.ts",

run/db_fix_events_deleted_set_done.ts

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

run/db_migration_v0.1.3.ts

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

src/app.ts

@@ -22,7 +22,9 @@ async function events_update_db() {
   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 );
     }
@@ -100,10 +102,11 @@ async function events_check_for_notification() {
     await sendNotification( ev.get_title(), ev.get_body(), notificationOptions );
     if ( ev.notification == "removed" ) {
       ev.set_deleted( db );
-    }
+    } else {
       ev.set_notification("done", db);
     }
   }
+}
 
 async function main ( ) {
   console.log("Excecuting main()");

src/component/event/events.ts

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