0.2.45 - Advanced analytics, logout old versions

server/internal/api/admin.go

@@ -720,7 +720,29 @@ func (s *Server) handleAdminAnalytics(w http.ResponseWriter, r *http.Request) {
 		writeError(w, http.StatusInternalServerError, "could not read analytics")
 		return
 	}
-	writeJSON(w, http.StatusOK, map[string]any{"days": days, "rows": stats})
+	users, err := s.store.AnalyticsUsers(r.Context(), since)
+	if err != nil {
+		s.loggerFor(r.Context()).Error("user analytics failed", "error", err)
+		writeError(w, http.StatusInternalServerError, "could not read analytics")
+		return
+	}
+	payload := map[string]any{"days": days, "retentionDays": int(s.cfg.AnalyticsRetention / (24 * time.Hour)), "rows": stats, "users": users}
+	userID := strings.TrimSpace(r.URL.Query().Get("userId"))
+	if userID != "" {
+		features, featureErr := s.store.UserFeatureStats(r.Context(), userID, since)
+		paths, pathErr := s.store.UserPaths(r.Context(), userID, since)
+		events, eventErr := s.store.UserJourneyEvents(r.Context(), userID, since, 1000)
+		if featureErr != nil || pathErr != nil || eventErr != nil {
+			s.loggerFor(r.Context()).Error("user journey read failed", "user_id", userID)
+			writeError(w, http.StatusInternalServerError, "could not read user journey")
+			return
+		}
+		payload["userId"] = userID
+		payload["features"] = features
+		payload["paths"] = paths
+		payload["events"] = events
+	}
+	writeJSON(w, http.StatusOK, payload)
 }
 
 // syncerHandle is the slice of the syncer the API needs, so api does not depend on the