Merge pull request 'Bugfix in sendNotification()' (#6) from version/0.1.3 into main

Reviewed-on: #6

.dockerignore

@@ -9,7 +9,7 @@ LICENSE
 .vscode
 Makefile
 helm-charts
-.env*
+.env
 .editorconfig
 .idea
 coverage*

.gitignore

@@ -23,7 +23,6 @@ report.[0-9]_.[0-9]_.[0-9]_.[0-9]_.json
 .env.test.local
 .env.production.local
 .env.local
-.env.*
 
 # caches
 .eslintcache

README.md

@@ -1,27 +1,15 @@
-# 77th Event Calendar Notifcations
+# 77th Event Calender Notifcations
 
 To install dependencies:
 
-```bash
+```bashe
 bun install
 ```
 
 To run:
 
 ```bash
-bun run ./src/app.ts
-bun run start
-bun run dev
+bun run index.ts
 ```
 
-## Docker
-
-```bash
-docker compose build
-docker compose up -d
-```
-
-## Parameter
-
-### --today
-fetch all Events, track all Changes (new, changed and deleted Events) and additionally Send a Notification for todays mission
+This project was created using `bun init` in bun v1.3.0. [Bun](https://bun.com) is a fast all-in-one JavaScript runtime.

docker-compose.yml

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

docker/Crontab

@@ -2,3 +2,4 @@ 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,7 +7,6 @@ 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,6 +1,6 @@
 {
-  "version": "0.1.5",
-  "name": "77th_eventcalendarnotification",
+  "version": "0.1.3",
+  "name": "77th_eventcalendernotification",
   "module": "./src/app.ts",
   "type": "module",
   "private": true,
@@ -16,13 +16,12 @@
     "typescript-eslint": "^8.46.2"
   },
   "scripts": {
-    "start": "bun run ./src/app.ts",
-    "dev": "NODE_ENV=development bun ./src/app.ts",
+    "dev": "bun run ./src/app.ts",
+    "dev:init": "bun run ./src/app.ts --init",
     "db:init": "bun run ./run/db_init.ts",
-    "db:deleteall": "bun run ./run/db_event_deleteall.ts",
-    "db:event:dedup": "bun run ./run/db_event_delete_duplicates.ts",
-    "build": "bun build --compile --minify --sourcemap ./src/app.ts --outfile ./build/77th_eventcalendarnotification",
-    "build:linux": "bun build --compile --minify --sourcemap --target=bun-linux-arm64 ./src/app.ts --outfile ./build/77th_eventcalendarnotification",
+    "db:deleteall": "bun run ./run/db_deleteall.ts",
+    "build": "bun build --compile --minify --sourcemap ./src/app.ts --outfile ./build/77th_eventcalendernotification",
+    "build:linux": "bun build --compile --minify --sourcemap --target=bun-linux-arm64 ./src/app.ts --outfile ./build/77th_eventcalendernotification",
     "docker:build": "docker build -t chiko/77th_eventcalendarntfy:0.1.0 ."
   },
   "peerDependencies": {

run-task.sh

@@ -18,7 +18,7 @@ log_info "Starting task with args: $*"
 
 cd /opt/app
 
-if bun run start "$@" >> /proc/1/fd/1 2>> /proc/1/fd/2; then
+if bun run ./src/app.ts "$@" >> /proc/1/fd/1 2>> /proc/1/fd/2; then
     log_info "Task completed successfully."
 else
     log_error "Task failed!"

run/db_event_delete_duplicates.ts

@@ -1,10 +0,0 @@
-import * as db from "../src/sql";
-
-const query = db.db.query(`DELETE FROM events
-WHERE rowid NOT IN (
-  SELECT MIN(rowid)
-  FROM events
-  GROUP BY uid
-);`);
-
-query.run();

run/db_fix_events_deleted_set_done.ts

@@ -1,7 +0,0 @@
-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,39 +0,0 @@
-import db from "../src/sql";
-
-const run_migration = db.transaction(() => {
-  // SQL 1: remove duplicates by uid
-  db.run(`DELETE FROM events
-    WHERE rowid NOT IN (
-      SELECT MIN(rowid)
-      FROM events
-      GROUP BY uid
-    );`);
-
-  // SQL 2: create new table with unique key
-  db.run(`CREATE TABLE events_new (
-    "event_uid" INTEGER PRIMARY KEY,
-    "uid" TEXT NOT NULL UNIQUE,
-    "title" TEXT NOT NULL,
-    "date_at" DATETIME NOT NULL,
-    "time_start" TEXT NOT NULL,
-    "time_end" TEXT NOT NULL,
-    "posted_by" TEXT NOT NULL,
-    "location" TEXT NOT NULL,
-    "event_type" TEXT NOT NULL,
-    "link" TEXT NOT NULL,
-    "description" TEXT NOT NULL,
-    "timezone" TEXT NOT NULL,
-    "notification" TEXT NOT NULL,
-    "deleteDate" INTEGER NULL
-  );`);
-
-  // SQL 3: Log the transaction
-  db.run(`INSERT INTO events_new (event_uid, uid, title, date_at, time_start, time_end, posted_by, location, event_type, link, description, timezone, notification, deleteDate)
-    SELECT event_uid, uid, title, date_at, time_start, time_end, posted_by, location, event_type, link, description, timezone, notification, deleteDate FROM events;
-  `);
-  db.run(`DROP TABLE events;
-    ALTER TABLE events_new RENAME TO events;`);
-});
-
-// Run the transaction
-run_migration();

sql/events/events_create_unique_index_uid.sql

@@ -1 +0,0 @@
-CREATE UNIQUE INDEX idx_events_uid ON events(uid);

sql/events/events_delete_duplicate_rows.sql

@@ -1,6 +0,0 @@
-DELETE FROM events
-WHERE rowid NOT IN (
-  SELECT MIN(rowid)
-  FROM events
-  GROUP BY uid
-);

sql/events/events_find_duplicate_uid.sql

@@ -1,4 +0,0 @@
-SELECT uid, COUNT(*) AS count
-FROM events
-GROUP BY uid
-HAVING COUNT(*) > 1;

sql/sql_migration_v0.1.3.sql

@@ -1,29 +0,0 @@
-DELETE FROM events
-WHERE rowid NOT IN (
-  SELECT MIN(rowid)
-  FROM events
-  GROUP BY uid
-);
-
-CREATE TABLE events_new (
-  "event_uid" INTEGER PRIMARY KEY,
-  "uid" TEXT NOT NULL UNIQUE,
-  "title" TEXT NOT NULL,
-  "date_at" DATETIME NOT NULL,
-  "time_start" TEXT NOT NULL,
-  "time_end" TEXT NOT NULL,
-  "posted_by" TEXT NOT NULL,
-  "location" TEXT NOT NULL,
-  "event_type" TEXT NOT NULL,
-  "link" TEXT NOT NULL,
-  "description" TEXT NOT NULL,
-  "timezone" TEXT NOT NULL,
-  "notification" TEXT NOT NULL,
-  "deleteDate" INTEGER NULL
-);
-
-INSERT INTO events_new (event_uid, uid, title, date_at, time_start, time_end, posted_by, location, event_type, link, description, timezone, notification, deleteDate)
-SELECT event_uid, uid, title, date_at, time_start, time_end, posted_by, location, event_type, link, description, timezone, notification, deleteDate FROM events;
-
-DROP TABLE events;
-ALTER TABLE events_new RENAME TO events;

src/app.ts

@@ -19,12 +19,10 @@ 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_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) => {
+  const events_removed: Event[] = events_db_currentMonth.filter( (ev) => {
     return ! events_fetched_list_of_uids.includes(ev.uid);
   });
 
@@ -42,10 +40,10 @@ async function events_update_db() {
   console.log("AllRelevantEvents.length: " + AllRelevantEvents.length );
   const eventsToInsert: TEventEntityNew[] = [];
   for ( const ev of events_fetched ) {
-    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);
     if ( found ) {
-      console.log("loop ev  " + ev.uid + " f: " + [ found.title, found.date_at ].join( ", " ) );
+      console.log("loop ev found: " + [ found.uid, found.title, found.date_at ].join( ", " ) );
       if (
         found.title != ev.title ||
         found.description != ev.description ||
@@ -58,12 +56,12 @@ async function events_update_db() {
         found.timezone != ev.timezone ||
         found.link != ev.link
       ) {
-        console.log("loop ev " + ev.uid + " c: " + [ ev.title, ev.date_at ].join( ", " ) );
+        console.log("loop ev different (changed): " + [ ev.uid, ev.title, ev.date_at ].join( ", " ) );
         const newEventToInsert: TEventEntityNew = {... ev, notification: "changed"};
         eventsToInsert.push( newEventToInsert );
       }
     } else {
-      console.log("loop ev  " + ev.uid + " n: " + [ ev.title, ev.date_at ].join( ", " ) );
+      console.log("loop ev added (new): " + [ ev.uid, ev.title, ev.date_at ].join( ", " ) );
       const newEventToInsert: TEventEntityNew = {... ev, notification: "new"};
       eventsToInsert.push( newEventToInsert );
     }
@@ -92,14 +90,7 @@ async function events_check_for_notification() {
   for ( const ev of list_of_events ) {
     console.log("loop list_of_events - ev: " + [ ev.uid, ev.title, ev.date_at, "notification: " + ev.notification ].join( ", " ) );
     console.log("loop list_of_events - ev 'title': " + ev.get_title() );
-    const notificationOptions = {
-      ntfy: null,
-      discord: {
-        avatar_url: ( process.env.dc_avatar_url as string),
-        botname: ( process.env.dc_botname as string)
-      }
-    };
-    await sendNotification( ev.get_title(), ev.get_body(), notificationOptions );
+    await sendNotification( ev.get_title(), ev.get_body() );
     if ( ev.notification == "removed" ) {
       ev.set_deleted( db );
     }

src/component/event/events.ts

@@ -43,8 +43,8 @@ export class Event implements TEventEntity {
 
   static createTable (db: Database): void {
     const query = db.query(`CREATE TABLE IF NOT EXISTS "events" (
-	    "event_uid" INTEGER PRIMARY KEY,
-      "uid" TEXT NOT NULL UNIQUE,
+      "event_uid" INTEGER NOT NULL,
+      "uid" TEXT NOT NULL,
       "title" TEXT NOT NULL,
       "date_at" DATETIME NOT NULL,
       "time_start" TEXT NOT NULL,
@@ -56,8 +56,10 @@ export class Event implements TEventEntity {
       "description" TEXT NOT NULL,
       "timezone" TEXT NOT NULL,
       "notification" TEXT NOT NULL,
-      "deleteDate" INTEGER NULL
-    );`);
+      "deleteDate" INTEGER NULL,
+      PRIMARY KEY ("event_uid")
+    );
+    CREATE UNIQUE INDEX "sqlite_autoindex_events_1" ON "events" ("uid");`);
     query.run(); 
   }
 
