feat: push event (#65)

* feat: push event

* fix: obsolete code deleted

Author: Gasoid

commands.go

@@ -7,7 +7,6 @@ import (
 	"path"
 	"strconv"
 	"strings"
-	"time"
 
 	"github.com/gasoid/merge-bot/handlers"
 	"github.com/gasoid/merge-bot/logger"
@@ -22,6 +21,7 @@ func init() {
 	handle(webhook.OnNewMR, NewMR)
 	handle(webhook.OnMerge, MergeEvent)
 	handle(webhook.OnUpdate, UpdateEvent)
+	handle(webhook.OnCommit, PushEvent)
 }
 
 const success = "You can merge, LGTM :D"
@@ -123,12 +123,11 @@ func UpdateEvent(command *handlers.Request, args string) error {
 		}
 	}
 
-	parsedTime, err := time.Parse("2006-01-02 15:04:05 UTC", args)
-	if err != nil {
-		return fmt.Errorf("time.Parse returns err: %w", err)
-	}
+	return nil
+}
 
-	if err := command.ResetApprovals(parsedTime); err != nil {
+func PushEvent(command *handlers.Request, args string) error {
+	if err := command.ResetApprovals(); err != nil {
 		return fmt.Errorf("command.ResetApprovals returns err: %w", err)
 	}
 

go.mod

@@ -3,7 +3,6 @@ module github.com/gasoid/merge-bot
 go 1.25.1
 
 require (
-	github.com/codeGROOVE-dev/retry v1.3.0
 	github.com/dustin/go-humanize v1.0.1
 	github.com/getsentry/sentry-go v0.33.0
 	github.com/getsentry/sentry-go/echo v0.33.0

go.sum

@@ -2,8 +2,6 @@ github.com/beorn7/perks v1.0.1 h1:VlbKKnNfV8bJzeqoa4cOKqO6bYr3WgKZxO8Z16+hsOM=
 github.com/beorn7/perks v1.0.1/go.mod h1:G2ZrVWU2WbWT9wwq4/hrbKbnv/1ERSJQ0ibhJ6rlkpw=
 github.com/cespare/xxhash/v2 v2.3.0 h1:UL815xU9SqsFlibzuggzjXhog7bL6oX9BbNZnL2UFvs=
 github.com/cespare/xxhash/v2 v2.3.0/go.mod h1:VGX0DQ3Q6kWi7AoAeZDth3/j3BFtOZR5XLFGgcrjCOs=
-github.com/codeGROOVE-dev/retry v1.3.0 h1:/+ipAWRJLL6y1R1vprYo0FSjSBvH6fE5j9LKXjpD54g=
-github.com/codeGROOVE-dev/retry v1.3.0/go.mod h1:8OgefgV1XP7lzX2PdKlCXILsYKuz6b4ZpHa/20iLi8E=
 github.com/davecgh/go-spew v1.1.1 h1:vj9j/u1bqnvCEfJOwUhtlOARqs3+rkHYY13jYWTU97c=
 github.com/davecgh/go-spew v1.1.1/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38=
 github.com/dustin/go-humanize v1.0.1 h1:GzkhY7T5VNhEkwH0PVJgjz+fX1rhBrR7pRT3mDkpeCY=

handlers/gitlab/gitlab.go

@@ -6,7 +6,6 @@ import (
 	"fmt"
 	"net/http"
 	"slices"
-	"strings"
 	"sync"
 	"time"
 
@@ -556,7 +555,7 @@ func (g GitlabProvider) getToken(projectId int, name string) (string, error) {
 	return resultToken.Token, nil
 }
 
-func (g GitlabProvider) ResetApprovals(projectId, mergeId int, updatedAt time.Time, config handlers.ResetApprovalsOnPush) error {
+func (g GitlabProvider) ResetApprovals(projectId, mergeId int, config handlers.ResetApprovalsOnPush) error {
 	logger.Debug("gitlab resetApprovals", "mergeId", mergeId)
 
 	if config.IssueToken {
@@ -568,30 +567,16 @@ func (g GitlabProvider) ResetApprovals(projectId, mergeId int, updatedAt time.Ti
 		g.client = newGitlabClient(token, gitlabURL)
 	}
 
-	for note := range g.listMergeRequestNotes(projectId, mergeId, getApprovalsSize, sortDesc) {
-		if !note.System {
-			continue
-		}
-
-		if note.UpdatedAt.After(updatedAt) {
-			continue
-		}
-
-		if strings.Contains(note.Body, "commit") {
-			_, err := g.client.MergeRequestApprovals.ResetApprovalsOfMergeRequest(projectId, mergeId)
-			if err != nil {
-				return err
-			}
-
-			if err := g.LeaveComment(projectId, mergeId, approvalsResetMessage); err != nil {
-				return err
-			}
+	_, err := g.client.MergeRequestApprovals.ResetApprovalsOfMergeRequest(projectId, mergeId)
+	if err != nil {
+		return err
+	}
 
-			return nil
-		}
+	if err := g.LeaveComment(projectId, mergeId, approvalsResetMessage); err != nil {
+		return err
 	}
 
-	return handlers.CommitNotFoundError
+	return nil
 }
 
 func newGitlabClient(token, instanceUrl string) *gitlab.Client {

handlers/provider.go

@@ -2,7 +2,6 @@ package handlers
 
 import (
 	"sync"
-	"time"
 )
 
 const (
@@ -72,7 +71,7 @@ type MergeRequest interface {
 	FindMergeRequests(projectId int, targetBranch, label string) ([]MR, error)
 	UpdateFromMaster(projectId, mergeId int) error
 	AssignLabel(projectId, mergeId int, name, color string) error
-	ResetApprovals(projectId, mergeId int, updatedAt time.Time, config ResetApprovalsOnPush) error
+	ResetApprovals(projectId, mergeId int, config ResetApprovalsOnPush) error
 }
 
 type Project interface {

handlers/request.go

@@ -2,13 +2,10 @@ package handlers
 
 import (
 	"bytes"
-	"errors"
 	"fmt"
 	"html/template"
 	"strings"
-	"time"
 
-	"github.com/codeGROOVE-dev/retry"
 	"github.com/gasoid/merge-bot/logger"
 	"github.com/gasoid/merge-bot/metrics"
 	"github.com/gasoid/merge-bot/semaphore"
@@ -251,8 +248,8 @@ func (r Request) RerunPipeline(pipelineId int) (string, error) {
 	return r.provider.RerunPipeline(r.info.ProjectId, pipelineId, r.info.SourceBranch)
 }
 
-func (r Request) ResetApprovals(updatedAt time.Time) error {
-	logger.Debug("resetApprovals", "updatedAt", updatedAt)
+func (r Request) ResetApprovals() error {
+	logger.Debug("resetApprovals")
 
 	if !r.config.Rules.ResetApprovalsOnPush.Enabled {
 		return nil
@@ -262,20 +259,10 @@ func (r Request) ResetApprovals(updatedAt time.Time) error {
 		return nil
 	}
 
-	err := retry.Do(
-		func() error {
-			return r.provider.ResetApprovals(
-				r.info.ProjectId,
-				r.info.Id, updatedAt,
-				r.config.Rules.ResetApprovalsOnPush)
-		},
-		retry.Attempts(3),
-	)
-	if !errors.Is(err, CommitNotFoundError) {
-		return err
-	}
-
-	return nil
+	return r.provider.ResetApprovals(
+		r.info.ProjectId,
+		r.info.Id,
+		r.config.Rules.ResetApprovalsOnPush)
 }
 
 func (r Request) ValidateSecret(secret string) bool {

handlers/request_test.go

@@ -2,7 +2,6 @@ package handlers
 
 import (
 	"testing"
-	"time"
 
 	"github.com/stretchr/testify/assert"
 )
@@ -100,7 +99,7 @@ func (p *testProvider) RerunPipeline(projectId, pipelineId int, ref string) (str
 	return "", p.err
 }
 
-func (p *testProvider) ResetApprovals(projectId, mergeId int, updatedAt time.Time, config ResetApprovalsOnPush) error {
+func (p *testProvider) ResetApprovals(projectId, mergeId int, config ResetApprovalsOnPush) error {
 	return p.err
 }
 

webhook/gitlab/gitlab.go

@@ -1,7 +1,6 @@
 package gitlab
 
 import (
-	"fmt"
 	"io"
 	"net/http"
 	"strings"
@@ -15,6 +14,7 @@ const (
 	mergeAction  = "merge"
 	openAction   = "open"
 	updateAction = "update"
+	pushAction   = "push"
 )
 
 func init() {
@@ -76,7 +76,13 @@ func (g *GitlabProvider) ParseRequest(request *http.Request) error {
 	if mr, ok = event.(*gitlab.MergeEvent); ok {
 		g.projectId = mr.Project.ID
 		g.id = mr.ObjectAttributes.IID
-		g.action = mr.ObjectAttributes.Action
+
+		if mr.ObjectAttributes.OldRev != "" {
+			g.action = pushAction
+		} else {
+			g.action = mr.ObjectAttributes.Action
+		}
+
 		g.updatedAt = mr.ObjectAttributes.UpdatedAt
 	}
 
@@ -86,16 +92,15 @@ func (g *GitlabProvider) ParseRequest(request *http.Request) error {
 func (g *GitlabProvider) GetCmd() string {
 	logger.Debug("getCmd", "action", g.action)
 
-	if g.action == mergeAction {
+	switch g.action {
+	case mergeAction:
 		return webhook.OnMerge
-	}
-
-	if g.action == openAction {
+	case openAction:
 		return webhook.OnNewMR
-	}
-
-	if g.action == updateAction {
-		return fmt.Sprintf("%s %s", webhook.OnUpdate, g.updatedAt)
+	case updateAction:
+		return webhook.OnUpdate
+	case pushAction:
+		return webhook.OnCommit
 	}
 
 	logger.Debug("getCmd", "note", g.note)

webhook/webhook.go

@@ -10,6 +10,7 @@ const (
 	OnNewMR     = "\anewMREvent"
 	OnMerge     = "\amergeEvent"
 	OnUpdate    = "\aupdateEvent"
+	OnCommit    = "\acommitEvent"
 	spaceSymbol = " "
 )