feat(reporting): align account events

This commit is contained in:
2026-06-06 15:53:33 +08:00
parent 0631249224
commit 2072396f12
7 changed files with 292 additions and 44 deletions
@@ -2,6 +2,8 @@ package v1
import (
"net/http"
"strconv"
"time"
"github.com/gin-gonic/gin"
@@ -20,8 +22,10 @@ func NewReportingEventHandler(svc *service.ReportingEventService) *ReportingEven
return &ReportingEventHandler{svc: svc}
}
// List retrieves reporting events for an account with optional date range filtering.
// GET /api/v1/accounts/:account_id/reporting_events?since=2024-01-01T00:00:00Z&until=2024-12-31T23:59:59Z&metric=message_created
const chatwootReportingEventsPerPage = 25
// List retrieves reporting events for an account with Chatwoot filters and pagination.
// GET /api/v1/accounts/:account_id/reporting_events?since=...&until=...&inbox_id=...&user_id=...&name=...&page=...
func (h *ReportingEventHandler) List(c *gin.Context) {
accountID, err := parseUintParam(c, "account_id")
if err != nil {
@@ -29,29 +33,81 @@ func (h *ReportingEventHandler) List(c *gin.Context) {
return
}
since, until, ok := parseDateRange(c)
filter, ok := parseReportingEventListFilter(c)
if !ok {
return
}
// Check for optional metric filter
metric := c.Query("metric")
if metric != "" {
events, svcErr := h.svc.GetByMetric(c.Request.Context(), accountID, metric, since, until)
if svcErr != nil {
handleServiceError(c, svcErr)
return
}
response.OK(c, gin.H{"reporting_events": events})
return
}
events, svcErr := h.svc.ListByAccount(c.Request.Context(), accountID, since, until)
result, svcErr := h.svc.ListAccountEvents(c.Request.Context(), accountID, filter)
if svcErr != nil {
handleServiceError(c, svcErr)
return
}
response.OK(c, gin.H{"reporting_events": events})
}
payload := make([]gin.H, 0, len(result.Events))
for i := range result.Events {
payload = append(payload, serializeReportingEvent(result.Events[i]))
}
c.JSON(http.StatusOK, gin.H{
"payload": payload,
"meta": gin.H{
"count": result.Total,
"current_page": result.CurrentPage,
"total_pages": result.TotalPages,
},
})
}
func parseReportingEventListFilter(c *gin.Context) (service.ReportingEventListFilter, bool) {
page, err := strconv.Atoi(c.DefaultQuery("page", "1"))
if err != nil || page < 1 {
page = 1
}
inboxID, err := parseOptionalUintQueryParam(c, "inbox_id")
if err != nil {
response.AbortWithStatusError(c, http.StatusBadRequest, response.ErrBadRequest, "invalid inbox_id")
return service.ReportingEventListFilter{}, false
}
userID, err := parseOptionalUintQueryParam(c, "user_id")
if err != nil {
response.AbortWithStatusError(c, http.StatusBadRequest, response.ErrBadRequest, "invalid user_id")
return service.ReportingEventListFilter{}, false
}
filter := service.ReportingEventListFilter{
InboxID: inboxID,
UserID: userID,
Name: c.Query("name"),
Page: page,
PerPage: chatwootReportingEventsPerPage,
}
sinceStr := c.Query("since")
untilStr := c.Query("until")
if sinceStr == "" || untilStr == "" {
return filter, true
}
since, err := parseUnixTimestamp(sinceStr)
if err != nil {
response.AbortWithStatusError(c, http.StatusBadRequest, response.ErrBadRequest, "invalid since date format")
return service.ReportingEventListFilter{}, false
}
until, err := parseUnixTimestamp(untilStr)
if err != nil {
response.AbortWithStatusError(c, http.StatusBadRequest, response.ErrBadRequest, "invalid until date format")
return service.ReportingEventListFilter{}, false
}
filter.Since = &since
filter.Until = &until
return filter, true
}
func parseUnixTimestamp(value string) (time.Time, error) {
seconds, err := strconv.ParseInt(value, 10, 64)
if err != nil {
return time.Time{}, err
}
return time.Unix(seconds, 0).UTC(), nil
}