@@ -89,12 +91,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,7 +116,6 @@ 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(); 
   }
 
@@ -134,25 +135,6 @@ export class Event implements TEventEntity {
     this.notification = notification;
     this.deleteDate = deleteDate;
   }
-  toString() {
-    return {
-      event_uid: this.event_uid,
-      uid: this.uid,
-      title: this.title,
-      description: this.description,
-      date_at: this.date_at,
-      time_start: this.time_start,
-      time_end: this.time_end,
-      posted_by: this.posted_by,
-      location: this.location,
-      event_type: this.event_type,
-      timezone: this.timezone,
-      link: this.link,
-      notification: this.notification,
-      deleteDate: this.deleteDate
-    }
-  }
-
   syncWithDb ( db: Database ) {
     const query = db.prepare( `SELECT * FROM events WHERE event_uid = $event_uid;`).as(Event);
     const entity = query.get({$event_uid: this.event_uid });
@@ -176,8 +158,7 @@ export class Event implements TEventEntity {
   set_notification ( newValue: TEventEntity["notification"], db: Database ) {
     const query = db.prepare(
         `UPDATE events
-        SET notification = $notification,
-          deleteDate = NULL
+        SET notification = $notification
         WHERE event_uid = $event_uid;`
     );
     query.get({$notification: newValue, $event_uid: this.event_uid });
@@ -220,7 +201,7 @@ export class Event implements TEventEntity {
     const body = [
       `Title: ${this.title}`,
       `Date: ${this.date_at}`,
-      `Time: ${this.get_time_start()} (OP Time${ TimeDiff != "00:00" ? ` ${TimeDiff}` : "" })`,
+      `Time: ${this.get_time_start()}${ TimeDiff ? ` (Optime ${TimeDiff})` : "" }`,
       `Type: ${ TEventType[ this.event_type ] }`,
       `Location: ${this.location}`,
       `By: ${this.posted_by}`,

src/config.ts

@@ -1,16 +0,0 @@
-export const config = {
-    apprise: {
-        services: {
-            ntfy: {
-                url: `ntfys://${process.env.ntfy_username}:${process.env.ntfy_password}@${process.env.ntfy_host}/${process.env.ntfy_topic}`,
-                defaults: {
-                    
-                }
-            }
-        },
-        urls: [
-            `ntfys://${process.env.ntfy_username}:${process.env.ntfy_password}@${process.env.ntfy_host}/${process.env.ntfy_topic}`,
-            `discord://${process.env.dc_webhook}?avatar_url=${process.env.dc_avatar_url}&botname=${process.env.dc_botname}`
-        ]
-    }
-} as const

src/sendNotification.ts

@@ -1,27 +1,11 @@
-import { createQS } from "./util";
-
-type TSendNotificationOptions = {
-  ntfy: {
-    link?: string;
-  } | null,
-  discord: {
-    href?: string
-    avatar_url: string,
-    botname: string
-  }
-}
-
-export async function sendNotification( title: string, body: string, options: TSendNotificationOptions ) {
+export async function sendNotification(title: string, body: string, link?: string | null) {
   console.dir({
     sendNotification: {
       title,
-      body
+      body,
+      link
     }
   });
-  const QS = {
-    ntfy: options.ntfy ? createQS(options.ntfy) : null,
-    discord: createQS(options.discord)
-  }
   if ( ! ( process.env.notification_mock == "true" ) ) {
     const response = await fetch(`${ process.env.apprise_https == "true" ? "https" : "http"}://${process.env.apprise_host ? process.env.apprise_host : "apprise"}:${process.env.apprise_port ? String(process.env.apprise_port) : "80" }/notify`, {
         method: "POST",
@@ -30,8 +14,8 @@ export async function sendNotification( title: string, body: string, options: TS
         },
         body: JSON.stringify({
         urls: [
-            `ntfys://${process.env.ntfy_username}:${process.env.ntfy_password}@${process.env.ntfy_host}/${process.env.ntfy_topic}${ QS.ntfy ? "?" + QS.ntfy : ""}`,
-            `discord://${process.env.dc_webhook}?${QS.discord}`
+            `ntfys://${process.env.ntfy_username}:${process.env.ntfy_password}@${process.env.ntfy_host}/${process.env.ntfy_topic}${ link ? `?click=${link}`: "?click=https://77th-jsoc.com/#/events" }`,
+            `discord://${process.env.dc_webhook}?avatar_url=${process.env.dc_avatar_url}&botname=${process.env.dc_botname}`
         ].join(","),
         title: title,
         body: body,

src/sql.ts

@@ -8,8 +8,6 @@ console.log(db_filepath);
 
 export const db = new Database(db_filepath);
 
-export default db;
-
 export function init () {
   Event.createTable(db);
 }

src/util.ts

@@ -89,10 +89,3 @@ export function isEuropeanDST( date: Date ) {
   // Return true if within DST period
   return date >= start && date < end;
 }
-
-export function createQS (params: Record<string, string | number | boolean>): string {
-  const queryString = Object.entries(params)
-  .map(([key, value]) => `${encodeURIComponent(key)}=${encodeURIComponent(value)}`)
-  .join("&");
-  return queryString;
-}