Merge pull request #11 from zapier/fix-queue

Prevent Gitlab MR events from being dropped
zapier · Jan 5, 2023 · 7426773 · 7426773
2 parents 43d7dd9 + 85e5b3a
commit 7426773
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 9 deletions.
diff --git a/pkg/gitlab_hooks/hook_worker.go b/pkg/gitlab_hooks/hook_worker.go
@@ -38,15 +38,11 @@ func NewGitlabEventWorker(h *GitlabHooksHandler, js nats.JetStreamContext) *Gitl
 }
 
 func (w *GitlabEventWorker) processNoteEventStreamMsg(msg *NoteEventMsg) error {
-
-	w.processNoteEvent(msg)
-
-	return nil
+	_, err := w.processNoteEvent(msg)
+	return err
 }
 
 func (w *GitlabEventWorker) processMREventStreamMsg(msg *MergeRequestEventMsg) error {
-
-	w.processMergeRequestEvent(msg)
-
-	return nil
+	_, err := w.processMergeRequestEvent(msg)
+	return err
 }
diff --git a/pkg/gitlab_hooks/stream_msgs.go b/pkg/gitlab_hooks/stream_msgs.go
@@ -82,7 +82,7 @@ type MergeRequestEventMsg struct {
 }
 
 func (e *MergeRequestEventMsg) GetId() string {
-	return fmt.Sprintf("%d", e.payload.ObjectAttributes.ID)
+	return fmt.Sprintf("%d-%s", e.payload.ObjectAttributes.ID, e.payload.ObjectAttributes.Action)
 }
 
 func (e *MergeRequestEventMsg) DecodeEventData(b []byte) error {