Merge pull request #100 from dwasinge/name-change-uuid

Name change UUID

Author: mcanoy

pom.xml

@@ -103,6 +103,10 @@
             <artifactId>vertx-junit5</artifactId>
             <scope>test</scope>
         </dependency>
+        <dependency>
+            <groupId>io.quarkus</groupId>
+            <artifactId>quarkus-junit5-mockito</artifactId>
+        </dependency>
     </dependencies>
     <build>
         <plugins>

src/main/java/com/redhat/labs/lodestar/exception/mapper/GitLabServiceResponseMapper.java

@@ -0,0 +1,32 @@
+package com.redhat.labs.lodestar.exception.mapper;
+
+import java.io.ByteArrayInputStream;
+
+import javax.annotation.Priority;
+import javax.ws.rs.WebApplicationException;
+import javax.ws.rs.core.Response;
+
+import org.eclipse.microprofile.rest.client.ext.ResponseExceptionMapper;
+
+@Priority(4000)
+public class GitLabServiceResponseMapper implements 
+             ResponseExceptionMapper<RuntimeException> {
+  @Override
+  public RuntimeException toThrowable(Response response) {
+    int status = response.getStatus();
+
+    String msg = getBody(response);
+
+    return new WebApplicationException(msg, status);
+
+  }
+
+  private String getBody(Response response) {
+      ByteArrayInputStream is = (ByteArrayInputStream) response.getEntity();
+      byte[] bytes = new byte[is.available()];
+      is.read(bytes,0,is.available());
+      String body = new String(bytes);
+      return body;
+    }
+
+}

src/main/java/com/redhat/labs/lodestar/models/Engagement.java

