some minor fixes to the logging texts

URL for Post Request returned a 404 because there was a " too much

.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.2
+    image: chiko/77th_eventcalendarntfy:v0.1.3
     build: .
     volumes:
       - ./data/db:/opt/app/data/db

package.json

@@ -1,6 +1,6 @@
 {
-  "version": "0.1.2",
+  "version": "0.1.3",
-  "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",
+    "prod": "NODE_ENV=production 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();

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 );
     }

src/component/event/events.ts

@@ -135,6 +135,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 +220,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()}${ TimeDiff && TimeDiff == "00:00" ? ` (Optime ${TimeDiff})` : "" }`,
       `Type: ${ TEventType[ this.event_type ] }`,
       `Location: ${this.location}`,
       `By: ${this.posted_by}`,

src/sendNotification.ts

@@ -7,7 +7,7 @@ export async function sendNotification(title: string, body: string, link?: strin
     }
   });
   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"`, {
+    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",
         headers: {
           "Content-Type": "application/json"