Fixed issue with retrigger events when events have multiple versions

Xemdo · Xemdo · commit 3a54ac9cd37c · 2023-06-28T16:47:03.000-07:00
diff --git a/internal/events/trigger/retrigger_event.go b/internal/events/trigger/retrigger_event.go
@@ -23,13 +23,13 @@ func RefireEvent(id string, p TriggerParameters) (string, error) {
 
 	p.Transport = res.Transport
 
-	var previousEventObj models.EventsubSubscription
+	var previousEventObj models.EventsubResponse
 	err = json.Unmarshal([]byte(res.JSON), &previousEventObj)
 	if err != nil {
 		return "", fmt.Errorf("Unable to parse previous event's JSON from database: %v", err.Error())
 	}
 
-	e, err := types.GetByTriggerAndTransportAndVersion(res.Event, p.Transport, previousEventObj.Version)
+	e, err := types.GetByTriggerAndTransportAndVersion(res.Event, p.Transport, previousEventObj.Subscription.Version)
 	if err != nil {
 		return "", err
 	}

Original file line number	Diff line number	Diff line change
`@@ -23,13 +23,13 @@ func RefireEvent(id string, p TriggerParameters) (string, error) {`
`23`	`23`
`24`	`24`	`p.Transport = res.Transport`
`25`	`25`
`26`		`- var previousEventObj models.EventsubSubscription`
	`26`	`+ var previousEventObj models.EventsubResponse`
`27`	`27`	`err = json.Unmarshal([]byte(res.JSON), &previousEventObj)`
`28`	`28`	`if err != nil {`
`29`	`29`	`return "", fmt.Errorf("Unable to parse previous event's JSON from database: %v", err.Error())`
`30`	`30`	`}`
`31`	`31`
`32`		`- e, err := types.GetByTriggerAndTransportAndVersion(res.Event, p.Transport, previousEventObj.Version)`
	`32`	`+ e, err := types.GetByTriggerAndTransportAndVersion(res.Event, p.Transport, previousEventObj.Subscription.Version)`
`33`	`33`	`if err != nil {`
`34`	`34`	`return "", err`
`35`	`35`	`}`