Add regex option to find scout appintments to ignore (#96)

Author: nuttytree

src/NuttyTree.NetDaemon.Application/AppointmentReminders/AppointmentRemindersApp.cs

@@ -114,7 +114,25 @@ private async Task UpdateAppointmentsFromHomeAssistantAsync(CancellationToken ca
                 foreach (var homeAssistantAppointment in homeAssistantAppointments)
                 {
                     var appointment = appointments.FirstOrDefault(a => a.Id == homeAssistantAppointment.Id);
-                    if (appointment?.HasChanged(homeAssistantAppointment) == true)
+                    if (appointment == null)
+                    {
+                        logger.LogInformation(
+                            "Found new appointment {AppointmentSummary} at {AppointmentStart} in Home Assistant",
+                            homeAssistantAppointment.Summary,
+                            homeAssistantAppointment.Start);
+
+                        appointment = homeAssistantAppointment.ToAppointmentEntity();
+                        appointment.SetAppointmentPerson();
+                        appointment.SetLocationCoordinates(appointment.GetKnownLocationCoordinates(options)
+                            ?? (await wazeTravelTimes.GetAddressLocationFromAddressAsync(appointment.Location))?.Location
+                            ?? LocationCoordinates.Empty);
+                        appointment.SetAppointmentReminderOptions(options);
+
+                        dbContext.Appointments.Add(appointment);
+                        await dbContext.SaveChangesAsync(cancellationToken);
+                        travelTimeUpdatesTask.Trigger();
+                    }
+                    else if (appointment.HasChanged(homeAssistantAppointment))
                     {
                         logger.LogInformation(
                             "Found updated appointment {AppointmentSummary} at {AppointmentStart} in Home Assistant",
@@ -129,26 +147,6 @@ private async Task UpdateAppointmentsFromHomeAssistantAsync(CancellationToken ca
                         travelTimeUpdatesTask.Trigger();
                     }
                 }
-
-                foreach (var homeAssistantAppointment in homeAssistantAppointments
-                    .Where(h => !appointments.Any(a => a.Id == h.Id)))
-                {
-                    logger.LogInformation(
-                        "Found new appointment {AppointmentSummary} at {AppointmentStart} in Home Assistant",
-                        homeAssistantAppointment.Summary,
-                        homeAssistantAppointment.Start);
-
-                    var appointment = homeAssistantAppointment.ToAppointmentEntity();
-                    appointment.SetAppointmentPerson();
-                    appointment.SetLocationCoordinates(appointment.GetKnownLocationCoordinates(options)
-                        ?? (await wazeTravelTimes.GetAddressLocationFromAddressAsync(appointment.Location))?.Location
-                        ?? LocationCoordinates.Empty);
-                    appointment.SetAppointmentReminderOptions(options);
-
-                    dbContext.Appointments.Add(appointment);
-                    await dbContext.SaveChangesAsync(cancellationToken);
-                    travelTimeUpdatesTask.Trigger();
-                }
             }
         }
         catch (Exception ex)

src/NuttyTree.NetDaemon.Application/AppointmentReminders/Extensions/AppointmentEntityExtensions.cs

@@ -1,4 +1,5 @@
 using System.Diagnostics.CodeAnalysis;
+using System.Text.RegularExpressions;
 using NuttyTree.NetDaemon.Application.AppointmentReminders.Options;
 using NuttyTree.NetDaemon.ExternalServices.Waze.Models;
 using NuttyTree.NetDaemon.Infrastructure.Database.Entities;
@@ -208,7 +209,7 @@ public static void SetAppointmentReminderOptions(this AppointmentEntity appointm
             }
         }
 
-        if (appointment.Calendar == ScoutsCalendar && appointment.Summary.Contains("cancel", StringComparison.OrdinalIgnoreCase))
+        if (appointment.Calendar == ScoutsCalendar && !string.IsNullOrWhiteSpace(options.IgnoreScoutsAppointmntRegex) && new Regex(options.IgnoreScoutsAppointmntRegex).IsMatch(appointment.Summary))
         {
             startReminder.Cancel();
             endReminder.Cancel();

src/NuttyTree.NetDaemon.Application/AppointmentReminders/Options/AppointmentRemindersOptions.cs

@@ -10,6 +10,8 @@ internal sealed class AppointmentRemindersOptions
 
     public LocationCoordinates? HomeLocation { get; set; }
 
+    public string? IgnoreScoutsAppointmntRegex { get; set; }
+
     public int MaxReminderMiles { get; set; } = 100;
 
     public int DefaultStartLeadMinutes { get; set; } = 5;

src/NuttyTree.NetDaemon.Infrastructure/Logging/IHostBuilderExtensions.cs

@@ -2,6 +2,7 @@
 using Microsoft.Extensions.Hosting;
 using Serilog;
 using Serilog.Events;
+using Serilog.Sinks.SystemConsole.Themes;
 
 namespace NuttyTree.NetDaemon.Infrastructure.Logging;
 
@@ -11,12 +12,13 @@ public static IHostBuilder UseLogging(this IHostBuilder builder)
     {
         return builder.UseSerilog((context, config) =>
         {
-            config.MinimumLevel.Override("Microsoft.EntityFrameworkCore", LogEventLevel.Warning);
+            config.MinimumLevel.Debug();
+            config.MinimumLevel.Override("Microsoft", LogEventLevel.Warning);
+            config.MinimumLevel.Override("Serilog", LogEventLevel.Warning);
             config.MinimumLevel.Override("System.Net.Http.HttpClient", LogEventLevel.Warning);
-            config.MinimumLevel.Override("Microsoft.AspNetCore", LogEventLevel.Warning);
             config.WriteTo.Async(sinkConfig =>
             {
-                sinkConfig.Console(formatProvider: CultureInfo.CurrentCulture, outputTemplate: "[{Timestamp:HH:mm:ss} {Level:u3}] {SourceContext} {Message:lj}{NewLine}{Exception}");
+                sinkConfig.Console(theme: AnsiConsoleTheme.Sixteen, formatProvider: CultureInfo.CurrentCulture);
             });
         });
     }