feature: Sort assignees and implementers by name in ATS

5 files changed, 15 insertions, 9 deletions

diff --git a/plugins/org.eclipse.osee.ats.core/src/org/eclipse/osee/ats/core/review/AbstractReviewArtifact.java b/plugins/org.eclipse.osee.ats.core/src/org/eclipse/osee/ats/core/review/AbstractReviewArtifact.java
index bd6ff5241f1..093a21b298f 100644
--- a/plugins/org.eclipse.osee.ats.core/src/org/eclipse/osee/ats/core/review/AbstractReviewArtifact.java
+++ b/plugins/org.eclipse.osee.ats.core/src/org/eclipse/osee/ats/core/review/AbstractReviewArtifact.java
@@ -66,11 +66,11 @@ public abstract class AbstractReviewArtifact extends AbstractTaskableArtifact {
    }
 
    @Override
-   public Collection<IBasicUser> getImplementers() throws OseeCoreException {
+   public List<IBasicUser> getImplementers() throws OseeCoreException {
       if (this.isOfType(AtsArtifactTypes.DecisionReview)) {
          return StateManager.getImplementersByState(this, DecisionReviewState.Decision);
       } else {
-         Collection<IBasicUser> users = StateManager.getImplementersByState(this, PeerToPeerReviewState.Review);
+         List<IBasicUser> users = StateManager.getImplementersByState(this, PeerToPeerReviewState.Review);
          for (UserRole role : UserRoleManager.getUserRoles(this)) {
             users.add(role.getUser());
          }
diff --git a/plugins/org.eclipse.osee.ats.core/src/org/eclipse/osee/ats/core/task/TaskArtifact.java b/plugins/org.eclipse.osee.ats.core/src/org/eclipse/osee/ats/core/task/TaskArtifact.java
index 85032ec7eae..3aa63b07f9d 100644
--- a/plugins/org.eclipse.osee.ats.core/src/org/eclipse/osee/ats/core/task/TaskArtifact.java
+++ b/plugins/org.eclipse.osee.ats.core/src/org/eclipse/osee/ats/core/task/TaskArtifact.java
@@ -157,7 +157,7 @@ public class TaskArtifact extends AbstractWorkflowArtifact implements IATSStateM
    }
 
    @Override
-   public Collection<IBasicUser> getImplementers() throws OseeCoreException {
+   public List<IBasicUser> getImplementers() throws OseeCoreException {
       return StateManager.getImplementersByState(this, TaskStates.InWork);
    }
 
diff --git a/plugins/org.eclipse.osee.ats.core/src/org/eclipse/osee/ats/core/team/TeamWorkFlowArtifact.java b/plugins/org.eclipse.osee.ats.core/src/org/eclipse/osee/ats/core/team/TeamWorkFlowArtifact.java
index fa4e8604887..685be17cf0e 100644
--- a/plugins/org.eclipse.osee.ats.core/src/org/eclipse/osee/ats/core/team/TeamWorkFlowArtifact.java
+++ b/plugins/org.eclipse.osee.ats.core/src/org/eclipse/osee/ats/core/team/TeamWorkFlowArtifact.java
@@ -12,6 +12,7 @@
 package org.eclipse.osee.ats.core.team;
 
 import java.util.Collection;
+import java.util.List;
 import java.util.Map;
 import java.util.Set;
 import java.util.logging.Level;
@@ -202,7 +203,7 @@ public class TeamWorkFlowArtifact extends AbstractTaskableArtifact implements IA
    }
 
    @Override
-   public Collection<IBasicUser> getImplementers() throws OseeCoreException {
+   public List<IBasicUser> getImplementers() throws OseeCoreException {
       return StateManager.getImplementersByState(this, TeamState.Implement);
    }
 
diff --git a/plugins/org.eclipse.osee.ats.core/src/org/eclipse/osee/ats/core/workflow/AbstractWorkflowArtifact.java b/plugins/org.eclipse.osee.ats.core/src/org/eclipse/osee/ats/core/workflow/AbstractWorkflowArtifact.java
index 367aed469d2..a42ac26d333 100644
--- a/plugins/org.eclipse.osee.ats.core/src/org/eclipse/osee/ats/core/workflow/AbstractWorkflowArtifact.java
+++ b/plugins/org.eclipse.osee.ats.core/src/org/eclipse/osee/ats/core/workflow/AbstractWorkflowArtifact.java
@@ -157,7 +157,7 @@ public abstract class AbstractWorkflowArtifact extends AbstractAtsArtifact imple
    }
 
    @SuppressWarnings("unused")
-   public Collection<IBasicUser> getImplementers() throws OseeCoreException {
+   public List<IBasicUser> getImplementers() throws OseeCoreException {
       return Collections.emptyList();
    }
 
diff --git a/plugins/org.eclipse.osee.ats.core/src/org/eclipse/osee/ats/core/workflow/StateManager.java b/plugins/org.eclipse.osee.ats.core/src/org/eclipse/osee/ats/core/workflow/StateManager.java
index 6ca492df526..1857c82844e 100644
--- a/plugins/org.eclipse.osee.ats.core/src/org/eclipse/osee/ats/core/workflow/StateManager.java
+++ b/plugins/org.eclipse.osee.ats.core/src/org/eclipse/osee/ats/core/workflow/StateManager.java
@@ -439,14 +439,18 @@ public class StateManager {
 
    }
 
-   public static Collection<IBasicUser> getImplementersByState(AbstractWorkflowArtifact workflow, IWorkPage state) throws OseeCoreException {
-      Set<IBasicUser> users = new HashSet<IBasicUser>();
+   public static List<IBasicUser> getImplementersByState(AbstractWorkflowArtifact workflow, IWorkPage state) throws OseeCoreException {
+      List<IBasicUser> users = new ArrayList<IBasicUser>();
       if (workflow.isCancelled()) {
          users.add(workflow.getCancelledBy());
       } else {
-         users.addAll(workflow.getStateMgr().getAssignees(state));
+         for (IBasicUser user : workflow.getStateMgr().getAssignees(state)) {
+            if (!users.contains(user)) {
+               users.add(user);
+            }
+         }
          IBasicUser user = workflow.getCompletedBy();
-         if (user != null) {
+         if (user != null && !users.contains(user)) {
             users.add(user);
          }
       }
@@ -467,6 +471,7 @@ public class StateManager {
       if (smaState != null) {
          users.addAll(smaState.getAssignees());
       }
+      users.remove(UserManager.getUser(SystemUser.UnAssigned));
       return users;
    }