Merge pull request #102 from bscott/v0.5.7

v0.5.7 - Webhooks, Date Formats, and Currency Improvements

Author: bscott

AGENTS.md

@@ -302,3 +302,90 @@ npm test
 - NEVER stop before pushing - that leaves work stranded locally
 - NEVER say "ready to push when you are" - YOU must push
 - If push fails, resolve and retry until it succeeds
+
+<!-- BEGIN BEADS INTEGRATION -->
+## Issue Tracking with bd (beads)
+
+**IMPORTANT**: This project uses **bd (beads)** for ALL issue tracking. Do NOT use markdown TODOs, task lists, or other tracking methods.
+
+### Why bd?
+
+- Dependency-aware: Track blockers and relationships between issues
+- Git-friendly: Auto-syncs to JSONL for version control
+- Agent-optimized: JSON output, ready work detection, discovered-from links
+- Prevents duplicate tracking systems and confusion
+
+### Quick Start
+
+**Check for ready work:**
+
+```bash
+bd ready --json
+```
+
+**Create new issues:**
+
+```bash
+bd create "Issue title" --description="Detailed context" -t bug|feature|task -p 0-4 --json
+bd create "Issue title" --description="What this issue is about" -p 1 --deps discovered-from:bd-123 --json
+```
+
+**Claim and update:**
+
+```bash
+bd update bd-42 --status in_progress --json
+bd update bd-42 --priority 1 --json
+```
+
+**Complete work:**
+
+```bash
+bd close bd-42 --reason "Completed" --json
+```
+
+### Issue Types
+
+- `bug` - Something broken
+- `feature` - New functionality
+- `task` - Work item (tests, docs, refactoring)
+- `epic` - Large feature with subtasks
+- `chore` - Maintenance (dependencies, tooling)
+
+### Priorities
+
+- `0` - Critical (security, data loss, broken builds)
+- `1` - High (major features, important bugs)
+- `2` - Medium (default, nice-to-have)
+- `3` - Low (polish, optimization)
+- `4` - Backlog (future ideas)
+
+### Workflow for AI Agents
+
+1. **Check ready work**: `bd ready` shows unblocked issues
+2. **Claim your task**: `bd update <id> --status in_progress`
+3. **Work on it**: Implement, test, document
+4. **Discover new work?** Create linked issue:
+   - `bd create "Found bug" --description="Details about what was found" -p 1 --deps discovered-from:<parent-id>`
+5. **Complete**: `bd close <id> --reason "Done"`
+
+### Auto-Sync
+
+bd automatically syncs with git:
+
+- Exports to `.beads/issues.jsonl` after changes (5s debounce)
+- Imports from JSONL when newer (e.g., after `git pull`)
+- No manual export/import needed!
+
+### Important Rules
+
+- ✅ Use bd for ALL task tracking
+- ✅ Always use `--json` flag for programmatic use
+- ✅ Link discovered work with `discovered-from` dependencies
+- ✅ Check `bd ready` before asking "what should I work on?"
+- ❌ Do NOT create markdown TODO lists
+- ❌ Do NOT use external issue trackers
+- ❌ Do NOT duplicate tracking systems
+
+For more details, see README.md and docs/QUICKSTART.md.
+
+<!-- END BEADS INTEGRATION -->

cmd/server/main.go

@@ -9,6 +9,7 @@ import (
 	"math"
 	"net/http"
 	"os"
+	"strings"
 	"subtrackr/internal/config"
 	"subtrackr/internal/database"
 	"subtrackr/internal/handlers"
@@ -57,6 +58,7 @@ func main() {
 	settingsService := service.NewSettingsService(settingsRepo)
 	emailService := service.NewEmailService(settingsService)
 	pushoverService := service.NewPushoverService(settingsService)
+	webhookService := service.NewWebhookService(settingsService)
 	logoService := service.NewLogoService()
 
 	// Handle CLI commands (run before starting HTTP server)
@@ -78,7 +80,7 @@ func main() {
 	sessionService := service.NewSessionService(sessionSecret)
 
 	// Initialize handlers
-	subscriptionHandler := handlers.NewSubscriptionHandler(subscriptionService, settingsService, currencyService, emailService, pushoverService, logoService)
+	subscriptionHandler := handlers.NewSubscriptionHandler(subscriptionService, settingsService, currencyService, emailService, pushoverService, webhookService, logoService)
 	settingsHandler := handlers.NewSettingsHandler(settingsService)
 	categoryHandler := handlers.NewCategoryHandler(categoryService)
 	authHandler := handlers.NewAuthHandler(settingsService, sessionService, emailService)
@@ -115,6 +117,15 @@ func main() {
 				return 0
 			}
 		},
+		"fmtDate": func(t *time.Time, format string) string {
+			if t == nil {
+				return ""
+			}
+			return t.Format(format)
+		},
+		"fmtTime": func(t time.Time, format string) string {
+			return t.Format(format)
+		},
 	})
 
 	// Load HTML templates with error handling