@@ -17,6 +17,7 @@
 @AllArgsConstructor
 public class Engagement {
 
+    private String uuid;
     private int projectId;
     private String customerName;
     private String projectName;

src/main/java/com/redhat/labs/lodestar/models/ProjectStructure.java

@@ -0,0 +1,34 @@
+package com.redhat.labs.lodestar.models;
+
+import java.util.Optional;
+
+import com.redhat.labs.lodestar.models.gitlab.Group;
+import com.redhat.labs.lodestar.models.gitlab.Project;
+
+import lombok.AllArgsConstructor;
+import lombok.Builder;
+import lombok.Data;
+import lombok.NoArgsConstructor;
+
+@Data
+@Builder
+@NoArgsConstructor
+@AllArgsConstructor
+public class ProjectStructure {
+
+    @Builder.Default
+    private Optional<Integer> customerGroupId = Optional.empty();
+    @Builder.Default
+    private Optional<Group> customerGroup = Optional.empty();
+    @Builder.Default
+    private Boolean customerGroupHasSubgroups = Boolean.FALSE;
+
+    @Builder.Default
+    private Optional<Integer> projectGroupId = Optional.empty();
+    @Builder.Default
+    private Optional<Group> projectGroup = Optional.empty();
+
+    @Builder.Default
+    private Optional<Project> project = Optional.empty();
+
+}

src/main/java/com/redhat/labs/lodestar/models/gitlab/Project.java

@@ -133,10 +133,12 @@ public class Project {
     private Boolean packagesEnabled;
     @JsonbProperty("path_with_namespace")
     private String pathWithNamespace;
-    
+    private Namespace namespace;
 
     @JsonbTransient
     private boolean first;
+    @JsonbTransient
+    private boolean moved;
 
     // TODO: Can expose avatar as well, just need to figure out what type to use.
     // avatar mixed no Image file for avatar of the group. Introduced in GitLab 12.9

src/main/java/com/redhat/labs/lodestar/models/gitlab/ProjectTransfer.java

@@ -0,0 +1,17 @@
+package com.redhat.labs.lodestar.models.gitlab;
+
+import lombok.AllArgsConstructor;
+import lombok.Builder;
+import lombok.Data;
+import lombok.NoArgsConstructor;
+
+@Data
+@Builder
+@NoArgsConstructor
+@AllArgsConstructor
+public class ProjectTransfer {
+
+    private Integer id;
+    private Integer namespace;
+
+}

src/main/java/com/redhat/labs/lodestar/rest/client/GitLabService.java

@@ -1,6 +1,7 @@
 package com.redhat.labs.lodestar.rest.client;
 
 import java.util.List;
+import java.util.Optional;
 
 import javax.ws.rs.Consumes;
 import javax.ws.rs.DELETE;
@@ -14,19 +15,23 @@
 import javax.ws.rs.core.Response;
 
 import org.eclipse.microprofile.rest.client.annotation.ClientHeaderParam;
+import org.eclipse.microprofile.rest.client.annotation.RegisterProvider;
 import org.eclipse.microprofile.rest.client.inject.RegisterRestClient;
 import org.jboss.resteasy.annotations.jaxrs.PathParam;
 
+import com.redhat.labs.lodestar.exception.mapper.GitLabServiceResponseMapper;
 import com.redhat.labs.lodestar.models.gitlab.CommitMultiple;
 import com.redhat.labs.lodestar.models.gitlab.DeployKey;
 import com.redhat.labs.lodestar.models.gitlab.File;
 import com.redhat.labs.lodestar.models.gitlab.Group;
 import com.redhat.labs.lodestar.models.gitlab.Hook;
 import com.redhat.labs.lodestar.models.gitlab.Project;
+import com.redhat.labs.lodestar.models.gitlab.ProjectTransfer;
 import com.redhat.labs.lodestar.resources.filter.Logged;
 
 @Path("/api/v4")
 @RegisterRestClient(configKey = "gitlab.api")
+@RegisterProvider(value = GitLabServiceResponseMapper.class, priority = 50)
 @ClientHeaderParam(name = "Private-Token", value = "{com.redhat.labs.lodestar.config.GitLabConfig.getPersonalAccessToken}")
 public interface GitLabService {
 
@@ -40,7 +45,7 @@ public interface GitLabService {
     //reference: https://docs.gitlab.com/ee/api/groups.html#list-a-groups-subgroups
     @GET
     @Path("/groups/{id}/subgroups")
-    List<Group> getSubGroups(@PathParam("id") @Encoded Integer groupId); 
+    Response getSubGroups(@PathParam("id") @Encoded Integer groupId, @QueryParam("per_page") Integer perPage, @QueryParam("page") Integer page); 
 
     // reference: https://docs.gitlab.com/ee/api/groups.html#new-group
     @POST
@@ -132,6 +137,12 @@ public interface GitLabService {
     @Consumes("application/json")
     List<Hook> getProjectHooks(@PathParam("id") @Encoded Integer projectId);
 
+    @PUT
+    @Logged
+    @Path("/projects/{id}/transfer")
+    @Produces("application/json")
+    Optional<Project> transferProject(@PathParam("id") @Encoded Integer projectId, ProjectTransfer projectTransfer);
+
     // FILES
 
     @GET

src/main/java/com/redhat/labs/lodestar/service/EngagementService.java

@@ -34,7 +34,6 @@
 public class EngagementService {
     public static final Logger LOGGER = LoggerFactory.getLogger(EngagementService.class);
 
-    private static final String ENGAGEMENT_PROJECT_NAME = "iac";
     private static final String DEFAULT_BRANCH = "master";
     private static final String ENGAGEMENT_FILE = "engagement.json";
     private static final String STATUS_FILE = "status.json";
@@ -62,6 +61,9 @@ public class EngagementService {
     @Inject
     HookService hookService;
 
+    @Inject
+    ProjectStructureService structureService;
+
     @Inject
     JsonMarshaller json;
 
@@ -84,7 +86,7 @@ public void setPathPrefix() {
     public Project createEngagement(Engagement engagement, String author, String authorEmail) {
 
         // create project structure
-        Project project = createProjectStucture(engagement);
+        Project project = structureService.createOrUpdateProjectStructure(engagement, engagementPathPrefix);
         engagement.setProjectId(project.getId());
 
         // get commit message before creating file
@@ -123,7 +125,7 @@ public Project createEngagement(Engagement engagement, String author, String aut
     }
 
     public List<Commit> getCommitLog(String customerName, String engagementName) {
-        String projectPath = getPath(customerName, engagementName);
+        String projectPath = GitLabPathUtils.getPath(engagementPathPrefix, customerName, engagementName);
         return projectService.getCommitLog(projectPath);
     }
 
@@ -154,7 +156,7 @@ public Response createHook(String customerName, String engagementName, Hook hook
 
     public Status getProjectStatus(String customerName, String engagementName) {
         Status status = null;
-        Optional<File> file = fileService.getFile(this.getPath(customerName, engagementName), STATUS_FILE);
+        Optional<File> file = fileService.getFile(GitLabPathUtils.getPath(engagementPathPrefix, customerName, engagementName), STATUS_FILE);
         if(file.isPresent()) {
             status = json.fromJson(file.get().getContent(), Status.class);
         }
@@ -163,7 +165,7 @@ public Status getProjectStatus(String customerName, String engagementName) {
     }
 
     public Optional<Project> getProject(String customerName, String engagementName) {
-        String fullPath = this.getPath(customerName, engagementName);
+        String fullPath = GitLabPathUtils.getPath(engagementPathPrefix, customerName, engagementName);
 
         LOGGER.debug("Full path {}", fullPath);
         return projectService.getProjectByIdOrPath(fullPath);
@@ -251,70 +253,6 @@ private File createEngagmentFile(Engagement engagement) {
         return File.builder().content(fileContent).filePath(ENGAGEMENT_FILE).build();
     }
 
-    private Project createProjectStucture(Engagement engagement) {
-
-        // create group for customer name
-        Group customerGroup = getOrCreateGroup(engagement.getCustomerName(),
-                Group.builder().name(engagement.getCustomerName())
-                        .path(GitLabPathUtils.generateValidPath(engagement.getCustomerName()))
-                        .parentId(engagementRepositoryId).build());
-
-        // create group for project name
-        Group projectGroup = getOrCreateGroup(engagement.getProjectName(),
-                Group.builder().name(engagement.getProjectName())
-                        .path(GitLabPathUtils.generateValidPath(engagement.getProjectName()))
-                        .parentId(customerGroup.getId()).build());
-
-        // create project under project name group
-        Project project = getOrCreateProject(projectGroup.getId(), ENGAGEMENT_PROJECT_NAME, Project.builder()
-                .name(ENGAGEMENT_PROJECT_NAME).visibility("private").namespaceId(projectGroup.getId()).build());
-
-        // enable deployment key on project
-        projectService.enableDeploymentKeyOnProject(project.getId(), deployKey);
-
-        return project;
-
-    }
-
-    private Group getOrCreateGroup(String groupName, Group groupToCreate) {
-
-        Optional<Group> optional = groupService.getGitLabGroupByName(groupName, groupToCreate.getParentId());
-
-        if (!optional.isPresent()) {
-
-            // try to create group
-            optional = groupService.createGitLabGroup(groupToCreate);
-
-            if (!optional.isPresent()) {
-                throw new UnexpectedGitLabResponseException("failed to create group");
-            }
-
-        }
-
-        return optional.get();
-
-    }
-
-    private Project getOrCreateProject(Integer namespaceId, String projectName, Project project) {
-
-        Optional<Project> optional = projectService.getProjectByName(namespaceId, projectName);
-
-        if (!optional.isPresent()) {
-
-            // try to create project
-            optional = projectService.createProject(project);
-
-            if (!optional.isPresent()) {
-                throw new UnexpectedGitLabResponseException("failed to create project");
-            }
-
-            optional.get().setFirst(true);
-        }
-
-        return optional.get();
-
-    }
-
     private CommitMultiple createCommitMultiple(List<File> filesToCommit, Integer projectId, String branch,
             String authorName, String authorEmail, boolean isNew, Optional<String> commitMessageOptional) {
 
@@ -361,14 +299,5 @@ private String getEmoji() {
 
         return String.valueOf(mysteryEmoji);
     }
-    
-    private String getPath(String customerName, String engagementName) {
-        return new StringBuilder(engagementPathPrefix)
-                .append("/")
-                .append(customerName)
-                .append("/")
-                .append(engagementName)
-                .append("/iac").toString();
-    }
 
 }

src/main/java/com/redhat/labs/lodestar/service/GroupService.java

@@ -52,7 +52,20 @@ public Optional<Group> getGitLabGroupByName(String name, Integer parentId)
         return optional;
 
     }
-    
+
+    public List<Group> getSubgroups(Integer groupId) {
+
+        PagedResults<Group> page = new PagedResults<>();
+
+        while(page.hasMore()) {
+            Response response = gitLabService.getSubGroups(groupId, commitPageSize, page.getNumber());
+            page.update(response, new GenericType<List<Group>>() {});
+        }
+
+        return page.getResults();
+
+    }
+
     public Optional<Group> getGitLabGroupByById(int id) {
         return getGitLabGroupByByIdOrPath(String.valueOf(id));
     }

src/main/java/com/redhat/labs/lodestar/service/ProjectService.java

@@ -6,6 +6,7 @@
 
 import javax.enterprise.context.ApplicationScoped;
 import javax.inject.Inject;
+import javax.ws.rs.WebApplicationException;
 import javax.ws.rs.core.GenericType;
 import javax.ws.rs.core.Response;
 
@@ -19,6 +20,7 @@
 import com.redhat.labs.lodestar.models.gitlab.DeployKey;
 import com.redhat.labs.lodestar.models.gitlab.Project;
 import com.redhat.labs.lodestar.models.gitlab.ProjectSearchResults;
+import com.redhat.labs.lodestar.models.gitlab.ProjectTransfer;
 import com.redhat.labs.lodestar.rest.client.GitLabService;
 
 @ApplicationScoped
@@ -84,8 +86,19 @@ public Optional<Project> getProjectById(Integer projectId) {
     }
 
     public Optional<Project> getProjectByIdOrPath(String idOrPath) {
-        Project project = gitLabService.getProjectById(idOrPath);
-        return Optional.ofNullable(project);
+
+        try {
+            return Optional.ofNullable(gitLabService.getProjectById(idOrPath));
+        } catch(WebApplicationException wae) {
+
+            if(wae.getResponse().getStatus() == 404) {
+                return Optional.empty();
+            }
+
+            throw wae;
+
+        }
+
     }
 
     // create a project
@@ -102,6 +115,7 @@ public Optional<Project> createProject(Project project) {
         // try to create project
         Project createdProject = gitLabService.createProject(project);
         if (null != createdProject) {
+            createdProject.setFirst(true);
             optional = Optional.of(createdProject);
         }
 
@@ -147,6 +161,13 @@ public List<Commit> getCommitLog(String projectId) {
         LOGGER.debug("total commits for project {} {}", projectId, page.size());
 
         return page.getResults().stream().filter(e -> !commitFilteredEmails.contains(e.getAuthorEmail())).collect(Collectors.toList());
+
+    }
+
+    public Optional<Project> transferProject(Integer projectId, Integer newGroupId) {
+
+        return gitLabService.transferProject(projectId, ProjectTransfer.builder().id(projectId).namespace(newGroupId).build());
+
     }
 
 }