refactor: remove unused DestinationID from RetrieveEventRequest (#679)

* refactor: remove unused DestinationID from RetrieveEventRequest

After iterations of access patterns, the current version doesn't require
DestinationID in this operation. Events are destination-agnostic - use
ListAttempt with DestinationIDs filter for destination-scoped queries.

Co-Authored-By: Claude Opus 4.5 <noreply@anthropic.com>

* refactor: query events table in RetrieveEvent

RetrieveEvent now queries the events table directly instead of the
attempts table.

Co-Authored-By: Claude Opus 4.5 <noreply@anthropic.com>

* fix: use QueryRow in chlogstore retrieve functions to prevent silent errors

RetrieveEvent and RetrieveAttempt used Query + rows.Next() without
checking rows.Err(), causing ClickHouse query errors to be silently
treated as "not found" (404) instead of surfacing as errors (500).
Switch to QueryRow which handles this correctly via sql.ErrNoRows.

Co-Authored-By: Claude Opus 4.6 <noreply@anthropic.com>

* fix: align API response structs with internal models

---------

Co-authored-by: Claude Opus 4.5 <noreply@anthropic.com>

Author: alexluong

cmd/e2e/log_queries_test.go

@@ -76,9 +76,10 @@ func (s *basicSuite) TestLogQueries_Attempts() {
 		first := resp.Models[0]
 		s.NotEmpty(first["id"])
 		s.NotEmpty(first["event_id"])
+		s.Equal(setup.tenantID, first["tenant_id"])
 		s.Equal(setup.destinationID, first["destination_id"])
 		s.NotEmpty(first["status"])
-		s.NotEmpty(first["delivered_at"])
+		s.NotEmpty(first["time"])
 		s.Equal(float64(0), first["attempt_number"])
 	})
 

docs/apis/openapi.yaml

@@ -1735,6 +1735,10 @@ components:
         id:
           type: string
           example: "evt_123"
+        tenant_id:
+          type: string
+          description: The tenant this event belongs to.
+          example: "tnt_123"
         destination_id:
           type: string
           example: "des_456"
@@ -1768,29 +1772,6 @@ components:
           description: Freeform JSON data of the event.
           additionalProperties: true
           example: { "user_id": "userid", "status": "active" }
-    DeliveryAttempt:
-      type: object
-      properties:
-        delivered_at:
-          type: string
-          format: date-time
-          example: "2024-01-01T00:00:00Z"
-        status:
-          type: string
-          enum: [success, failed]
-          example: "success"
-        response_status_code:
-          type: integer
-          example: 200
-        response_body:
-          type: string # Or potentially object if JSON
-          example: '{"status":"ok"}'
-        response_headers:
-          type: object
-          additionalProperties:
-            type: string
-          example: { "content-type": "application/json" }
-
     # Attempt schemas for attempts-first API
     Attempt:
       type: object
@@ -1800,12 +1781,16 @@ components:
           type: string
           description: Unique identifier for this attempt.
           example: "atm_123"
+        tenant_id:
+          type: string
+          description: The tenant this attempt belongs to.
+          example: "tnt_123"
         status:
           type: string
           enum: [success, failed]
           description: The attempt status.
           example: "success"
-        delivered_at:
+        time:
           type: string
           format: date-time
           description: Time the attempt was made.
@@ -1847,6 +1832,14 @@ components:
         id:
           type: string
           example: "evt_123"
+        tenant_id:
+          type: string
+          description: The tenant this event belongs to.
+          example: "tnt_123"
+        destination_id:
+          type: string
+          description: The destination this event was delivered to.
+          example: "des_456"
         topic:
           type: string
           example: "user.created"
@@ -1872,6 +1865,14 @@ components:
         id:
           type: string
           example: "evt_123"
+        tenant_id:
+          type: string
+          description: The tenant this event belongs to.
+          example: "tnt_123"
+        destination_id:
+          type: string
+          description: The destination this event was delivered to.
+          example: "des_456"
         topic:
           type: string
           example: "user.created"
@@ -2058,7 +2059,7 @@ tags:
       Each attempt contains:
       - `id`: Unique attempt identifier
       - `status`: success or failed
