Merge pull request #106 from dwasinge/user-reset

User Reset Implementation

Author: dwasinge

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

@@ -1,6 +1,7 @@
 package com.redhat.labs.lodestar.models;
 
 import javax.json.bind.annotation.JsonbProperty;
+import javax.json.bind.annotation.JsonbTransient;
 import javax.validation.constraints.NotBlank;
 
 import lombok.AllArgsConstructor;
@@ -14,6 +15,9 @@
 @AllArgsConstructor
 public class EngagementUser {
 
+    @NotBlank
+    @JsonbProperty("uuid")
+    private String uuid;
     @NotBlank
     @JsonbProperty("first_name")
     private String firstName;
@@ -27,4 +31,13 @@ public class EngagementUser {
     @JsonbProperty("role")
     private String role;
 
+    private boolean reset;
+
+    @JsonbTransient
+    public boolean isReset() {
+        return reset;
+    }
+
+
+
 }

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

@@ -3,8 +3,10 @@
 import java.security.SecureRandom;
 import java.util.ArrayList;
 import java.util.List;
+import java.util.Map;
 import java.util.Optional;
 import java.util.stream.Collectors;
+import java.util.stream.Stream;
 
 import javax.annotation.PostConstruct;
 import javax.enterprise.context.ApplicationScoped;
@@ -15,6 +17,7 @@
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
+import com.google.common.collect.Lists;
 import com.redhat.labs.lodestar.config.JsonMarshaller;
 import com.redhat.labs.lodestar.exception.UnexpectedGitLabResponseException;
 import com.redhat.labs.lodestar.models.Engagement;
@@ -37,6 +40,9 @@ public class EngagementService {
     private static final String DEFAULT_BRANCH = "master";
     private static final String ENGAGEMENT_FILE = "engagement.json";
     private static final String STATUS_FILE = "status.json";
+    private static final String USER_MGMT_FILE_PREFIX = "user-management-";
+    private static final String USER_MGMT_FILE = USER_MGMT_FILE_PREFIX + "UUID.json";
+    private static final String USER_MGMT_FILE_PLACEHOLDER = "UUID";
 
     private String engagementPathPrefix;
 
@@ -46,6 +52,9 @@ public class EngagementService {
     @ConfigProperty(name = "stripPathPrefix", defaultValue = "schema/")
     String stripPathPrefix;
 
+    @ConfigProperty(name = "orchestration.queue.directory", defaultValue = "queue")
+    String orchestrationQueueDirectory;
+
     @Inject
     ProjectService projectService;
 
@@ -93,6 +102,9 @@ public Project createEngagement(Engagement engagement, String author, String aut
         List<File> repoFiles = new ArrayList<>();
         repoFiles.add(createEngagmentFile(engagement));
 
+        // create user reset file(s) if required
+        repoFiles.addAll(createUserManagementFiles(engagement));
+
         // create actions for multiple commit
         CommitMultiple commit = createCommitMultiple(repoFiles, project.getId(), DEFAULT_BRANCH, author, authorEmail,
                 project.isFirst(), commitMessageOptional);
@@ -245,14 +257,46 @@ private File createEngagmentFile(Engagement engagement) {
         return File.builder().content(fileContent).filePath(ENGAGEMENT_FILE).build();
     }
 
+    private List<File> createUserManagementFiles(Engagement engagement) {
+
+        if (null == engagement.getEngagementUsers()) {
+            return Lists.newArrayList();
+        }
+
+        return engagement.getEngagementUsers().stream().filter(user -> user.isReset())
+                .filter(user -> fileService
+                        .getFileAllow404(engagement.getProjectId(), getUserManagementFileName(user.getUuid()))
+                        .isEmpty())
+                .map(user -> {
+                    return File.builder().content(json.toJson(user)).filePath(getUserManagementFileName(user.getUuid()))
+                            .build();
+                }).collect(Collectors.toList());
+
+    }
+
+    private String getUserManagementFileName(String uuid) {
+        return new StringBuilder(orchestrationQueueDirectory).append("/")
+                .append(USER_MGMT_FILE.replace(USER_MGMT_FILE_PLACEHOLDER, uuid)).toString();
+    }
+
     private CommitMultiple createCommitMultiple(List<File> filesToCommit, Integer projectId, String branch,
             String authorName, String authorEmail, boolean isNew, Optional<String> commitMessageOptional) {
 
-        List<Action> actions = new ArrayList<>();
+        // Split files between user-management files and all others
+        Map<Boolean, List<File>> fileMap = filesToCommit.stream()
+                .collect(Collectors.partitioningBy(file -> file.getFilePath().contains(USER_MGMT_FILE_PREFIX)));
+
+        // create actions for each user management file
+        List<Action> userManagementFiles = fileMap.get(true).stream().map(file -> createAction(file, true))
+                .collect(Collectors.toList());
+
+        // create actions for all other files
+        List<Action> otherFiles = fileMap.get(false).stream().map(file -> createAction(file, isNew))
+                .collect(Collectors.toList());
 
-        // convert each file to action - parallelStream was bringing inconsistent
-        // results
-        filesToCommit.stream().forEach(file -> actions.add(createAction(file, isNew)));
+        // merge the actions
+        List<Action> actions = Stream.of(userManagementFiles, otherFiles).flatMap(x -> x.stream())
+                .collect(Collectors.toList());
 
         // use message if provided. otherwise, defaults
         String commitMessage = commitMessageOptional

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

@@ -35,7 +35,7 @@ public class ProjectStructureService {
 
     @ConfigProperty(name = "engagements.repository.id")
     Integer engagementRepositoryId;
-    
+
     @ConfigProperty(name = "gitlab.deploy.key")
     Integer deployKey;
 
@@ -65,9 +65,9 @@ public Project createOrUpdateProjectStructure(Engagement engagement, String enga
 
         Optional<Project> project = createOrUpdateProject(existingProjectStructure.getProject(),
                 existingProjectStructure.getProjectGroupId(), projectGroup.getId());
-        
+
         // enable deployment key on project
-        if(project.isPresent()) {
+        if (project.isPresent()) {
             projectService.enableDeploymentKeyOnProject(project.get().getId(), deployKey);
         }
 
@@ -101,7 +101,7 @@ ProjectStructure getExistingProjectStructure(Engagement engagement, String engag
         }
 
         // get project group by id
-        if(project.isEmpty()) {
+        if (project.isEmpty()) {
             project = projectService.getProjectById(engagement.getProjectId());
         }
         builder.project(project);
@@ -230,14 +230,11 @@ void cleanupGroups(ProjectStructure existingProjectStructure) {
             return;
         }
 
-        Instant begin = Instant.now();
         // remove project group
         removeGroupIfEmpty(existingProjectStructure.getProjectGroupId().get(), 5);
         // remove customer group
         removeGroupIfEmpty(existingProjectStructure.getCustomerGroupId().get(), 5);
 
-        System.out.println("cleanup elapsed time: " + Duration.between(begin, Instant.now()).toMillis() + " ms");
-
     }
 
     void removeGroupIfEmpty(Integer groupId, int retryCount) {
@@ -264,11 +261,9 @@ void removeGroupIfEmpty(Integer groupId, int retryCount) {
 
             count += 1;
             try {
-                System.out.println("sleeping for " + count * 1 + " seconds.");
                 TimeUnit.SECONDS.sleep(count * 1);
             } catch (InterruptedException e) {
-                // TODO Auto-generated catch block
-                e.printStackTrace();
+                Thread.currentThread().interrupt();
             }
 
         }