@@ -171,10 +182,10 @@ func main() {
 	// }
 
 	// Start renewal reminder scheduler
-	go startRenewalReminderScheduler(subscriptionService, emailService, pushoverService, settingsService)
+	go startRenewalReminderScheduler(subscriptionService, emailService, pushoverService, webhookService, settingsService)
 
 	// Start cancellation reminder scheduler
-	go startCancellationReminderScheduler(subscriptionService, emailService, pushoverService, settingsService)
+	go startCancellationReminderScheduler(subscriptionService, emailService, pushoverService, webhookService, settingsService)
 
 	// Start server
 	port := os.Getenv("PORT")
@@ -216,6 +227,15 @@ func loadTemplates() *template.Template {
 				return 0
 			}
 		},
+		"fmtDate": func(t *time.Time, format string) string {
+			if t == nil {
+				return ""
+			}
+			return t.Format(format)
+		},
+		"fmtTime": func(t time.Time, format string) string {
+			return t.Format(format)
+		},
 	})
 
 	// Critical templates required for basic functionality
@@ -344,6 +364,8 @@ func setupRoutes(router *gin.Engine, handler *handlers.SubscriptionHandler, sett
 		api.POST("/settings/pushover", settingsHandler.SavePushoverSettings)
 		api.POST("/settings/pushover/test", settingsHandler.TestPushoverConnection)
 		api.GET("/settings/pushover", settingsHandler.GetPushoverConfig)
+		api.POST("/settings/webhook", settingsHandler.SaveWebhookSettings)
+		api.POST("/settings/webhook/test", settingsHandler.TestWebhookConnection)
 		api.POST("/settings/notifications/:setting", settingsHandler.UpdateNotificationSetting)
 		api.GET("/settings/notifications", settingsHandler.GetNotificationSettings)
 		api.GET("/settings/smtp", settingsHandler.GetSMTPConfig)
@@ -356,6 +378,9 @@ func setupRoutes(router *gin.Engine, handler *handlers.SubscriptionHandler, sett
 		// Currency setting
 		api.POST("/settings/currency", settingsHandler.UpdateCurrency)
 
+		// Date format setting
+		api.POST("/settings/date-format", settingsHandler.UpdateDateFormat)
+
 		// Dark mode setting
 		api.POST("/settings/dark-mode", settingsHandler.ToggleDarkMode)
 
@@ -409,11 +434,11 @@ func setupRoutes(router *gin.Engine, handler *handlers.SubscriptionHandler, sett
 
 // startRenewalReminderScheduler starts a background goroutine that checks for
 // upcoming renewals and sends reminder emails and Pushover notifications daily
-func startRenewalReminderScheduler(subscriptionService *service.SubscriptionService, emailService *service.EmailService, pushoverService *service.PushoverService, settingsService *service.SettingsService) {
+func startRenewalReminderScheduler(subscriptionService *service.SubscriptionService, emailService *service.EmailService, pushoverService *service.PushoverService, webhookService *service.WebhookService, settingsService *service.SettingsService) {
 	// Run immediately on startup (after a short delay to let server initialize)
 	go func() {
 		time.Sleep(30 * time.Second) // Wait 30 seconds for server to fully start
-		checkAndSendRenewalReminders(subscriptionService, emailService, pushoverService, settingsService)
+		checkAndSendRenewalReminders(subscriptionService, emailService, pushoverService, webhookService, settingsService)
 	}()
 
 	// Then run daily at midnight
@@ -430,14 +455,14 @@ func startRenewalReminderScheduler(subscriptionService *service.SubscriptionServ
 						log.Printf("Panic in renewal reminder check: %v", r)
 					}
 				}()
-				checkAndSendRenewalReminders(subscriptionService, emailService, pushoverService, settingsService)
+				checkAndSendRenewalReminders(subscriptionService, emailService, pushoverService, webhookService, settingsService)
 			}()
 		}
 	}()
 }
 
 // checkAndSendRenewalReminders checks for subscriptions needing reminders and sends emails and Pushover notifications
