#6 Support user retrieval

Author: dka23

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

@@ -6,9 +6,13 @@
 import org.apache.commons.logging.Log;
 import org.apache.commons.logging.LogFactory;
 import org.eclipse.egit.github.core.Repository;
+import org.eclipse.egit.github.core.User;
 import org.gitlab.api.GitlabAPI;
 import org.gitlab.api.models.GitlabProject;
+import org.gitlab.api.models.GitlabUser;
 import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.http.HttpStatus;
+import org.springframework.http.ResponseEntity;
 import org.springframework.stereotype.Controller;
 import org.springframework.web.bind.annotation.PathVariable;
 import org.springframework.web.bind.annotation.RequestHeader;
@@ -43,4 +47,19 @@ public List<Repository> getReposForUser(
 		return GitlabToGithubConverter.convertRepositories(projects);
 	}
 
+	@RequestMapping("/{username}")
+	public ResponseEntity<User> getUser(
+			@PathVariable String username,
+			@RequestHeader("Authorization") String authorization) throws IOException {
+
+		GitlabAPI api = gitlab.connect(authorization);
+		List<GitlabUser> users = api.findUsers(username);
+		
+		if (users.size() >= 1) {
+			return new ResponseEntity<User>(GitlabToGithubConverter.convertUser(users.get(0)), HttpStatus.OK);
+		} else {
+			return new ResponseEntity<User>(HttpStatus.NOT_FOUND);
+		}
+	}
+
 }

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

@@ -193,6 +193,11 @@ private static PullRequest convertMergeRequest(GitlabMergeRequest glmr) {
 			pull.setUpdatedAt(glmr.getCreatedAt());
 		}
 
+		if (pull.isMerged()) {
+			pull.setMergedAt(glmr.getUpdatedAt());
+			pull.setMergedBy(convertUser(glmr.getAssignee()));
+		}
+		
 		return pull;
 	}
 
@@ -234,7 +239,7 @@ private static Milestone convertMilestone(GitlabMilestone glmilestone) {
 		return milestone;
 	}
 
-	private static User convertUser(GitlabUser gluser) {
+	public static User convertUser(GitlabUser gluser) {
 		if (gluser == null) {
 			return null;
 		}