refactor: clean up code and add tests for alarm logic

config/config_test.go

@@ -1,6 +1,5 @@
 package config
 
-
 import (
 	"testing"
 	"time"

ical/alarm.go

@@ -2,6 +2,7 @@ package ical
 
 import (
 	"github.com/revelaction/ical-git/config"
+	"log/slog"
 	"time"
 )
 
@@ -57,4 +58,3 @@ func (s *Alarms) isInTickPeriod(t time.Time) bool {
 
 	return true
 }
-

ical/alarm_test.go

@@ -7,33 +7,36 @@ import (
 	"github.com/revelaction/ical-git/config"
 )
 
-func TestGetAlarms(t *testing.T) {
-	// Define a TOML configuration with one alarm 15 hours ago
+func TestGetInTick(t *testing.T) {
+	// start 1 sept 00:00
+	// tick 24 hours
+	// -> tick period [00:00, 23:59]
+	// event 1 sept 20:00
+	// alarm 15 hours before
+	// => alarm 1 sept 5:00, IN tick period
 	tomlConfig := []byte(`
 	timezone = "UTC"
-	tick = "1h"
+	tick = "24h"
 
 	alarms = [
-		{type = "desktop", when = "PT15H"},  
+		{type = "desktop", when = "-PT15H"},  
 	]
 
 	notifiers = ["desktop"]
 	`)
 
-	// Load the configuration
 	conf, err := config.Load(tomlConfig)
 	if err != nil {
 		t.Fatalf("Failed to load config: %v", err)
 	}
 
-	// Set start time to 1 September 2024
+	// Set tick start time to 1 September 2024
 	start := time.Date(2024, time.September, 1, 0, 0, 0, 0, time.UTC)
 
-	// Create Alarms instance
 	alarms := NewAlarms(conf, start)
 
-	// Set event time to 1 September 2024, 12:00
-	eventTime := time.Date(2024, time.September, 1, 12, 0, 0, 0, time.UTC)
+	// Set event time to 1 September 2024, 20:00
+	eventTime := time.Date(2024, time.September, 1, 20, 0, 0, 0, time.UTC)
 
 	// Get alarms
 	result := alarms.Get(eventTime)
@@ -43,8 +46,89 @@ func TestGetAlarms(t *testing.T) {
 		t.Errorf("Expected 1 alarm, got %d", len(result))
 	}
 
-	expectedAlarmTime := eventTime.Add(-15 * time.Hour)
+	// 1 September 2024, 5:00
+	expectedAlarmTime := time.Date(2024, time.September, 1, 5, 0, 0, 0, time.UTC)
 	if result[0].Time != expectedAlarmTime {
 		t.Errorf("Expected alarm time %v, got %v", expectedAlarmTime, result[0].Time)
 	}
 }
+
+func TestGetAfterTick(t *testing.T) {
+	// start 1 sept 00:00
+	// tick 4 hours
+	// -> tick period [00:00, 03:59]
+	// event 1 sept 20:00
+	// alarm 15 hours before
+	// => alarm 1 sept 5:00, after the current tick period
+	tomlConfig := []byte(`
+	timezone = "UTC"
+	tick = "4h"
+
+	alarms = [
+		{type = "desktop", when = "-PT15H"},  
+	]
+
+	notifiers = ["desktop"]
+	`)
+
+	conf, err := config.Load(tomlConfig)
+	if err != nil {
+		t.Fatalf("Failed to load config: %v", err)
+	}
+
+	// Set tick start time to 1 September 2024
+	start := time.Date(2024, time.September, 1, 0, 0, 0, 0, time.UTC)
+
+	alarms := NewAlarms(conf, start)
+
+	// Set event time to 1 September 2024, 20:00
+	eventTime := time.Date(2024, time.September, 1, 20, 0, 0, 0, time.UTC)
+
+	// Get alarms
+	result := alarms.Get(eventTime)
+
+	// Check if the alarm is in the result
+	if len(result) != 0 {
+		t.Errorf("Expected 1 alarm, got %d", len(result))
+	}
+}
+
+func TestGetBeforeTick(t *testing.T) {
+	// start 1 sept 00:00
+	// tick 12 hours
+	// -> tick period [00:00, 11:59:59]
+	// event 1 sept 20:00
+	// alarm 21 hours before
+	// => alarm 31 august 23:00, before the current tick period
+	tomlConfig := []byte(`
+	timezone = "UTC"
+	tick = "4h"
+
+	alarms = [
+		{type = "desktop", when = "-PT21H"},  
+	]
+
+	notifiers = ["desktop"]
+	`)
+
+	conf, err := config.Load(tomlConfig)
+	if err != nil {
+		t.Fatalf("Failed to load config: %v", err)
+	}
+
+	// Set tick start time to 1 September 2024
+	start := time.Date(2024, time.September, 1, 0, 0, 0, 0, time.UTC)
+
+	alarms := NewAlarms(conf, start)
+
+	// Set event time to 1 September 2024, 20:00
+	eventTime := time.Date(2024, time.September, 1, 20, 0, 0, 0, time.UTC)
+
+	// Get alarms
+	result := alarms.Get(eventTime)
+
+	// Check if the alarm is in the result
+	if len(result) != 0 {
+		t.Errorf("Expected 1 alarm, got %d", len(result))
+	}
+}