-func checkAndSendRenewalReminders(subscriptionService *service.SubscriptionService, emailService *service.EmailService, pushoverService *service.PushoverService, settingsService *service.SettingsService) {
+func checkAndSendRenewalReminders(subscriptionService *service.SubscriptionService, emailService *service.EmailService, pushoverService *service.PushoverService, webhookService *service.WebhookService, settingsService *service.SettingsService) {
 	// Check if renewal reminders are enabled
 	enabled, err := settingsService.GetBoolSetting("renewal_reminders", false)
 	if err != nil || !enabled {
@@ -470,10 +495,11 @@ func checkAndSendRenewalReminders(subscriptionService *service.SubscriptionServi
 	for sub, daysUntil := range subscriptions {
 		emailErr := emailService.SendRenewalReminder(sub, daysUntil)
 		pushoverErr := pushoverService.SendRenewalReminder(sub, daysUntil)
+		webhookErr := webhookService.SendRenewalReminder(sub, daysUntil)
 
-		// If both fail, count as failed; otherwise consider it sent
-		if emailErr != nil && pushoverErr != nil {
-			log.Printf("Error sending renewal reminder for subscription %s (ID: %d): email=%v, pushover=%v", sub.Name, sub.ID, emailErr, pushoverErr)
+		// If all fail, count as failed; otherwise consider it sent
+		if emailErr != nil && pushoverErr != nil && webhookErr != nil {
+			log.Printf("Error sending renewal reminder for subscription %s (ID: %d): email=%v, pushover=%v, webhook=%v", sub.Name, sub.ID, emailErr, pushoverErr, webhookErr)
 			failedCount++
 		} else {
 			// Mark reminder as sent for this renewal date
@@ -490,12 +516,20 @@ func checkAndSendRenewalReminders(subscriptionService *service.SubscriptionServi
 				log.Printf("Warning: Failed to update last reminder sent for subscription %s (ID: %d): %v", sub.Name, sub.ID, updateErr)
 			}
 
+			var failed []string
 			if emailErr != nil {
-				log.Printf("Sent Pushover renewal reminder for subscription %s (renews in %d days) - email failed: %v", sub.Name, daysUntil, emailErr)
-			} else if pushoverErr != nil {
-				log.Printf("Sent email renewal reminder for subscription %s (renews in %d days) - Pushover failed: %v", sub.Name, daysUntil, pushoverErr)
+				failed = append(failed, fmt.Sprintf("email=%v", emailErr))
+			}
+			if pushoverErr != nil {
+				failed = append(failed, fmt.Sprintf("pushover=%v", pushoverErr))
+			}
+			if webhookErr != nil {
+				failed = append(failed, fmt.Sprintf("webhook=%v", webhookErr))
+			}
+			if len(failed) > 0 {
+				log.Printf("Sent renewal reminder for subscription %s (renews in %d days) - some channels failed: %s", sub.Name, daysUntil, strings.Join(failed, ", "))
 			} else {
-				log.Printf("Sent renewal reminders (email and Pushover) for subscription %s (renews in %d days)", sub.Name, daysUntil)
+				log.Printf("Sent renewal reminders for subscription %s (renews in %d days)", sub.Name, daysUntil)
 			}
 			sentCount++
 		}
@@ -506,11 +540,11 @@ func checkAndSendRenewalReminders(subscriptionService *service.SubscriptionServi
 
 // startCancellationReminderScheduler starts a background goroutine that checks for
 // upcoming cancellations and sends reminder emails and Pushover notifications daily
-func startCancellationReminderScheduler(subscriptionService *service.SubscriptionService, emailService *service.EmailService, pushoverService *service.PushoverService, settingsService *service.SettingsService) {
+func startCancellationReminderScheduler(subscriptionService *service.SubscriptionService, emailService *service.EmailService, pushoverService *service.PushoverService, webhookService *service.WebhookService, settingsService *service.SettingsService) {
 	// Run immediately on startup (after a short delay to let server initialize)
 	go func() {
 		time.Sleep(30 * time.Second) // Wait 30 seconds for server to fully start
-		checkAndSendCancellationReminders(subscriptionService, emailService, pushoverService, settingsService)
+		checkAndSendCancellationReminders(subscriptionService, emailService, pushoverService, webhookService, settingsService)
 	}()
 
 	// Then run daily at midnight
@@ -527,14 +561,14 @@ func startCancellationReminderScheduler(subscriptionService *service.Subscriptio
 						log.Printf("Panic in cancellation reminder check: %v", r)
 					}
 				}()
-				checkAndSendCancellationReminders(subscriptionService, emailService, pushoverService, settingsService)
+				checkAndSendCancellationReminders(subscriptionService, emailService, pushoverService, webhookService, settingsService)
 			}()
 		}
 	}()
 }
 
 // checkAndSendCancellationReminders checks for subscriptions needing cancellation reminders and sends emails and Pushover notifications
-func checkAndSendCancellationReminders(subscriptionService *service.SubscriptionService, emailService *service.EmailService, pushoverService *service.PushoverService, settingsService *service.SettingsService) {
+func checkAndSendCancellationReminders(subscriptionService *service.SubscriptionService, emailService *service.EmailService, pushoverService *service.PushoverService, webhookService *service.WebhookService, settingsService *service.SettingsService) {
 	// Check if cancellation reminders are enabled
 	enabled, err := settingsService.GetBoolSetting("cancellation_reminders", false)
 	if err != nil || !enabled {
@@ -567,10 +601,11 @@ func checkAndSendCancellationReminders(subscriptionService *service.Subscription
 	for sub, daysUntil := range subscriptions {
 		emailErr := emailService.SendCancellationReminder(sub, daysUntil)
 		pushoverErr := pushoverService.SendCancellationReminder(sub, daysUntil)
+		webhookErr := webhookService.SendCancellationReminder(sub, daysUntil)
 
-		// If both fail, count as failed; otherwise consider it sent
-		if emailErr != nil && pushoverErr != nil {
-			log.Printf("Error sending cancellation reminder for subscription %s (ID: %d): email=%v, pushover=%v", sub.Name, sub.ID, emailErr, pushoverErr)
+		// If all fail, count as failed; otherwise consider it sent
+		if emailErr != nil && pushoverErr != nil && webhookErr != nil {
+			log.Printf("Error sending cancellation reminder for subscription %s (ID: %d): email=%v, pushover=%v, webhook=%v", sub.Name, sub.ID, emailErr, pushoverErr, webhookErr)
 			failedCount++
 		} else {
 			// Mark reminder as sent for this cancellation date
@@ -587,12 +622,20 @@ func checkAndSendCancellationReminders(subscriptionService *service.Subscription
 				log.Printf("Warning: Failed to update last cancellation reminder sent for subscription %s (ID: %d): %v", sub.Name, sub.ID, updateErr)
 			}
 
+			var failed []string
 			if emailErr != nil {
-				log.Printf("Sent Pushover cancellation reminder for subscription %s (ends in %d days) - email failed: %v", sub.Name, daysUntil, emailErr)
-			} else if pushoverErr != nil {
-				log.Printf("Sent email cancellation reminder for subscription %s (ends in %d days) - Pushover failed: %v", sub.Name, daysUntil, pushoverErr)
+				failed = append(failed, fmt.Sprintf("email=%v", emailErr))
+			}
+			if pushoverErr != nil {
+				failed = append(failed, fmt.Sprintf("pushover=%v", pushoverErr))
+			}
+			if webhookErr != nil {
+				failed = append(failed, fmt.Sprintf("webhook=%v", webhookErr))
+			}
+			if len(failed) > 0 {
+				log.Printf("Sent cancellation reminder for subscription %s (ends in %d days) - some channels failed: %s", sub.Name, daysUntil, strings.Join(failed, ", "))
 			} else {
-				log.Printf("Sent cancellation reminders (email and Pushover) for subscription %s (ends in %d days)", sub.Name, daysUntil)
+				log.Printf("Sent cancellation reminders for subscription %s (ends in %d days)", sub.Name, daysUntil)
 			}
 			sentCount++
 		}