Add suggested changes

Author: LINCKODE

log-events-consumer/domain/log_event.go

@@ -513,7 +513,7 @@ func handleOracleQueryStatusChange(lee *LogEventElastic, body map[string]any) er
 	if !ok {
 		return fmt.Errorf("missing or invalid query id")
 	}
-	lee.QueryID, err = toUint64(qi)
+	lee.QueryId, err = toUint64(qi)
 	if err != nil {
 		return fmt.Errorf("converting query id: %w", err)
 	}
@@ -540,9 +540,9 @@ func handleOracleQueryStatusChange(lee *LogEventElastic, body map[string]any) er
 	if !ok {
 		return fmt.Errorf("missing or invalid query status")
 	}
-	qsv := getOracleQueryStatusValue(qs)
-	if qsv == 0 {
-		return fmt.Errorf("invalid query status: %s(%d)", qs, qsv)
+	qsv, err := getOracleQueryStatusValue(qs)
+	if err != nil {
+		return fmt.Errorf("invalid query status: %w", err)
 	}
 	lee.QueryStatus = &qsv
 
@@ -556,7 +556,7 @@ func handleOracleSubscriberLogMessage(lee *LogEventElastic, body map[string]any)
 	if !ok {
 		return fmt.Errorf("missing or invalid subscription id")
 	}
-	lee.SubscriptionID, err = toUint32(sid)
+	lee.SubscriptionId, err = toUint32(sid)
 	if err != nil {
 		return fmt.Errorf("converting subscription id: %w", err)
 	}
@@ -617,20 +617,20 @@ func handleCustomMessage(lee *LogEventElastic, body map[string]any) error {
 	return nil
 }
 
-func getOracleQueryStatusValue(status string) int16 {
+func getOracleQueryStatusValue(status string) (int16, error) {
 	switch status {
 	case "pending":
-		return 1
+		return 1, nil
 	case "committed":
-		return 2
+		return 2, nil
 	case "success":
-		return 3
+		return 3, nil
 	case "timeout":
-		return 4
+		return 4, nil
 	case "unresolvable":
-		return 5
+		return 5, nil
 	default:
-		return 0
+		return 0, fmt.Errorf("unexpected oracle query status value: %s", status)
 	}
 }
 

log-events-consumer/domain/log_event_elastic.go

@@ -53,10 +53,10 @@ type LogEventElastic struct {
 	CustomMessage            *uint64 `json:"customMessage,omitempty"`
 	RawPayload               []byte  `json:"rawPayload,omitempty"`
 	QueryingEntity           string  `json:"queryingEntity,omitempty"`
-	QueryID                  *uint64 `json:"queryId,omitempty"`
+	QueryId                  *uint64 `json:"queryId,omitempty"`
 	QueryType                *int16  `json:"queryType,omitempty"`
 	QueryStatus              *int16  `json:"queryStatus,omitempty"`
-	SubscriptionID           *uint32 `json:"subscriptionId,omitempty"`
+	SubscriptionId           *uint32 `json:"subscriptionId,omitempty"`
 	InterfaceIndex           *uint64 `json:"interfaceIndex,omitempty"`
 	PeriodMillis             *uint64 `json:"periodMillis,omitempty"`
 	FirstQueryTimestamp      *uint64 `json:"firstQueryTimestamp,omitempty"`

log-events-consumer/domain/log_event_test.go

@@ -170,22 +170,29 @@ func TestLogEvent_IsSupported(t *testing.T) {
 
 func TestGetOracleQueryStatusValue(t *testing.T) {
 	tests := []struct {
-		input    string
-		expected int16
+		input       string
+		expected    int16
+		shouldError bool
 	}{
-		{"pending", 1},
-		{"committed", 2},
-		{"success", 3},
-		{"timeout", 4},
-		{"unresolvable", 5},
-		{"unknown", 0},
-		{"", 0},
-		{"PENDING", 0},
+		{"pending", 1, false},
+		{"committed", 2, false},
+		{"success", 3, false},
+		{"timeout", 4, false},
+		{"unresolvable", 5, false},
+		{"unknown", 0, true},
+		{"", 0, true},
+		{"PENDING", 0, true},
+		{"otherstatus", 0, true},
 	}
 
 	for _, tt := range tests {
 		t.Run(tt.input, func(t *testing.T) {
-			got := getOracleQueryStatusValue(tt.input)
+			got, err := getOracleQueryStatusValue(tt.input)
+			if tt.shouldError {
+				require.Error(t, err)
+			} else {
+				require.NoError(t, err)
+			}
 			if got != tt.expected {
 				t.Errorf("getOracleQueryStatusValue(%q) = %d, want %d", tt.input, got, tt.expected)
 			}