-      - `delivered_at`: Timestamp of the attempt
+      - `time`: Timestamp of the attempt
       - `code`: HTTP status code or error code
       - `attempt`: Attempt number (1 for first attempt, 2+ for retries)
       - `event`: Associated event (ID or included object)
@@ -2640,14 +2641,14 @@ paths:
                     models:
                       - id: "atm_123"
                         status: "success"
-                        delivered_at: "2024-01-01T00:00:05Z"
+                        time: "2024-01-01T00:00:05Z"
                         code: "200"
                         attempt_number: 1
                         event_id: "evt_123"
                         destination_id: "des_456"
                       - id: "att_124"
                         status: "failed"
-                        delivered_at: "2024-01-02T10:00:01Z"
+                        time: "2024-01-02T10:00:01Z"
                         code: "503"
                         attempt_number: 2
                         event_id: "evt_789"
@@ -2664,7 +2665,7 @@ paths:
                     models:
                       - id: "del_123"
                         status: "success"
-                        delivered_at: "2024-01-01T00:00:05Z"
+                        time: "2024-01-01T00:00:05Z"
                         code: "200"
                         attempt_number: 1
                         event_id: "evt_123"
@@ -2734,7 +2735,7 @@ paths:
                   value:
                     id: "atm_123"
                     status: "success"
-                    delivered_at: "2024-01-01T00:00:05Z"
+                    time: "2024-01-01T00:00:05Z"
                     code: "200"
                     attempt_number: 1
                     event_id: "evt_123"
@@ -2744,7 +2745,7 @@ paths:
                   value:
                     id: "atm_123"
                     status: "success"
-                    delivered_at: "2024-01-01T00:00:05Z"
+                    time: "2024-01-01T00:00:05Z"
                     code: "200"
                     response_data:
                       status_code: 200
@@ -3271,14 +3272,14 @@ paths:
                     models:
                       - id: "atm_123"
                         status: "success"
-                        delivered_at: "2024-01-01T00:00:05Z"
+                        time: "2024-01-01T00:00:05Z"
                         code: "200"
                         attempt_number: 1
                         event_id: "evt_123"
                         destination_id: "des_456"
                       - id: "atm_124"
                         status: "failed"
-                        delivered_at: "2024-01-02T10:00:01Z"
+                        time: "2024-01-02T10:00:01Z"
                         code: "503"
                         attempt_number: 2
                         event_id: "evt_789"
@@ -3350,7 +3351,7 @@ paths:
                   value:
                     id: "atm_123"
                     status: "success"
-                    delivered_at: "2024-01-01T00:00:05Z"
+                    time: "2024-01-01T00:00:05Z"
                     code: "200"
                     attempt_number: 1
                     event_id: "evt_123"

internal/apirouter/log_handlers.go

