update aggregation jobs

server/handler/snapshotAggregate.go

@@ -6,6 +6,7 @@ import (
 	"net/http"
 	"strings"
 	"time"
+	"vctp/internal/settings"
 	"vctp/internal/tasks"
 )
 
@@ -16,6 +17,7 @@ import (
 // @Produce json
 // @Param type query string true "Aggregation type: daily or monthly"
 // @Param date query string true "Daily date (YYYY-MM-DD) or monthly date (YYYY-MM)"
+// @Param granularity query string false "Monthly aggregation granularity: hourly or daily"
 // @Success 200 {object} map[string]string "Aggregation complete"
 // @Failure 400 {object} map[string]string "Invalid request"
 // @Failure 500 {object} map[string]string "Server error"
@@ -23,6 +25,7 @@ import (
 func (h *Handler) SnapshotAggregateForce(w http.ResponseWriter, r *http.Request) {
 	snapshotType := strings.ToLower(strings.TrimSpace(r.URL.Query().Get("type")))
 	dateValue := strings.TrimSpace(r.URL.Query().Get("date"))
+	granularity := strings.ToLower(strings.TrimSpace(r.URL.Query().Get("granularity")))
 	startedAt := time.Now()
 	loc := time.Now().Location()
 
@@ -35,11 +38,29 @@ func (h *Handler) SnapshotAggregateForce(w http.ResponseWriter, r *http.Request)
 		return
 	}
 
+	if granularity != "" && snapshotType != "monthly" {
+		h.Logger.Warn("Snapshot aggregation granularity supplied for non-monthly request",
+			"type", snapshotType,
+			"granularity", granularity,
+		)
+		writeJSONError(w, http.StatusBadRequest, "granularity is only supported for monthly aggregation")
+		return
+	}
+	if granularity != "" && granularity != "hourly" && granularity != "daily" {
+		h.Logger.Warn("Snapshot aggregation invalid granularity", "granularity", granularity)
+		writeJSONError(w, http.StatusBadRequest, "granularity must be hourly or daily")
+		return
+	}
+
 	ctx := context.Background()
+	settingsCopy := *h.Settings.Values
+	if granularity != "" {
+		settingsCopy.Settings.MonthlyAggregationGranularity = granularity
+	}
 	ct := &tasks.CronTask{
 		Logger:   h.Logger,
 		Database: h.Database,
-		Settings: h.Settings,
+		Settings: &settings.Settings{Logger: h.Logger, SettingsPath: h.Settings.SettingsPath, Values: &settingsCopy},
 	}
 
 	switch snapshotType {
@@ -63,7 +84,7 @@ func (h *Handler) SnapshotAggregateForce(w http.ResponseWriter, r *http.Request)
 			writeJSONError(w, http.StatusBadRequest, "date must be YYYY-MM")
 			return
 		}
-		h.Logger.Info("Starting monthly snapshot aggregation", "date", parsed.Format("2006-01"), "force", true)
+		h.Logger.Info("Starting monthly snapshot aggregation", "date", parsed.Format("2006-01"), "force", true, "granularity", granularity)
 		if err := ct.AggregateMonthlySummary(ctx, parsed, true); err != nil {
 			h.Logger.Error("Monthly snapshot aggregation failed", "date", parsed.Format("2006-01"), "error", err)
 			writeJSONError(w, http.StatusInternalServerError, err.Error())
@@ -78,6 +99,7 @@ func (h *Handler) SnapshotAggregateForce(w http.ResponseWriter, r *http.Request)
 	h.Logger.Info("Snapshot aggregation completed",
 		"type", snapshotType,
 		"date", dateValue,
+		"granularity", granularity,
 		"duration", time.Since(startedAt),
 	)
 	w.Header().Set("Content-Type", "application/json")