Fix: Pull Requests merge errors (#8302)

* Fix: Pull Requests merge errors * CR Fixes
treeverse · Oct 30, 2024 · 042f3b5 · 042f3b5
1 parent c2e44a0
commit 042f3b5
Show file tree

Hide file tree

Showing 2 changed files with 36 additions and 6 deletions.
diff --git a/pkg/api/controller.go b/pkg/api/controller.go
@@ -5383,12 +5383,6 @@ func (c *Controller) MergePullRequest(w http.ResponseWriter, r *http.Request, re
 
 	// Attempt to merge branches
 	reference, err := c.Catalog.Merge(ctx, repository, pr.Destination, pr.Source, user.Committer(), "", nil, "")
-	if errors.Is(err, graveler.ErrConflictFound) {
-		writeResponse(w, r, http.StatusConflict, apigen.MergeResult{
-			Reference: reference,
-		})
-		return
-	}
 	if c.handleAPIError(ctx, w, r, err) {
 		return
 	}

diff --git a/pkg/api/controller_test.go b/pkg/api/controller_test.go
@@ -5906,6 +5906,42 @@ func TestController_MergePullRequest(t *testing.T) {
 		require.NotNil(t, getResp.JSON200.ClosedDate)
 		require.True(t, time.Now().Sub(*getResp.JSON200.ClosedDate) < 1*time.Minute)
 	})
+
+	t.Run("conflict", func(t *testing.T) {
+		body := apigen.CreatePullRequestJSONRequestBody{
+			Description:       swag.String("My description"),
+			DestinationBranch: "main",
+			SourceBranch:      "branch_e",
+			Title:             "My title",
+		}
+		branchResp, err := clt.CreateBranchWithResponse(ctx, repo, apigen.CreateBranchJSONRequestBody{
+			Name:   body.SourceBranch,
+			Source: "main",
+		})
+		require.NoError(t, err)
+		require.Equal(t, http.StatusCreated, branchResp.StatusCode())
+
+		err = deps.catalog.CreateEntry(ctx, repo, body.SourceBranch, catalog.DBEntry{Path: "foo/bar2", PhysicalAddress: "bar2addr", CreationDate: time.Now(), Size: 1, Checksum: "cksum1"})
+		require.NoError(t, err)
+		_, err = deps.catalog.Commit(ctx, repo, body.SourceBranch, "some message", DefaultUserID, nil, nil, nil, false)
+		require.NoError(t, err)
+
+		err = deps.catalog.CreateEntry(ctx, repo, body.DestinationBranch, catalog.DBEntry{Path: "foo/bar2", PhysicalAddress: "bar2addr2", CreationDate: time.Now(), Size: 2, Checksum: "cksum2"})
+		require.NoError(t, err)
+		_, err = deps.catalog.Commit(ctx, repo, body.DestinationBranch, "some message", DefaultUserID, nil, nil, nil, false)
+		require.NoError(t, err)
+
+		resp, err := clt.CreatePullRequestWithResponse(ctx, repo, body)
+		require.NoError(t, err)
+		require.NotNil(t, resp.JSON201, resp.Status())
+
+		// Update with wrong status
+		mergeResp, err := clt.MergePullRequestWithResponse(ctx, repo, resp.JSON201.Id)
+		require.NoError(t, err)
+		require.NotNil(t, mergeResp.JSON409, mergeResp.Status())
+		require.NotNil(t, mergeResp.Body)
+		require.Contains(t, string(mergeResp.Body), "conflict")
+	})
 }
 
 // pollRestoreStatus polls the restore status endpoint until the restore is complete or times out.