Merge branch 'zacharysabourin/master/108' into 'master'

fix: Update to use proper username field

Closes #108

See merge request !120

src/main/java/org/eclipsefoundation/git/eca/api/models/GitlabUserResponse.java

@@ -21,7 +21,7 @@ public abstract class GitlabUserResponse {
     
     public abstract Integer getId();
 
-    public abstract String getName();
+    public abstract String getUsername();
 
     public static Builder builder() {
         return new AutoValue_GitlabUserResponse.Builder();
@@ -32,7 +32,7 @@ public abstract class GitlabUserResponse {
     public abstract static class Builder {
         public abstract Builder setId(Integer id);
 
-        public abstract Builder setName(String name);
+        public abstract Builder setUsername(String username);
 
         public abstract GitlabUserResponse build();
     }

src/main/java/org/eclipsefoundation/git/eca/model/PrivateProjectData.java

@@ -31,6 +31,7 @@ public abstract class PrivateProjectData {
     public abstract String getProjectPath();
 
     @JsonProperty("ef_username")
+    @Nullable
     public abstract String getEFUsername();
 
     @Nullable
@@ -55,7 +56,7 @@ public abstract class PrivateProjectData {
 
         public abstract Builder setProjectPath(String path);
 
-        public abstract Builder setEFUsername(String username);
+        public abstract Builder setEFUsername(@Nullable String username);
 
         public abstract Builder setParentProject(@Nullable Integer id);
 

src/main/java/org/eclipsefoundation/git/eca/service/impl/DefaultSystemHookService.java

@@ -239,6 +239,6 @@ public class DefaultSystemHookService implements SystemHookService {
     private String fetchUserName(Integer userId) {
         Optional<GitlabUserResponse> response = cache.get(Integer.toString(userId), new MultivaluedMapImpl<>(),
                 GitlabUserResponse.class, () -> api.getUserInfo(apiToken, userId));
-        return response.isPresent() ? response.get().getName().replace("\\s+", "").toLowerCase() : null;
+        return response.isPresent() ? response.get().getUsername() : null;
     }
 }

src/main/java/org/eclipsefoundation/git/eca/tasks/ScheduledPrivateProjectScanTask.java

@@ -205,6 +205,6 @@ public class ScheduledPrivateProjectScanTask {
     private String fetchUserName(Integer userId) {
         Optional<GitlabUserResponse> response = cache.get(Integer.toString(userId), new MultivaluedMapImpl<>(),
                 GitlabUserResponse.class, () -> api.getUserInfo(apiToken, userId));
-        return response.isPresent() ? response.get().getName().replace("\\s+", "").toLowerCase() : null;
+        return response.isPresent() ? response.get().getUsername() : null;
     }
 }

src/test/java/org/eclipsefoundation/git/eca/test/api/MockGitlabAPI.java

@@ -57,15 +57,15 @@ public class MockGitlabAPI implements GitlabAPI {
         users.addAll(Arrays.asList(
                 GitlabUserResponse.builder()
                         .setId(1)
-                        .setName("admin")
+                        .setUsername("admin")
                         .build(),
                 GitlabUserResponse.builder()
                         .setId(55)
-                        .setName("testaccount")
+                        .setUsername("testaccount")
                         .build(),
                 GitlabUserResponse.builder()
                         .setId(33)
-                        .setName("fakeuser")
+                        .setUsername("fakeuser")
                         .build()));
     }