Version Bump: v0.1.6

dont query todays Events and send a Notification if the Container starts the first time.

docker-compose.yml

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

docker/docker-entrypoint.sh

@@ -35,7 +35,7 @@ for var in "${env_vars[@]}"; do
 done
 
 export PATH="/root/.bun/bin:$PATH"
-bun run /opt/app/src/app.ts --today
+bun run /opt/app/src/app.ts
 
 # Start cron in foreground
 exec cron -f

package.json

@@ -1,5 +1,5 @@
 {
-  "version": "0.1.5",
+  "version": "0.1.6",
   "name": "77th_eventcalendarnotification",
   "module": "./src/app.ts",
   "type": "module",

src/app.ts

@@ -21,8 +21,8 @@ async function events_update_db() {
   const events_fetched_list_of_uids = events_fetched.map( event => { return event.uid; });
   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}, deleted: false}, db);
-  const events_db_nextMonth = Event.get_events({month: {year: TODAY.year, month: (TODAY.month + 1)}}, db);
+  const events_db_nextMonth = Event.get_events({month: {year: TODAY.year, month: (TODAY.month + 1)}, deleted: false}, 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);
@@ -102,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">
@@ -95,10 +95,10 @@ export class Event implements TEventEntity {
         whereConditions.push( `notification IN ('${ options.notification.join("', '") }')` )
     }
     if ( options.date ) {
-      whereConditions.push(`date_at = "${options.date.year}-${options.date.month}-${options.date.day}"`);
+      whereConditions.push(`date_at = "${options.date.year}-${pad_l2(options.date.month)}-${pad_l2(options.date.day)}"`);
     }
     if ( options.month ) {
-      whereConditions.push( `strftime('%Y-%m', date_at) = '${options.month.year}-${options.month.month}'`)
+      whereConditions.push( `strftime('%Y-%m', date_at) = '${options.month.year}-${pad_l2(options.month.month)}'`)
     }
 
     const where = ( () => {
@@ -176,8 +176,7 @@ export class Event implements TEventEntity {
   set_notification ( newValue: TEventEntity["notification"], db: Database ) {
     const query = db.prepare(
         `UPDATE events
-        SET notification = $notification,
+        SET notification = $notification
-          deleteDate = NULL
         WHERE event_uid = $event_uid;`
     );
     query.get({$notification: newValue, $event_uid: this.event_uid });
@@ -186,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({

src/util.ts

@@ -34,6 +34,7 @@ export function getTsNow() {
     year: now.getFullYear(),
     month: now.getMonth() + 1,
     day: now.getDate(),
+    hour: now.getHours(),
     minute: now.getMinutes(),
     seconds: now.getSeconds()
   }