chiko/77th_eventcalenderntfy
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

rearranged some code.

Browse Source 
splited function main() to 2 seperate functions.
This commit is contained in:
chiko
2025-10-24 02:55:33 +02:00
parent eb6525a66f
commit d303560f53
1 changed files with 89 additions and 59 deletions
Download Patch File Download Diff File Expand all files Collapse all files

136
src/app.ts
View File

@@ -1,4 +1,4 @@
import { TEventType } from "./component/event/event.types"; import { TEventType, type TEvent } from "./component/event";
import { db } from "./sql"; import { db } from "./sql";
import { Event, type TEventEntityNew, type TGetEventsOptions } from "./component/event/events"; import { Event, type TEventEntityNew, type TGetEventsOptions } from "./component/event/events";
import { createPlaceholders, getTsNow, pad_l2 } from "./util"; import { createPlaceholders, getTsNow, pad_l2 } from "./util";
@@ -8,34 +8,65 @@ const argv = minimist(process.argv.slice(2))
console.log("App started"); console.log("App started");
console.dir({argv}) console.dir({argv})
async function main ( ) {
console.log("Excecuting main()");
const TODAY = getTsNow(); const TODAY = getTsNow();
console.dir(TODAY); console.dir({TODAY});
const events_currentMonth = await Event.fetch_events( TODAY.year, TODAY.month , -120 );
console.log("events_currentMonth.length:" + events_currentMonth.length );
const events_nextMonth = await Event.fetch_events( TODAY.year, TODAY.month + 1 , -120 );
console.log("events_nextMonth.length:" + events_nextMonth.length );
const events = [...events_currentMonth, ...events_nextMonth];
console.log("events.length:" + events.length );
// const TS_TODAY = new Date(); function getBodyFromEvent( event: TEvent): string {
// Write to JSON File Section START const body = [
// const data = JSON.stringify(events, null, 2); `Title: ${event.title}`,
// const TS = `${TS_TODAY.getFullYear()}-${TS_TODAY.getMonth() + 1}-${TS_TODAY.getDate()}_${TS_TODAY.getHours()}-${TS_TODAY.getMinutes()}-${TS_TODAY.getSeconds()}`; `Date: ${event.date_at}`,
// await Bun.write(path.join(import.meta.dir, "output", `output_${TS}.json`), data ); `Time: ${event.time_start}`,
// Write to JSON File Section END `Type: ${ TEventType[ event.event_type ] }`,
`Location: ${event.location}`,
`By: ${event.posted_by}`,
`Link: ${event.link}`,
].join("\n");
return body;
}
const allEventUids = events.map( event => { return event.uid; }); function isEventToday (event: Event | TEvent ) {
console.dir(allEventUids ); const now = getTsNow();
const placeholders = createPlaceholders( allEventUids ); const [year, month, day] = event.date_at.split("-")
if (
year == String(now.year) &&
month == pad_l2( String(now.month) ) &&
day == pad_l2( String( now.day ) )
) {
return true;
}
return false;
}
async function events_update_db() {
const events_fetched_currentMonth = await Event.fetch_events( TODAY.year, TODAY.month , -120 );
console.log("events_fetched_currentMonth.length: " + events_fetched_currentMonth.length );
const events_fetched_nextMonth = await Event.fetch_events( TODAY.year, TODAY.month + 1 , -120 );
console.log("events_fetched_nextMonth.length: " + events_fetched_nextMonth.length );
const events_fetched = [...events_fetched_currentMonth, ...events_fetched_nextMonth];
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} );
const events_db_currentMonth = Event.get_events({month: {year: TODAY.year, month: TODAY.month}}, db);
const events_removed: Event[] = events_db_currentMonth.filter( (ev) => {
return ! events_fetched_list_of_uids.includes(ev.uid);
});
console.dir({events_removed});
events_removed.forEach( ev => {
ev.set_notification("removed", db);
});
const placeholders = createPlaceholders( events_fetched_list_of_uids );
const getAllRelevantEventsQuery = db.query( const getAllRelevantEventsQuery = db.query(
`SELECT * FROM events WHERE uid IN (${placeholders}); ` `SELECT * FROM events WHERE uid IN (${placeholders}) AND deleteDate IS NULL;`
).as(Event ); ).as(Event );
const AllRelevantEvents = getAllRelevantEventsQuery.all(...allEventUids); const AllRelevantEvents = getAllRelevantEventsQuery.all(...events_fetched_list_of_uids);
console.log("AllRelevantEvents.length: " + AllRelevantEvents.length ); console.log("AllRelevantEvents.length: " + AllRelevantEvents.length );
const eventsToInsert: TEventEntityNew[] = []; const eventsToInsert: TEventEntityNew[] = [];
for ( const ev of events ) { 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); const found = AllRelevantEvents.find(event => event.uid === ev.uid);
if ( found ) { if ( found ) {
@@ -62,10 +93,15 @@ async function main ( ) {
eventsToInsert.push( newEventToInsert ); eventsToInsert.push( newEventToInsert );
} }
} }
console.dir(eventsToInsert) console.dir({eventsToInsert})
Event.insert( eventsToInsert, db); Event.insert( eventsToInsert, db);
const where: TGetEventsOptions = {} }
where.notification = ["new", "changed"]
async function events_check_for_notification() {
const where: TGetEventsOptions = {
notification: ["new", "changed", "removed"],
deleted: false
}
if ( argv.today ) { if ( argv.today ) {
where.date = { where.date = {
year: TODAY.year, year: TODAY.year,
@@ -80,45 +116,39 @@ async function main ( ) {
}); });
for ( const ev of list_of_events ) { 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: " + [ ev.uid, ev.title, ev.date_at, "notification: " + ev.notification ].join( ", " ) );
const body = [ const body = getBodyFromEvent( ev );
`Title: ${ev.title}`, // console.log("loop list_of_events - ev 'body': " + body );
`Location: ${ev.location}`, const type_of_notification = ( (event: Event) => {
`Type: ${ TEventType[ ev.event_type ] }`,
`Date: ${ev.date_at}`,
`Time: ${ev.time_start}`,
`By: ${ev.posted_by}`,
`Link: ${ev.link}`,
].join("\n");
console.log("loop list_of_events - ev 'body': " + body );
const notification_prefix = ( (event: Event) => {
switch ( event.notification ) { switch ( event.notification ) {
case "new": case "new":
return "New"; return "New";
case "changed": case "changed":
return "Changed"; return "Changed";
case "deleted": case "removed":
return "Deleted"; return "Removed";
default: default:
return null; return null;
} }
} ) ( ev ); } ) ( ev );
const title_prefix_arr = [];
const today_prefix = ( (ev: Event) => { if ( type_of_notification ) title_prefix_arr.push( "<" + type_of_notification + ">" );
const now = getTsNow(); if ( isEventToday( ev ) ) title_prefix_arr.push( "<TODAY>" )
const [year, month, day] = ev.date_at.split("-") const title = `${title_prefix_arr.length >= 1 ? ( title_prefix_arr.join(" " ) + " - ") : "" }${ev.title} (${ TEventType[ ev.event_type ] })`;
if (
year == String(now.year) &&
month == pad_l2( String(now.month) ) &&
day == pad_l2( String( now.day ) )
) {
return true;
}
return false;
})( ev );
const title = `${today_prefix ? "TODAY " : ""}${notification_prefix ? notification_prefix + ": " : ""} ${ev.title} (${ TEventType[ ev.event_type ] })`;
console.log("loop list_of_events - ev 'title': " + title ); console.log("loop list_of_events - ev 'title': " + title );
await sendNotification( title, body, ev.link ? ev.link : null); await sendNotification( title, body);
if( ev.notification == "removed" ) {
ev.set_deleted( db );
}
ev.set_notification("done", db); ev.set_notification("done", db);
} }
}
async function main ( ) {
console.log("Excecuting main()");
await events_update_db();
await events_check_for_notification();
}; };
main(); main();