Merge pull request #79 from maguro/v5

Update position to struct

gitlab/payload.go

@@ -314,7 +314,9 @@ type ObjectAttributes struct {
 	ProjectID        int64      `json:"project_id"`
 	CreatedAt        customTime `json:"created_at"`
 	UpdatedAt        customTime `json:"updated_at"`
-	Position        int64      `json:"position"`
+	ChangePosition   Position   `json:"change_position"`
+	OriginalPosition Position   `json:"original_position"`
+	Position         Position   `json:"position"`
 	BranchName       string     `json:"branch_name"`
 	Description      string     `json:"description"`
 	MilestoneID      int64      `json:"milestone_id"`
@@ -354,6 +356,27 @@ type ObjectAttributes struct {
 	Assignee         Assignee   `json:"assignee"`
 }
 
+// Position defines a specific location, identified by paths line numbers and
+// image coordinates, within a specific diff, identified by start, head and
+// base commit ids.
+//
+// Text position will have: new_line and old_line
+// Image position will have: width, height, x, y
+type Position struct {
+	BaseSHA      string `json:"base_sha"`
+	StartSHA     string `json:"start_sha"`
+	HeadSHA      string `json:"head_sha"`
+	OldPath      string `json:"old_path"`
+	NewPath      string `json:"new_path"`
+	PositionType string `json:"position_type"`
+	OldLine      int64  `json:"old_line"`
+	NewLine      int64  `json:"new_line"`
+	Width        int64  `json:"width"`
+	Height       int64  `json:"height"`
+	X            int64  `json:"x"`
+	Y            int64  `json:"y"`
+}
+
 // MergeRequest contains all of the GitLab merge request information
 type MergeRequest struct {
 	ID              int64      `json:"id"`

testdata/gitlab/confidential-issue-event.json

@@ -35,7 +35,36 @@
     "project_id": 14,
     "created_at": "2013-12-03T17:15:43Z",
     "updated_at": "2013-12-03T17:15:43Z",
-    "position": 0,
+    "change_position": {
+      "base_sha": null,
+      "start_sha": null,
+      "head_sha": null,
+      "old_path": null,
+      "new_path": null,
+      "position_type": "text",
+      "old_line": null,
+      "new_line": null
+    },
+    "original_position": {
+      "base_sha": "0a87d409a2d5ffbf586ed3e7ff36396ca59c3c14",
+      "start_sha": "5f7519856cb2a7c05427a8c1e83f941828567923",
+      "head_sha": "562e173be03b8ff2efb05345d12df18815438a4b",
+      "old_path": "core/src/main/java/com/example/server/CorbaServer.java",
+      "new_path": "core/src/main/java/com/example/server/CorbaServer.java",
+      "position_type": "text",
+      "old_line": null,
+      "new_line": 74
+    },
+    "position": {
+      "base_sha": "0a87d409a2d5ffbf586ed3e7ff36396ca59c3c14",
+      "start_sha": "5f7519856cb2a7c05427a8c1e83f941828567923",
+      "head_sha": "562e173be03b8ff2efb05345d12df18815438a4b",
+      "old_path": "core/src/main/java/com/example/server/CorbaServer.java",
+      "new_path": "core/src/main/java/com/example/server/CorbaServer.java",
+      "position_type": "text",
+      "old_line": null,
+      "new_line": 74
+    },
     "branch_name": null,
     "description": "Create new API for manipulations with repository",
     "milestone_id": null,

testdata/gitlab/issue-event.json

@@ -35,7 +35,36 @@
     "project_id": 14,
     "created_at": "2013-12-03T17:15:43Z",
     "updated_at": "2013-12-03T17:15:43Z",
-    "position": 0,
+    "change_position": {
+      "base_sha": null,
+      "start_sha": null,
+      "head_sha": null,
+      "old_path": null,
+      "new_path": null,
+      "position_type": "text",
+      "old_line": null,
+      "new_line": null
+    },
+    "original_position": {
+      "base_sha": "0a87d409a2d5ffbf586ed3e7ff36396ca59c3c14",
+      "start_sha": "5f7519856cb2a7c05427a8c1e83f941828567923",
+      "head_sha": "562e173be03b8ff2efb05345d12df18815438a4b",
+      "old_path": "core/src/main/java/com/example/server/CorbaServer.java",
+      "new_path": "core/src/main/java/com/example/server/CorbaServer.java",
+      "position_type": "text",
+      "old_line": null,
+      "new_line": 74
+    },
+    "position": {
+      "base_sha": "0a87d409a2d5ffbf586ed3e7ff36396ca59c3c14",
+      "start_sha": "5f7519856cb2a7c05427a8c1e83f941828567923",
+      "head_sha": "562e173be03b8ff2efb05345d12df18815438a4b",
+      "old_path": "core/src/main/java/com/example/server/CorbaServer.java",
+      "new_path": "core/src/main/java/com/example/server/CorbaServer.java",
+      "position_type": "text",
+      "old_line": null,
+      "new_line": 74
+    },
     "branch_name": null,
     "description": "Create new API for manipulations with repository",
     "milestone_id": null,