Merge pull request 'version/0.1.4' (#9) from version/0.1.4 into main

Reviewed-on: #9

.dockerignore

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

.gitignore

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

README.md

@@ -1,15 +1,27 @@
-# 77th Event Calender Notifcations
+# 77th Event Calendar Notifcations
 
 To install dependencies:
 
-```bashe
+```bash
 bun install
 ```
 
 To run:
 
 ```bash
-bun run index.ts
+bun run ./src/app.ts
+bun run start
+bun run dev
 ```
 
-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
+
+```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

docker-compose.yml

@@ -1,6 +1,6 @@
 services:
   app:
-    image: chiko/77th_eventcalendarntfy:v0.1.3
+    image: chiko/77th_eventcalendarntfy:v0.1.4
     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,6 +1,6 @@
 {
-  "version": "0.1.3",
+  "version": "0.1.4",
-  "name": "77th_eventcalendernotification",
+  "name": "77th_eventcalendarnotification",
   "module": "./src/app.ts",
   "type": "module",
   "private": true,
@@ -16,12 +16,13 @@
     "typescript-eslint": "^8.46.2"
   },
   "scripts": {
-    "dev": "bun run ./src/app.ts",
+    "start": "bun run ./src/app.ts",
-    "dev:init": "bun run ./src/app.ts --init",
+    "dev": "NODE_ENV=development bun ./src/app.ts",
     "db:init": "bun run ./run/db_init.ts",
-    "db:deleteall": "bun run ./run/db_deleteall.ts",
+    "db:deleteall": "bun run ./run/db_event_deleteall.ts",
-    "build": "bun build --compile --minify --sourcemap ./src/app.ts --outfile ./build/77th_eventcalendernotification",
+    "db:event:dedup": "bun run ./run/db_event_delete_duplicates.ts",
-    "build:linux": "bun build --compile --minify --sourcemap --target=bun-linux-arm64 ./src/app.ts --outfile ./build/77th_eventcalendernotification",
+    "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",
     "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 ./src/app.ts "$@" >> /proc/1/fd/1 2>> /proc/1/fd/2; then
+if bun run start "$@" >> /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

@@ -0,0 +1,10 @@
+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_migration_v0.1.3.ts

@@ -0,0 +1,39 @@
+import db from "../src/sql";
+
+const run_migration = db.transaction(() => {
+  // SQL 1: Insert a new user
+  db.run(`DELETE FROM events
+    WHERE rowid NOT IN (
+      SELECT MIN(rowid)
+      FROM events
+      GROUP BY uid
+    );`);
+
+  // SQL 2: Update product stock
+  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

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

sql/events/events_delete_duplicate_rows.sql

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

sql/events/events_find_duplicate_uid.sql

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

sql/sql_migration_v0.1.3.sql

@@ -0,0 +1,29 @@
+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

@@ -40,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 found: " + [ found.uid, found.title, found.date_at ].join( ", " ) );
+      console.log("loop ev  " + ev.uid + " found: " + [ found.title, found.date_at ].join( ", " ) );
       if (
         found.title != ev.title ||
         found.description != ev.description ||
@@ -56,12 +56,12 @@ async function events_update_db() {
         found.timezone != ev.timezone ||
         found.link != ev.link
       ) {
-        console.log("loop ev different (changed): " + [ ev.uid, 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"};
         eventsToInsert.push( newEventToInsert );
       }
     } else {
-      console.log("loop ev added (new): " + [ ev.uid, 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"};
       eventsToInsert.push( newEventToInsert );
     }
@@ -90,7 +90,14 @@ 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() );
-    await sendNotification( ev.get_title(), ev.get_body() );
+    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 );
     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 NOT NULL,
+	    "event_uid" INTEGER PRIMARY KEY,
-      "uid" TEXT NOT NULL,
+      "uid" TEXT NOT NULL UNIQUE,
       "title" TEXT NOT NULL,
       "date_at" DATETIME NOT NULL,
       "time_start" TEXT NOT NULL,
@@ -56,10 +56,8 @@ 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(); 
   }
 
@@ -135,6 +133,25 @@ 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 });
@@ -201,7 +218,7 @@ export class Event implements TEventEntity {
     const body = [
       `Title: ${this.title}`,
       `Date: ${this.date_at}`,
-      `Time: ${this.get_time_start()}${ TimeDiff ? ` (Optime ${TimeDiff})` : "" }`,
+      `Time: ${this.get_time_start()} (OP Time${ TimeDiff != "00:00" ? ` ${TimeDiff}` : "" })`,
       `Type: ${ TEventType[ this.event_type ] }`,
       `Location: ${this.location}`,
       `By: ${this.posted_by}`,

src/config.ts

@@ -0,0 +1,16 @@
+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,11 +1,27 @@
-export async function sendNotification(title: string, body: string, link?: string | null) {
+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 ) {
   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",
@@ -14,8 +30,8 @@ export async function sendNotification(title: string, body: string, link?: strin
         },
         body: JSON.stringify({
         urls: [
-            `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" }`,
+            `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}?avatar_url=${process.env.dc_avatar_url}&botname=${process.env.dc_botname}`
+            `discord://${process.env.dc_webhook}?${QS.discord}`
         ].join(","),
         title: title,
         body: body,

src/sql.ts

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

src/util.ts

@@ -89,3 +89,10 @@ 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;
+}