#9 #14 Generate event ID; fix typo leading to wrong pull request URLs in

JIRA

Author: dka23

src/main/java/com/dkaedv/glghproxy/controller/ReposController.java

@@ -135,7 +135,7 @@ public PullRequest getPull(
 		GitlabAPI api = gitlab.connect(authorization);
 		GitlabMergeRequest mergeRequest = findMergeRequestByProjectAndIid(namespace, repo, id, api);
 
-		return GitlabToGithubConverter.convertMergeRequest(mergeRequest, authorization, namespace, repo);
+		return GitlabToGithubConverter.convertMergeRequest(mergeRequest, gitlabUrl, namespace, repo);
 	}
 
 

src/main/java/com/dkaedv/glghproxy/converter/GitlabToGithubConverter.java

@@ -365,6 +365,8 @@ private static Event convertMergeRequestToEvent(GitlabMergeRequest glmergereques
 		payload.setNumber(payload.getPullRequest().getNumber());
 
 		event.setPayload(payload);
+		
+		event.setId(glmergerequest.getId() + "-" + glmergerequest.getUpdatedAt().getTime());
 
 		return event;
 	}