@@ -86,8 +86,9 @@ func parseIncludeOptions(c *gin.Context) IncludeOptions {
 // APIAttempt is the API response for an attempt
 type APIAttempt struct {
 	ID            string                 `json:"id"`
+	TenantID      string                 `json:"tenant_id"`
 	Status        string                 `json:"status"`
-	DeliveredAt   time.Time              `json:"delivered_at"`
+	Time          time.Time              `json:"time"`
 	Code          string                 `json:"code,omitempty"`
 	ResponseData  map[string]interface{} `json:"response_data,omitempty"`
 	AttemptNumber int                    `json:"attempt_number"`
@@ -101,6 +102,8 @@ type APIAttempt struct {
 // APIEventSummary is the event object when expand=event (without data)
 type APIEventSummary struct {
 	ID               string            `json:"id"`
+	TenantID         string            `json:"tenant_id"`
+	DestinationID    string            `json:"destination_id"`
 	Topic            string            `json:"topic"`
 	Time             time.Time         `json:"time"`
 	EligibleForRetry bool              `json:"eligible_for_retry"`
@@ -110,6 +113,8 @@ type APIEventSummary struct {
 // APIEventFull is the event object when expand=event.data
 type APIEventFull struct {
 	ID               string                 `json:"id"`
+	TenantID         string                 `json:"tenant_id"`
+	DestinationID    string                 `json:"destination_id"`
 	Topic            string                 `json:"topic"`
 	Time             time.Time              `json:"time"`
 	EligibleForRetry bool                   `json:"eligible_for_retry"`
@@ -120,6 +125,8 @@ type APIEventFull struct {
 // APIEvent is the API response for retrieving a single event
 type APIEvent struct {
 	ID               string                 `json:"id"`
+	TenantID         string                 `json:"tenant_id"`
+	DestinationID    string                 `json:"destination_id"`
 	Topic            string                 `json:"topic"`
 	Time             time.Time              `json:"time"`
 	EligibleForRetry bool                   `json:"eligible_for_retry"`
@@ -143,8 +150,9 @@ type EventPaginatedResult struct {
 func toAPIAttempt(ar *logstore.AttemptRecord, opts IncludeOptions) APIAttempt {
 	api := APIAttempt{
 		ID:            ar.Attempt.ID,
+		TenantID:      ar.Attempt.TenantID,
 		Status:        ar.Attempt.Status,
-		DeliveredAt:   ar.Attempt.Time,
+		Time:          ar.Attempt.Time,
 		Code:          ar.Attempt.Code,
 		AttemptNumber: ar.Attempt.AttemptNumber,
 		Manual:        ar.Attempt.Manual,
@@ -160,6 +168,8 @@ func toAPIAttempt(ar *logstore.AttemptRecord, opts IncludeOptions) APIAttempt {
 		if opts.EventData {
 			api.Event = APIEventFull{
 				ID:               ar.Event.ID,
+				TenantID:         ar.Event.TenantID,
+				DestinationID:    ar.Event.DestinationID,
 				Topic:            ar.Event.Topic,
 				Time:             ar.Event.Time,
 				EligibleForRetry: ar.Event.EligibleForRetry,
@@ -169,6 +179,8 @@ func toAPIAttempt(ar *logstore.AttemptRecord, opts IncludeOptions) APIAttempt {
 		} else if opts.Event {
 			api.Event = APIEventSummary{
 				ID:               ar.Event.ID,
+				TenantID:         ar.Event.TenantID,
+				DestinationID:    ar.Event.DestinationID,
 				Topic:            ar.Event.Topic,
 				Time:             ar.Event.Time,
 				EligibleForRetry: ar.Event.EligibleForRetry,
@@ -314,6 +326,8 @@ func (h *LogHandlers) RetrieveEvent(c *gin.Context) {
 	}
 	c.JSON(http.StatusOK, APIEvent{
 		ID:               event.ID,
+		TenantID:         event.TenantID,
+		DestinationID:    event.DestinationID,
 		Topic:            event.Topic,
 		Time:             event.Time,
 		EligibleForRetry: event.EligibleForRetry,
@@ -443,6 +457,8 @@ func (h *LogHandlers) listEventsInternal(c *gin.Context, tenantID string) {
 	for i, e := range response.Data {
 		apiEvents[i] = APIEvent{
 			ID:               e.ID,
+			TenantID:         e.TenantID,
+			DestinationID:    e.DestinationID,
 			Topic:            e.Topic,
 			Time:             e.Time,
 			EligibleForRetry: e.EligibleForRetry,

internal/logstore/chlogstore/chlogstore.go

@@ -2,7 +2,9 @@ package chlogstore
 
 import (
 	"context"
+	"database/sql"
 	"encoding/json"
+	"errors"
 	"fmt"
 	"strconv"
 	"strings"
@@ -527,11 +529,6 @@ func (s *logStoreImpl) RetrieveEvent(ctx context.Context, req driver.RetrieveEve
 	conditions = append(conditions, "event_id = ?")
 	args = append(args, req.EventID)
 
-	if req.DestinationID != "" {
-		conditions = append(conditions, "destination_id = ?")
-		args = append(args, req.DestinationID)
-	}
-
 	whereClause := strings.Join(conditions, " AND ")
 
 	query := fmt.Sprintf(`
@@ -546,22 +543,14 @@ func (s *logStoreImpl) RetrieveEvent(ctx context.Context, req driver.RetrieveEve
 			data
 		FROM %s
 		WHERE %s
-		LIMIT 1`, s.attemptsTable, whereClause)
+		LIMIT 1`, s.eventsTable, whereClause)
 
-	rows, err := s.chDB.Query(ctx, query, args...)
-	if err != nil {
-		return nil, fmt.Errorf("query failed: %w", err)
-	}
-	defer rows.Close()
-
-	if !rows.Next() {
-		return nil, nil
-	}
+	row := s.chDB.QueryRow(ctx, query, args...)
 
 	var metadataStr, dataStr string
 	event := &models.Event{}
 
-	if err := rows.Scan(
+	if err := row.Scan(
 		&event.ID,
 		&event.TenantID,
 		&event.DestinationID,
@@ -571,6 +560,9 @@ func (s *logStoreImpl) RetrieveEvent(ctx context.Context, req driver.RetrieveEve
 		&metadataStr,
 		&dataStr,
 	); err != nil {
+		if errors.Is(err, sql.ErrNoRows) {
+			return nil, nil
+		}
 		return nil, fmt.Errorf("scan failed: %w", err)
 	}
 
@@ -623,15 +615,7 @@ func (s *logStoreImpl) RetrieveAttempt(ctx context.Context, req driver.RetrieveA
 		WHERE %s
 		LIMIT 1`, s.attemptsTable, whereClause)
 
-	rows, err := s.chDB.Query(ctx, query, args...)
-	if err != nil {
-		return nil, fmt.Errorf("query failed: %w", err)
-	}
-	defer rows.Close()
-
-	if !rows.Next() {
-		return nil, nil
-	}
+	row := s.chDB.QueryRow(ctx, query, args...)
 
 	var (
 		eventID          string
@@ -651,7 +635,7 @@ func (s *logStoreImpl) RetrieveAttempt(ctx context.Context, req driver.RetrieveA
 		attemptNumber    uint32
 	)
 
-	err = rows.Scan(
+	err := row.Scan(
 		&eventID,
 		&tenantID,
 		&destinationID,
@@ -669,6 +653,9 @@ func (s *logStoreImpl) RetrieveAttempt(ctx context.Context, req driver.RetrieveA
 		&attemptNumber,
 	)
 	if err != nil {
+		if errors.Is(err, sql.ErrNoRows) {
+			return nil, nil
+		}
 		return nil, fmt.Errorf("scan failed: %w", err)
 	}
 

internal/logstore/driver/driver.go

@@ -61,9 +61,8 @@ type ListAttemptResponse struct {
 }
 
 type RetrieveEventRequest struct {
-	TenantID      string // optional - filter by tenant (if empty, searches all tenants)
-	EventID       string // required
-	DestinationID string // optional - if provided, scopes to that destination
+	TenantID string // optional - filter by tenant (if empty, searches all tenants)
+	EventID  string // required
 }
 
 type RetrieveAttemptRequest struct {

internal/logstore/drivertest/crud.go

@@ -296,17 +296,6 @@ func testCRUD(t *testing.T, newHarness HarnessMaker) {
 			assert.Equal(t, tenantID, retrieved.TenantID)
 		})
 
-		t.Run("RetrieveEvent with destination filter", func(t *testing.T) {
-			retrieved, err := logStore.RetrieveEvent(ctx, driver.RetrieveEventRequest{
-				TenantID:      tenantID,
-				EventID:       knownEventID,
-				DestinationID: destinationIDs[0],
-			})
-			require.NoError(t, err)
-			require.NotNil(t, retrieved)
-			assert.Equal(t, destinationIDs[0], retrieved.DestinationID)
-		})
-
 		t.Run("RetrieveEvent non-existent returns nil", func(t *testing.T) {
 			retrieved, err := logStore.RetrieveEvent(ctx, driver.RetrieveEventRequest{
 				TenantID: tenantID,

internal/logstore/memlogstore/memlogstore.go

@@ -357,9 +357,6 @@ func (s *memLogStore) RetrieveEvent(ctx context.Context, req driver.RetrieveEven
 	if req.TenantID != "" && event.TenantID != req.TenantID {
 		return nil, nil
 	}
-	if req.DestinationID != "" && event.DestinationID != req.DestinationID {
-		return nil, nil
-	}
 	return copyEvent(event), nil
 }