Merge pull request #561 from se7entyse7en/merge-field-removal

se7entyse7en · web-flow · commit 69f73be524b2 · 2019-02-26T22:40:57.000+01:00
Updates lookout-sdk 0.4.1 -&gt; 0.5.0 and removes references to merge field
diff --git a/Gopkg.lock b/Gopkg.lock
diff --git a/Gopkg.toml b/Gopkg.toml
@@ -67,7 +67,7 @@
 
 [[constraint]]
   name = "gopkg.in/src-d/lookout-sdk.v0"
-  version = "0.4.1"
+  version = "0.5.0"
 
 [[constraint]]
   name = "github.com/sanity-io/litter"
diff --git a/cmd/lookout-sdk/review.go b/cmd/lookout-sdk/review.go
@@ -75,7 +75,6 @@ func (c *ReviewCommand) Execute(args []string) error {
 			UpdatedAt:   time.Now(),
 			IsMergeable: true,
 			Source:      *toRef,
-			Merge:       *toRef,
 			CommitRevision: lookout.CommitRevision{
 				Base: *fromRef,
 				Head: *toRef,
diff --git a/provider/github/utils.go b/provider/github/utils.go
@@ -77,11 +77,6 @@ func castPullRequest(ctx context.Context, r *repositoryInfo, pr *github.PullRequ
 	pre.Number = uint32(pr.GetNumber())
 	pre.RepositoryID = uint32(pr.GetHead().GetRepo().GetID())
 	pre.Source = castPullRequestBranch(ctx, pr.GetHead())
-	pre.Merge = lookout.ReferencePointer{
-		InternalRepositoryURL: r.CloneURL,
-		ReferenceName:         plumbing.ReferenceName(fmt.Sprintf("refs/pull/%d/merge", pr.GetNumber())),
-		Hash:                  pr.GetMergeCommitSHA(),
-	}
 
 	pre.Base = castPullRequestBranch(ctx, pr.GetBase())
 	pre.Head = lookout.ReferencePointer{
diff --git a/server/server_test.go b/server/server_test.go
@@ -28,11 +28,6 @@ func correctReviewEvent() *lookout.ReviewEvent {
 				ReferenceName:         "feature",
 				Hash:                  "source-hash",
 			},
-			Merge: lookout.ReferencePointer{
-				InternalRepositoryURL: "file:///test",
-				ReferenceName:         "merge-branch",
-				Hash:                  "merge-hash",
-			},
 			CommitRevision: lookout.CommitRevision{
 				Base: lookout.ReferencePointer{
 					InternalRepositoryURL: "file:///test",
diff --git a/store/migrations/1550864142_remove_merge_field.down.sql b/store/migrations/1550864142_remove_merge_field.down.sql
@@ -0,0 +1,5 @@
+BEGIN;
+
+ALTER TABLE review_event ADD COLUMN merge jsonb NOT NULL;
+
+COMMIT;
diff --git a/store/migrations/1550864142_remove_merge_field.up.sql b/store/migrations/1550864142_remove_merge_field.up.sql
@@ -0,0 +1,5 @@
+BEGIN;
+
+ALTER TABLE review_event DROP COLUMN merge;
+
+COMMIT;
diff --git a/store/migrations/lock.json b/store/migrations/lock.json
@@ -253,14 +253,6 @@
           "NotNull": true,
           "Unique": false
         },
-        {
-          "Name": "merge",
-          "Type": "jsonb",
-          "PrimaryKey": false,
-          "Reference": null,
-          "NotNull": true,
-          "Unique": false
-        },
         {
           "Name": "configuration",
           "Type": "jsonb",
diff --git a/store/models/kallax.go b/store/models/kallax.go
diff --git a/store/models/models.go b/store/models/models.go
@@ -7,7 +7,7 @@ import (
 
 	"github.com/gogo/protobuf/types"
 	"github.com/src-d/lookout"
-	kallax "gopkg.in/src-d/go-kallax.v1"
+	"gopkg.in/src-d/go-kallax.v1"
 )
 
 // ReviewEvent is a persisted model for review event
@@ -20,7 +20,6 @@ type ReviewEvent struct {
 	// those fields can change with each push
 	IsMergeable   bool
 	Source        lookout.ReferencePointer
-	Merge         lookout.ReferencePointer
 	Configuration types.Struct
 	Base          lookout.ReferencePointer
 	Head          lookout.ReferencePointer
@@ -38,7 +37,6 @@ func newReviewEvent(e *lookout.ReviewEvent) *ReviewEvent {
 		InternalID:    e.ID().String(),
 		IsMergeable:   e.IsMergeable,
 		Source:        e.Source,
-		Merge:         e.Merge,
 		Configuration: e.Configuration,
 		Base:          e.Base,
 		Head:          e.Head,
diff --git a/store/packed_migrations.go b/store/packed_migrations.go
diff --git a/vendor/gopkg.in/src-d/lookout-sdk.v0/pb/event.pb.go b/vendor/gopkg.in/src-d/lookout-sdk.v0/pb/event.pb.go

-Original file line number
+Diff line change
@@ @@ -0,0 +1,5 @@ @@
 +BEGIN;
++
 +ALTER TABLE review_event ADD COLUMN merge jsonb NOT NULL;
++
 +COMMIT;