From d1f22d8c896c4652cac743391f6d0b4e30622917 Mon Sep 17 00:00:00 2001
From: Greg Messner <greg@messners.com>
Date: Sun, 8 Mar 2020 17:17:25 -0700
Subject: [PATCH] Added support for external issue IDs (#528)

---
 .../java/org/gitlab4j/api/models/Issue.java   | 48 +++++++++++++++++--
 .../org/gitlab4j/api/TestGitLabApiBeans.java  |  6 +++
 .../org/gitlab4j/api/issues-closed-by-mr.json | 42 ++++++++++++++++
 3 files changed, 93 insertions(+), 3 deletions(-)
 create mode 100644 src/test/resources/org/gitlab4j/api/issues-closed-by-mr.json

diff --git a/src/main/java/org/gitlab4j/api/models/Issue.java b/src/main/java/org/gitlab4j/api/models/Issue.java
index 77f8e0f3..86a09581 100644
--- a/src/main/java/org/gitlab4j/api/models/Issue.java
+++ b/src/main/java/org/gitlab4j/api/models/Issue.java
@@ -7,6 +7,12 @@ import java.util.List;
 import org.gitlab4j.api.Constants.IssueState;
 import org.gitlab4j.api.utils.JacksonJson;
 
+import com.fasterxml.jackson.annotation.JsonIgnore;
+import com.fasterxml.jackson.annotation.JsonProperty;
+import com.fasterxml.jackson.databind.node.IntNode;
+import com.fasterxml.jackson.databind.node.TextNode;
+import com.fasterxml.jackson.databind.node.ValueNode;
+
 public class Issue {
 
     public static class TaskCompletionStatus {
@@ -46,7 +52,14 @@ public class Issue {
     private User closedBy;
     private String description;
     private Date dueDate;
+
+    @JsonProperty("id")
+    private ValueNode actualId;
+    @JsonIgnore
+    private String externalId;
+    @JsonIgnore
     private Integer id;
+
     private Integer iid;
     private Integer issueLinkId;
     private List<String> labels;
@@ -121,15 +134,44 @@ public class Issue {
     }
 
     public void setDueDate(Date dueDate) {
-        this.dueDate = dueDate;
+	this.dueDate = dueDate;
+    }
+
+    public ValueNode getActualId() {
+        return actualId;
+    }
+
+    public void setActualId(ValueNode id) {
+	actualId = id;
+        if (actualId instanceof TextNode) {
+            externalId = actualId.asText();
+        } else if (actualId instanceof IntNode) {
+            this.id = actualId.asInt();
+        }
     }
 
     public Integer getId() {
-        return id;
+        return (id);
     }
 
     public void setId(Integer id) {
-        this.id = id;
+	this.id = id;
+	if (id != null) {
+	    actualId = new IntNode(id);
+	    externalId = null;
+	}
+    }
+
+    public String getExternalId() {
+        return (externalId);
+    }
+
+    public void setExternalId(String externalId) {
+        this.externalId = externalId;
+	if (externalId != null) {
+	    actualId = new TextNode(externalId);
+	    id = null;
+	}
     }
 
     public Integer getIid() {
diff --git a/src/test/java/org/gitlab4j/api/TestGitLabApiBeans.java b/src/test/java/org/gitlab4j/api/TestGitLabApiBeans.java
index b2906f64..319b4b11 100644
--- a/src/test/java/org/gitlab4j/api/TestGitLabApiBeans.java
+++ b/src/test/java/org/gitlab4j/api/TestGitLabApiBeans.java
@@ -296,6 +296,12 @@ public class TestGitLabApiBeans {
         assertTrue(compareJson(issueLink, "issue-link.json"));
     }
 
+    @Test
+    public void testIssuesClosedBy() throws Exception {
+        List<Issue> issues = unmarshalResourceList(Issue.class, "issues-closed-by-mr.json");
+        assertTrue(compareJson(issues, "issues-closed-by-mr.json"));
+    }
+
     @Test
     public void testLabelEvents() throws Exception {
         List<LabelEvent> events = unmarshalResourceList(LabelEvent.class, "label-events.json");
diff --git a/src/test/resources/org/gitlab4j/api/issues-closed-by-mr.json b/src/test/resources/org/gitlab4j/api/issues-closed-by-mr.json
new file mode 100644
index 00000000..28c43547
--- /dev/null
+++ b/src/test/resources/org/gitlab4j/api/issues-closed-by-mr.json
@@ -0,0 +1,42 @@
+[
+   {
+      "state" : "opened",
+      "description" : "Ratione dolores corrupti mollitia soluta quia.",
+      "author" : {
+         "state" : "active",
+         "id" : 18,
+         "web_url" : "https://gitlab.example.com/eileen.lowe",
+         "name" : "Alexandra Bashirian",
+         "username" : "eileen.lowe"
+      },
+      "milestone" : {
+         "project_id" : 1,
+         "description" : "Ducimus nam enim ex consequatur cumque ratione.",
+         "state" : "closed",
+         "iid" : 2,
+         "created_at" : "2016-01-04T15:31:39.996Z",
+         "title" : "v4.0",
+         "id" : 17,
+         "updated_at" : "2016-01-04T15:31:39.996Z"
+      },
+      "project_id" : 1,
+      "assignee" : {
+         "state" : "active",
+         "id" : 1,
+         "name" : "Administrator",
+         "web_url" : "https://gitlab.example.com/root",
+         "username" : "root"
+      },
+      "updated_at" : "2016-01-04T15:31:51.081Z",
+      "id" : 76,
+      "title" : "Consequatur vero maxime deserunt laboriosam est voluptas dolorem.",
+      "created_at" : "2016-01-04T15:31:51.081Z",
+      "iid" : 6,
+      "labels" : [],
+      "user_notes_count": 1
+   },
+   {
+       "id" : "PROJECT-123",
+       "title" : "Title of this Jira issue"
+   }
+]
\ No newline at end of file
-- 
GitLab